0s autopkgtest [22:47:10]: starting date and time: 2025-03-31 22:47:10+0000 0s autopkgtest [22:47:10]: git checkout: 325255d2 Merge branch 'pin-any-arch' into 'ubuntu/production' 0s autopkgtest [22:47:10]: host juju-7f2275-prod-proposed-migration-environment-20; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.j339wmr6/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-ppc64el --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-20@bos03-ppc64el-5.secgroup --name adt-jammy-ppc64el-dgit-20250331-224710-juju-7f2275-prod-proposed-migration-environment-20-5b066cdb-4711-452e-bd16-b6cf779492fc --image adt/ubuntu-jammy-ppc64el-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-20 --net-id=net_prod-proposed-migration-ppc64el -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/ 55s autopkgtest [22:48:05]: testbed dpkg architecture: ppc64el 56s autopkgtest [22:48:06]: testbed apt version: 2.4.13 56s autopkgtest [22:48:06]: @@@@@@@@@@@@@@@@@@@@ test bed setup 56s autopkgtest [22:48:06]: testbed release detected to be: None 57s autopkgtest [22:48:07]: updating testbed package index (apt update) 57s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 57s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 57s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 57s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 58s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.2 kB] 58s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 58s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 58s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el Packages [170 kB] 58s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el c-n-f Metadata [2476 B] 58s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el Packages [1704 B] 58s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el c-n-f Metadata [116 B] 58s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el Packages [85.0 kB] 58s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el c-n-f Metadata [2064 B] 58s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse ppc64el c-n-f Metadata [116 B] 60s Fetched 715 kB in 1s (697 kB/s) 61s Reading package lists... 62s autopkgtest [22:48:12]: upgrading testbed (apt dist-upgrade and autopurge) 62s Reading package lists... 62s Building dependency tree... 62s Reading state information... 63s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 63s Starting 2 pkgProblemResolver with broken count: 0 63s Done 63s Entering ResolveByKeep 63s 63s The following NEW packages will be installed: 63s linux-headers-5.15.0-136 linux-headers-5.15.0-136-generic 63s linux-image-5.15.0-136-generic linux-modules-5.15.0-136-generic 63s linux-modules-extra-5.15.0-136-generic 63s The following packages will be upgraded: 63s apt apt-utils libapt-pkg6.0 linux-generic linux-headers-generic 63s linux-headers-virtual linux-image-generic linux-image-virtual linux-virtual 63s 9 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. 63s Need to get 112 MB of archives. 63s After this operation, 613 MB of additional disk space will be used. 63s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el libapt-pkg6.0 ppc64el 2.4.14 [1030 kB] 64s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt ppc64el 2.4.14 [1407 kB] 64s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt-utils ppc64el 2.4.14 [236 kB] 64s Get:4 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-5.15.0-136-generic ppc64el 5.15.0-136.147 [22.0 MB] 66s Get:5 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-5.15.0-136-generic ppc64el 5.15.0-136.147 [11.5 MB] 67s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-extra-5.15.0-136-generic ppc64el 5.15.0-136.147 [60.3 MB] 72s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-generic ppc64el 5.15.0.136.134 [1700 B] 72s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-generic ppc64el 5.15.0.136.134 [2466 B] 72s Get:9 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-virtual ppc64el 5.15.0.136.134 [1676 B] 72s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-virtual ppc64el 5.15.0.136.134 [2464 B] 72s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-virtual ppc64el 5.15.0.136.134 [1634 B] 72s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136 all 5.15.0-136.147 [12.3 MB] 73s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136-generic ppc64el 5.15.0-136.147 [3208 kB] 73s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-generic ppc64el 5.15.0.136.134 [2364 B] 73s Fetched 112 MB in 10s (11.6 MB/s) 73s (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 ... 66539 files and directories currently installed.) 73s Preparing to unpack .../libapt-pkg6.0_2.4.14_ppc64el.deb ... 73s Unpacking libapt-pkg6.0:ppc64el (2.4.14) over (2.4.13) ... 73s Setting up libapt-pkg6.0:ppc64el (2.4.14) ... 73s (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 ... 66539 files and directories currently installed.) 73s Preparing to unpack .../apt_2.4.14_ppc64el.deb ... 73s Unpacking apt (2.4.14) over (2.4.13) ... 74s Setting up apt (2.4.14) ... 74s (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 ... 66539 files and directories currently installed.) 74s Preparing to unpack .../00-apt-utils_2.4.14_ppc64el.deb ... 74s Unpacking apt-utils (2.4.14) over (2.4.13) ... 74s Selecting previously unselected package linux-modules-5.15.0-136-generic. 74s Preparing to unpack .../01-linux-modules-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 74s Unpacking linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 75s Selecting previously unselected package linux-image-5.15.0-136-generic. 75s Preparing to unpack .../02-linux-image-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 75s Unpacking linux-image-5.15.0-136-generic (5.15.0-136.147) ... 75s Selecting previously unselected package linux-modules-extra-5.15.0-136-generic. 75s Preparing to unpack .../03-linux-modules-extra-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 75s Unpacking linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 77s Preparing to unpack .../04-linux-generic_5.15.0.136.134_ppc64el.deb ... 77s Unpacking linux-generic (5.15.0.136.134) over (5.15.0.135.133) ... 77s Preparing to unpack .../05-linux-image-generic_5.15.0.136.134_ppc64el.deb ... 77s Unpacking linux-image-generic (5.15.0.136.134) over (5.15.0.135.133) ... 77s Preparing to unpack .../06-linux-virtual_5.15.0.136.134_ppc64el.deb ... 77s Unpacking linux-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 77s Preparing to unpack .../07-linux-image-virtual_5.15.0.136.134_ppc64el.deb ... 77s Unpacking linux-image-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 77s Preparing to unpack .../08-linux-headers-virtual_5.15.0.136.134_ppc64el.deb ... 77s Unpacking linux-headers-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 77s Selecting previously unselected package linux-headers-5.15.0-136. 77s Preparing to unpack .../09-linux-headers-5.15.0-136_5.15.0-136.147_all.deb ... 77s Unpacking linux-headers-5.15.0-136 (5.15.0-136.147) ... 79s Selecting previously unselected package linux-headers-5.15.0-136-generic. 79s Preparing to unpack .../10-linux-headers-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 79s Unpacking linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 80s Preparing to unpack .../11-linux-headers-generic_5.15.0.136.134_ppc64el.deb ... 80s Unpacking linux-headers-generic (5.15.0.136.134) over (5.15.0.135.133) ... 80s Setting up apt-utils (2.4.14) ... 80s Setting up linux-headers-5.15.0-136 (5.15.0-136.147) ... 80s Setting up linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 80s Setting up linux-headers-generic (5.15.0.136.134) ... 80s Setting up linux-headers-virtual (5.15.0.136.134) ... 80s Setting up linux-image-5.15.0-136-generic (5.15.0-136.147) ... 82s I: /boot/vmlinux is now a symlink to vmlinux-5.15.0-136-generic 82s I: /boot/initrd.img is now a symlink to initrd.img-5.15.0-136-generic 82s Setting up linux-image-virtual (5.15.0.136.134) ... 82s Setting up linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 83s Setting up linux-virtual (5.15.0.136.134) ... 83s Setting up linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 84s Setting up linux-image-generic (5.15.0.136.134) ... 84s Setting up linux-generic (5.15.0.136.134) ... 84s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 84s Processing triggers for man-db (2.10.2-1) ... 85s Processing triggers for linux-image-5.15.0-136-generic (5.15.0-136.147) ... 85s /etc/kernel/postinst.d/initramfs-tools: 85s update-initramfs: Generating /boot/initrd.img-5.15.0-136-generic 85s No lz4 in /usr/bin:/sbin:/bin, using gzip 107s /etc/kernel/postinst.d/zz-update-grub: 107s Sourcing file `/etc/default/grub' 107s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 107s Sourcing file `/etc/default/grub.d/init-select.cfg' 107s Generating grub configuration file ... 107s Found linux image: /boot/vmlinux-5.15.0-136-generic 107s Found initrd image: /boot/initrd.img-5.15.0-136-generic 107s Found linux image: /boot/vmlinux-5.15.0-135-generic 107s Found initrd image: /boot/initrd.img-5.15.0-135-generic 107s Warning: os-prober will not be executed to detect other bootable partitions. 107s Systems on them will not be added to the GRUB boot configuration. 107s Check GRUB_DISABLE_OS_PROBER documentation entry. 107s done 109s Reading package lists... 109s Building dependency tree... 109s Reading state information... 109s Starting pkgProblemResolver with broken count: 0 109s Starting 2 pkgProblemResolver with broken count: 0 109s Done 109s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 109s autopkgtest [22:48:59]: rebooting testbed after setup commands that affected boot 140s autopkgtest [22:49:30]: testbed running kernel: Linux 5.15.0-136-generic #147-Ubuntu SMP Sat Mar 15 15:54:02 UTC 2025 143s autopkgtest [22:49:33]: @@@@@@@@@@@@@@@@@@@@ apt-source dgit 147s Get:1 http://ftpmaster.internal/ubuntu jammy/universe dgit 9.15 (dsc) [1846 B] 147s Get:2 http://ftpmaster.internal/ubuntu jammy/universe dgit 9.15 (tar) [668 kB] 148s gpgv: Signature made Sun Jan 2 12:22:29 2022 UTC 148s gpgv: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 148s gpgv: Can't check signature: No public key 148s dpkg-source: warning: cannot verify signature ./dgit_9.15.dsc 148s autopkgtest [22:49:38]: testing package dgit version 9.15 148s dpkgsourceignores-docs SKIP unknown restriction x-dgit-intree-only 148s defdistro-dsd-clone-drs SKIP unknown restriction x-dgit-git-only 148s dsd-clone-drs SKIP unknown restriction x-dgit-git-only 148s hint-testsuite-triggers SKIP unknown restriction hint-testsuite-triggers 148s build-modes-sbuild SKIP unknown restriction x-dgit-schroot-build 148s quilt-gbp-build-modes-sbuild SKIP unknown restriction x-dgit-schroot-build 148s sbuild-gitish SKIP unknown restriction x-dgit-schroot-build 148s i18n-po4a-uptodate SKIP unknown restriction x-dgit-git-only 148s package-build SKIP unknown restriction x-dgit-git-only 148s spelling SKIP unknown restriction x-dgit-git-only 148s autopkgtest [22:49:38]: build not needed 148s dpkgsourceignores-docs SKIP unknown restriction x-dgit-intree-only 148s defdistro-dsd-clone-drs SKIP unknown restriction x-dgit-git-only 148s dsd-clone-drs SKIP unknown restriction x-dgit-git-only 148s hint-testsuite-triggers SKIP unknown restriction hint-testsuite-triggers 148s build-modes-sbuild SKIP unknown restriction x-dgit-schroot-build 148s quilt-gbp-build-modes-sbuild SKIP unknown restriction x-dgit-schroot-build 148s sbuild-gitish SKIP unknown restriction x-dgit-schroot-build 148s i18n-po4a-uptodate SKIP unknown restriction x-dgit-git-only 148s package-build SKIP unknown restriction x-dgit-git-only 148s spelling SKIP unknown restriction x-dgit-git-only 148s autopkgtest [22:49:38]: test baredebian-multitar: preparing testbed 149s Reading package lists... 149s Building dependency tree... 149s Reading state information... 149s Starting pkgProblemResolver with broken count: 0 149s Starting 2 pkgProblemResolver with broken count: 0 149s Done 149s The following NEW packages will be installed: 149s autoconf automake autopoint autotools-dev build-essential chiark-utils-bin 149s cpp cpp-11 debhelper debugedit devscripts dgit dgit-infrastructure 149s dh-autoreconf dh-strip-nondeterminism diffstat dput dwz fakeroot faketime 149s g++ g++-11 gcc gcc-11 gcc-11-base gettext git git-buildpackage git-debrebase 149s git-man intltool-debian libarchive-zip-perl libasan6 libatomic1 149s libb-hooks-op-check-perl libc-dev-bin libc6-dev libcc1-0 149s libclass-method-modifiers-perl libclass-xsaccessor-perl libcrypt-dev 149s libdbd-sqlite3-perl libdbi-perl libdebhelper-perl libdevel-callchecker-perl 149s libdynaloader-functions-perl libencode-locale-perl liberror-perl 149s libexporter-tiny-perl libfakeroot libfaketime libfile-chdir-perl 149s libfile-dirlist-perl libfile-fnmatch-perl libfile-homedir-perl 149s libfile-listing-perl libfile-stripnondeterminism-perl libfile-touch-perl 149s libfile-which-perl libgcc-11-dev libgit-wrapper-perl libgomp1 149s libhtml-parser-perl libhtml-tagset-perl libhtml-tree-perl 149s libhttp-cookies-perl libhttp-date-perl libhttp-message-perl 149s libhttp-negotiate-perl libimport-into-perl libio-html-perl libio-pty-perl 149s libio-socket-ssl-perl libipc-run-perl libisl23 libitm1 libjson-perl 149s liblist-compare-perl liblist-moreutils-perl liblist-moreutils-xs-perl 149s liblsan0 liblwp-mediatypes-perl liblwp-protocol-https-perl 149s libmodule-runtime-perl libmoo-perl libmpc3 libnet-http-perl 149s libnet-ssleay-perl libnsl-dev libparams-classify-perl libquadmath0 149s librole-tiny-perl libsort-versions-perl libstdc++-11-dev 149s libstring-shellquote-perl libsub-override-perl libsub-quote-perl 149s libtext-csv-perl libtext-glob-perl libtimedate-perl libtirpc-dev libtool 149s libtry-tiny-perl libtsan0 libubsan1 liburi-perl libwww-curl-perl libwww-perl 149s libwww-robotrules-perl linux-libc-dev m4 patchutils perl-openssl-defaults 149s po-debconf python3-dateutil python3-debian python3-gpg quilt rpcsvc-proto 149s sqlite3 wdiff 150s 0 upgraded, 121 newly installed, 0 to remove and 0 not upgraded. 150s Need to get 69.0 MB of archives. 150s After this operation, 263 MB of additional disk space will be used. 150s Get:1 http://ftpmaster.internal/ubuntu jammy/main ppc64el m4 ppc64el 1.4.18-5ubuntu2 [214 kB] 150s Get:2 http://ftpmaster.internal/ubuntu jammy/main ppc64el autoconf all 2.71-2 [338 kB] 150s Get:3 http://ftpmaster.internal/ubuntu jammy/main ppc64el autotools-dev all 20220109.1 [44.9 kB] 150s Get:4 http://ftpmaster.internal/ubuntu jammy/main ppc64el automake all 1:1.16.5-1.3 [558 kB] 150s Get:5 http://ftpmaster.internal/ubuntu jammy/main ppc64el autopoint all 0.21-4ubuntu4 [422 kB] 150s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc-dev-bin ppc64el 2.35-0ubuntu3.9 [21.4 kB] 150s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-libc-dev ppc64el 5.15.0-136.147 [1313 kB] 150s Get:8 http://ftpmaster.internal/ubuntu jammy/main ppc64el libcrypt-dev ppc64el 1:4.4.27-1 [142 kB] 150s Get:9 http://ftpmaster.internal/ubuntu jammy/main ppc64el rpcsvc-proto ppc64el 1.4.2-0ubuntu6 [82.3 kB] 150s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtirpc-dev ppc64el 1.3.2-2ubuntu0.1 [223 kB] 150s Get:11 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnsl-dev ppc64el 1.3.0-2build2 [80.0 kB] 150s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc6-dev ppc64el 2.35-0ubuntu3.9 [2053 kB] 150s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11-base ppc64el 11.4.0-1ubuntu1~22.04 [20.3 kB] 150s Get:14 http://ftpmaster.internal/ubuntu jammy/main ppc64el libisl23 ppc64el 0.24-2build1 [833 kB] 151s Get:15 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmpc3 ppc64el 1.2.1-2build1 [52.2 kB] 151s Get:16 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el cpp-11 ppc64el 11.4.0-1ubuntu1~22.04 [8800 kB] 152s Get:17 http://ftpmaster.internal/ubuntu jammy/main ppc64el cpp ppc64el 4:11.2.0-1ubuntu1 [27.7 kB] 152s Get:18 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libcc1-0 ppc64el 12.3.0-1ubuntu1~22.04 [49.5 kB] 152s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgomp1 ppc64el 12.3.0-1ubuntu1~22.04 [140 kB] 152s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libitm1 ppc64el 12.3.0-1ubuntu1~22.04 [32.9 kB] 152s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libatomic1 ppc64el 12.3.0-1ubuntu1~22.04 [10.6 kB] 152s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libasan6 ppc64el 11.4.0-1ubuntu1~22.04 [2303 kB] 152s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el liblsan0 ppc64el 12.3.0-1ubuntu1~22.04 [1090 kB] 152s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtsan0 ppc64el 11.4.0-1ubuntu1~22.04 [2278 kB] 153s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libubsan1 ppc64el 12.3.0-1ubuntu1~22.04 [1001 kB] 153s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libquadmath0 ppc64el 12.3.0-1ubuntu1~22.04 [156 kB] 153s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgcc-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [1477 kB] 153s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11 ppc64el 11.4.0-1ubuntu1~22.04 [17.7 MB] 155s Get:29 http://ftpmaster.internal/ubuntu jammy/main ppc64el gcc ppc64el 4:11.2.0-1ubuntu1 [5152 B] 155s Get:30 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libstdc++-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [2197 kB] 156s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el g++-11 ppc64el 11.4.0-1ubuntu1~22.04 [10.2 MB] 157s Get:32 http://ftpmaster.internal/ubuntu jammy/main ppc64el g++ ppc64el 4:11.2.0-1ubuntu1 [1408 B] 157s Get:33 http://ftpmaster.internal/ubuntu jammy/main ppc64el build-essential ppc64el 12.9ubuntu3 [4752 B] 157s Get:34 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 157s Get:35 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtool all 2.4.6-15build2 [164 kB] 157s Get:36 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-autoreconf all 20 [16.1 kB] 157s Get:37 http://ftpmaster.internal/ubuntu jammy/main ppc64el libarchive-zip-perl all 1.68-1 [90.2 kB] 157s Get:38 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-override-perl all 0.09-2 [9532 B] 157s Get:39 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 157s Get:40 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-strip-nondeterminism all 1.13.0-1 [5344 B] 157s Get:41 http://ftpmaster.internal/ubuntu jammy/main ppc64el debugedit ppc64el 1:5.0-4build1 [51.6 kB] 157s Get:42 http://ftpmaster.internal/ubuntu jammy/main ppc64el dwz ppc64el 0.14-1build2 [124 kB] 157s Get:43 http://ftpmaster.internal/ubuntu jammy/main ppc64el gettext ppc64el 0.21-4ubuntu4 [976 kB] 157s Get:44 http://ftpmaster.internal/ubuntu jammy/main ppc64el intltool-debian all 0.35.0+20060710.5 [24.9 kB] 157s Get:45 http://ftpmaster.internal/ubuntu jammy/main ppc64el po-debconf all 1.0.21+nmu1 [233 kB] 157s Get:46 http://ftpmaster.internal/ubuntu jammy/main ppc64el debhelper all 13.6ubuntu1 [923 kB] 157s Get:47 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfakeroot ppc64el 1.28-1ubuntu1 [33.8 kB] 157s Get:48 http://ftpmaster.internal/ubuntu jammy/main ppc64el fakeroot ppc64el 1.28-1ubuntu1 [62.8 kB] 157s Get:49 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-dirlist-perl all 0.05-2 [7100 B] 157s Get:50 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-which-perl all 1.23-1 [13.8 kB] 157s Get:51 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-homedir-perl all 1.006-1 [38.3 kB] 157s Get:52 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-touch-perl all 0.12-1 [9024 B] 157s Get:53 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-pty-perl ppc64el 1:1.15-2build2 [35.3 kB] 157s Get:54 http://ftpmaster.internal/ubuntu jammy/main ppc64el libipc-run-perl all 20200505.0-1 [89.8 kB] 157s Get:55 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 157s Get:56 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-xsaccessor-perl ppc64el 1.19-3build9 [36.6 kB] 157s Get:57 http://ftpmaster.internal/ubuntu jammy/main ppc64el libb-hooks-op-check-perl ppc64el 0.22-1build5 [10.4 kB] 157s Get:58 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 157s Get:59 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdevel-callchecker-perl ppc64el 0.008-1ubuntu4 [14.7 kB] 157s Get:60 http://ftpmaster.internal/ubuntu jammy/main ppc64el libparams-classify-perl ppc64el 0.015-1build5 [23.9 kB] 157s Get:61 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmodule-runtime-perl all 0.016-1 [16.2 kB] 157s Get:62 http://ftpmaster.internal/ubuntu jammy/main ppc64el libimport-into-perl all 1.002005-1 [11.0 kB] 157s Get:63 http://ftpmaster.internal/ubuntu jammy/main ppc64el librole-tiny-perl all 2.002004-1 [16.3 kB] 157s Get:64 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-quote-perl all 2.006006-1 [19.5 kB] 157s Get:65 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmoo-perl all 2.005004-3 [48.0 kB] 157s Get:66 http://ftpmaster.internal/ubuntu jammy/main ppc64el libencode-locale-perl all 1.05-1.1 [11.8 kB] 157s Get:67 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtimedate-perl all 2.3300-2 [34.0 kB] 157s Get:68 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-date-perl all 6.05-1 [9920 B] 157s Get:69 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-listing-perl all 6.14-1 [11.2 kB] 157s Get:70 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tagset-perl all 3.20-4 [12.5 kB] 157s Get:71 http://ftpmaster.internal/ubuntu jammy/main ppc64el liburi-perl all 5.10-1 [78.8 kB] 157s Get:72 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-parser-perl ppc64el 3.76-1build2 [93.6 kB] 157s Get:73 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tree-perl all 5.07-2 [200 kB] 158s Get:74 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-html-perl all 1.004-2 [15.4 kB] 158s Get:75 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 158s Get:76 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-message-perl all 6.36-1 [76.8 kB] 158s Get:77 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-cookies-perl all 6.10-1 [18.4 kB] 158s Get:78 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-negotiate-perl all 6.01-1 [12.5 kB] 158s Get:79 http://ftpmaster.internal/ubuntu jammy/main ppc64el perl-openssl-defaults ppc64el 5build2 [7540 B] 158s Get:80 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-ssleay-perl ppc64el 1.92-1build2 [332 kB] 158s Get:81 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-socket-ssl-perl all 2.074-2 [192 kB] 158s Get:82 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-http-perl all 6.22-1 [23.2 kB] 158s Get:83 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 158s Get:84 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtry-tiny-perl all 0.31-1 [21.8 kB] 158s Get:85 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-robotrules-perl all 6.02-1 [12.6 kB] 158s Get:86 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-perl all 6.61-1 [141 kB] 158s Get:87 http://ftpmaster.internal/ubuntu jammy/main ppc64el patchutils ppc64el 0.4.2-1build2 [86.6 kB] 158s Get:88 http://ftpmaster.internal/ubuntu jammy/main ppc64el wdiff ppc64el 1.2.2-2build3 [29.5 kB] 158s Get:89 http://ftpmaster.internal/ubuntu jammy/main ppc64el devscripts ppc64el 2.22.1ubuntu1 [1058 kB] 158s Get:90 http://ftpmaster.internal/ubuntu jammy/main ppc64el liberror-perl all 0.17029-1 [26.5 kB] 158s Get:91 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 158s Get:92 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git ppc64el 1:2.34.1-1ubuntu1.12 [4143 kB] 159s Get:93 http://ftpmaster.internal/ubuntu jammy/main ppc64el python3-dateutil all 2.8.1-6 [78.4 kB] 159s Get:94 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-buildpackage all 0.9.25 [799 kB] 159s Get:95 http://ftpmaster.internal/ubuntu jammy/main ppc64el libexporter-tiny-perl all 1.002002-1 [36.2 kB] 159s Get:96 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-xs-perl ppc64el 0.430-2build2 [42.5 kB] 159s Get:97 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-perl all 0.430-2 [38.2 kB] 159s Get:98 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-debian all 0.1.43ubuntu1.1 [107 kB] 159s Get:99 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-gpg ppc64el 1.16.0-1.2ubuntu4.2 [227 kB] 159s Get:100 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el dput all 1.1.0ubuntu2.1 [44.7 kB] 159s Get:101 http://ftpmaster.internal/ubuntu jammy/main ppc64el libjson-perl all 4.04000-1 [81.8 kB] 159s Get:102 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtext-glob-perl all 0.11-2 [8042 B] 159s Get:103 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libwww-curl-perl ppc64el 4.17-7build2 [72.5 kB] 159s Get:104 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libtext-csv-perl all 2.01-1 [108 kB] 159s Get:105 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit all 9.15 [194 kB] 159s Get:106 http://ftpmaster.internal/ubuntu jammy/main ppc64el diffstat ppc64el 1.64-1build2 [32.8 kB] 159s Get:107 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfile-fnmatch-perl ppc64el 0.02-2build8 [10.5 kB] 159s Get:108 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-debrebase all 9.15 [67.5 kB] 159s Get:109 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdbi-perl ppc64el 1.643-3build3 [748 kB] 159s Get:110 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libdbd-sqlite3-perl ppc64el 1.70-3build1 [172 kB] 159s Get:111 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-chdir-perl all 0.1008-1.1 [10.6 kB] 159s Get:112 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsort-versions-perl all 1.62-1 [9294 B] 159s Get:113 http://ftpmaster.internal/ubuntu jammy/main ppc64el libgit-wrapper-perl all 0.048-1 [29.9 kB] 159s Get:114 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-compare-perl all 0.55-1 [63.3 kB] 159s Get:115 http://ftpmaster.internal/ubuntu jammy/main ppc64el libstring-shellquote-perl all 1.04-1 [12.0 kB] 159s Get:116 http://ftpmaster.internal/ubuntu jammy/universe ppc64el quilt all 0.66-2.1 [304 kB] 159s Get:117 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el sqlite3 ppc64el 3.37.2-2ubuntu0.3 [880 kB] 159s Get:118 http://ftpmaster.internal/ubuntu jammy/universe ppc64el chiark-utils-bin ppc64el 6.1.2+nmu1 [55.7 kB] 159s Get:119 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit-infrastructure all 9.15 [40.8 kB] 159s Get:120 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfaketime ppc64el 0.9.8-9 [35.9 kB] 159s Get:121 http://ftpmaster.internal/ubuntu jammy/universe ppc64el faketime ppc64el 0.9.8-9 [10.3 kB] 161s Fetched 69.0 MB in 10s (6819 kB/s) 161s Selecting previously unselected package m4. 161s (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 ... 101007 files and directories currently installed.) 161s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_ppc64el.deb ... 161s Unpacking m4 (1.4.18-5ubuntu2) ... 161s Selecting previously unselected package autoconf. 161s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 161s Unpacking autoconf (2.71-2) ... 161s Selecting previously unselected package autotools-dev. 161s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 161s Unpacking autotools-dev (20220109.1) ... 161s Selecting previously unselected package automake. 161s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 161s Unpacking automake (1:1.16.5-1.3) ... 161s Selecting previously unselected package autopoint. 161s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 161s Unpacking autopoint (0.21-4ubuntu4) ... 161s Selecting previously unselected package libc-dev-bin. 161s Preparing to unpack .../005-libc-dev-bin_2.35-0ubuntu3.9_ppc64el.deb ... 161s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 161s Selecting previously unselected package linux-libc-dev:ppc64el. 161s Preparing to unpack .../006-linux-libc-dev_5.15.0-136.147_ppc64el.deb ... 161s Unpacking linux-libc-dev:ppc64el (5.15.0-136.147) ... 161s Selecting previously unselected package libcrypt-dev:ppc64el. 161s Preparing to unpack .../007-libcrypt-dev_1%3a4.4.27-1_ppc64el.deb ... 161s Unpacking libcrypt-dev:ppc64el (1:4.4.27-1) ... 161s Selecting previously unselected package rpcsvc-proto. 161s Preparing to unpack .../008-rpcsvc-proto_1.4.2-0ubuntu6_ppc64el.deb ... 161s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 161s Selecting previously unselected package libtirpc-dev:ppc64el. 161s Preparing to unpack .../009-libtirpc-dev_1.3.2-2ubuntu0.1_ppc64el.deb ... 161s Unpacking libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 161s Selecting previously unselected package libnsl-dev:ppc64el. 161s Preparing to unpack .../010-libnsl-dev_1.3.0-2build2_ppc64el.deb ... 161s Unpacking libnsl-dev:ppc64el (1.3.0-2build2) ... 161s Selecting previously unselected package libc6-dev:ppc64el. 161s Preparing to unpack .../011-libc6-dev_2.35-0ubuntu3.9_ppc64el.deb ... 161s Unpacking libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 161s Selecting previously unselected package gcc-11-base:ppc64el. 161s Preparing to unpack .../012-gcc-11-base_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 161s Unpacking gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 161s Selecting previously unselected package libisl23:ppc64el. 161s Preparing to unpack .../013-libisl23_0.24-2build1_ppc64el.deb ... 161s Unpacking libisl23:ppc64el (0.24-2build1) ... 161s Selecting previously unselected package libmpc3:ppc64el. 161s Preparing to unpack .../014-libmpc3_1.2.1-2build1_ppc64el.deb ... 161s Unpacking libmpc3:ppc64el (1.2.1-2build1) ... 161s Selecting previously unselected package cpp-11. 161s Preparing to unpack .../015-cpp-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 161s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 161s Selecting previously unselected package cpp. 161s Preparing to unpack .../016-cpp_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 161s Unpacking cpp (4:11.2.0-1ubuntu1) ... 161s Selecting previously unselected package libcc1-0:ppc64el. 161s Preparing to unpack .../017-libcc1-0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 161s Unpacking libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 161s Selecting previously unselected package libgomp1:ppc64el. 161s Preparing to unpack .../018-libgomp1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 161s Unpacking libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 161s Selecting previously unselected package libitm1:ppc64el. 161s Preparing to unpack .../019-libitm1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 161s Unpacking libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 161s Selecting previously unselected package libatomic1:ppc64el. 161s Preparing to unpack .../020-libatomic1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 161s Unpacking libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 162s Selecting previously unselected package libasan6:ppc64el. 162s Preparing to unpack .../021-libasan6_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 162s Unpacking libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 162s Selecting previously unselected package liblsan0:ppc64el. 162s Preparing to unpack .../022-liblsan0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 162s Unpacking liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 162s Selecting previously unselected package libtsan0:ppc64el. 162s Preparing to unpack .../023-libtsan0_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 162s Unpacking libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 162s Selecting previously unselected package libubsan1:ppc64el. 162s Preparing to unpack .../024-libubsan1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 162s Unpacking libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 162s Selecting previously unselected package libquadmath0:ppc64el. 162s Preparing to unpack .../025-libquadmath0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 162s Unpacking libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 162s Selecting previously unselected package libgcc-11-dev:ppc64el. 162s Preparing to unpack .../026-libgcc-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 162s Unpacking libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 162s Selecting previously unselected package gcc-11. 162s Preparing to unpack .../027-gcc-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 162s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 162s Selecting previously unselected package gcc. 162s Preparing to unpack .../028-gcc_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 162s Unpacking gcc (4:11.2.0-1ubuntu1) ... 162s Selecting previously unselected package libstdc++-11-dev:ppc64el. 162s Preparing to unpack .../029-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 162s Unpacking libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 162s Selecting previously unselected package g++-11. 162s Preparing to unpack .../030-g++-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 162s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 162s Selecting previously unselected package g++. 162s Preparing to unpack .../031-g++_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 162s Unpacking g++ (4:11.2.0-1ubuntu1) ... 162s Selecting previously unselected package build-essential. 162s Preparing to unpack .../032-build-essential_12.9ubuntu3_ppc64el.deb ... 162s Unpacking build-essential (12.9ubuntu3) ... 162s Selecting previously unselected package libdebhelper-perl. 162s Preparing to unpack .../033-libdebhelper-perl_13.6ubuntu1_all.deb ... 162s Unpacking libdebhelper-perl (13.6ubuntu1) ... 162s Selecting previously unselected package libtool. 162s Preparing to unpack .../034-libtool_2.4.6-15build2_all.deb ... 162s Unpacking libtool (2.4.6-15build2) ... 162s Selecting previously unselected package dh-autoreconf. 162s Preparing to unpack .../035-dh-autoreconf_20_all.deb ... 162s Unpacking dh-autoreconf (20) ... 162s Selecting previously unselected package libarchive-zip-perl. 162s Preparing to unpack .../036-libarchive-zip-perl_1.68-1_all.deb ... 162s Unpacking libarchive-zip-perl (1.68-1) ... 162s Selecting previously unselected package libsub-override-perl. 162s Preparing to unpack .../037-libsub-override-perl_0.09-2_all.deb ... 162s Unpacking libsub-override-perl (0.09-2) ... 162s Selecting previously unselected package libfile-stripnondeterminism-perl. 162s Preparing to unpack .../038-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 162s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 162s Selecting previously unselected package dh-strip-nondeterminism. 162s Preparing to unpack .../039-dh-strip-nondeterminism_1.13.0-1_all.deb ... 162s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 162s Selecting previously unselected package debugedit. 162s Preparing to unpack .../040-debugedit_1%3a5.0-4build1_ppc64el.deb ... 162s Unpacking debugedit (1:5.0-4build1) ... 162s Selecting previously unselected package dwz. 162s Preparing to unpack .../041-dwz_0.14-1build2_ppc64el.deb ... 162s Unpacking dwz (0.14-1build2) ... 162s Selecting previously unselected package gettext. 162s Preparing to unpack .../042-gettext_0.21-4ubuntu4_ppc64el.deb ... 162s Unpacking gettext (0.21-4ubuntu4) ... 163s Selecting previously unselected package intltool-debian. 163s Preparing to unpack .../043-intltool-debian_0.35.0+20060710.5_all.deb ... 163s Unpacking intltool-debian (0.35.0+20060710.5) ... 163s Selecting previously unselected package po-debconf. 163s Preparing to unpack .../044-po-debconf_1.0.21+nmu1_all.deb ... 163s Unpacking po-debconf (1.0.21+nmu1) ... 163s Selecting previously unselected package debhelper. 163s Preparing to unpack .../045-debhelper_13.6ubuntu1_all.deb ... 163s Unpacking debhelper (13.6ubuntu1) ... 163s Selecting previously unselected package libfakeroot:ppc64el. 163s Preparing to unpack .../046-libfakeroot_1.28-1ubuntu1_ppc64el.deb ... 163s Unpacking libfakeroot:ppc64el (1.28-1ubuntu1) ... 163s Selecting previously unselected package fakeroot. 163s Preparing to unpack .../047-fakeroot_1.28-1ubuntu1_ppc64el.deb ... 163s Unpacking fakeroot (1.28-1ubuntu1) ... 163s Selecting previously unselected package libfile-dirlist-perl. 163s Preparing to unpack .../048-libfile-dirlist-perl_0.05-2_all.deb ... 163s Unpacking libfile-dirlist-perl (0.05-2) ... 163s Selecting previously unselected package libfile-which-perl. 163s Preparing to unpack .../049-libfile-which-perl_1.23-1_all.deb ... 163s Unpacking libfile-which-perl (1.23-1) ... 163s Selecting previously unselected package libfile-homedir-perl. 163s Preparing to unpack .../050-libfile-homedir-perl_1.006-1_all.deb ... 163s Unpacking libfile-homedir-perl (1.006-1) ... 163s Selecting previously unselected package libfile-touch-perl. 163s Preparing to unpack .../051-libfile-touch-perl_0.12-1_all.deb ... 163s Unpacking libfile-touch-perl (0.12-1) ... 163s Selecting previously unselected package libio-pty-perl. 163s Preparing to unpack .../052-libio-pty-perl_1%3a1.15-2build2_ppc64el.deb ... 163s Unpacking libio-pty-perl (1:1.15-2build2) ... 163s Selecting previously unselected package libipc-run-perl. 163s Preparing to unpack .../053-libipc-run-perl_20200505.0-1_all.deb ... 163s Unpacking libipc-run-perl (20200505.0-1) ... 163s Selecting previously unselected package libclass-method-modifiers-perl. 163s Preparing to unpack .../054-libclass-method-modifiers-perl_2.13-1_all.deb ... 163s Unpacking libclass-method-modifiers-perl (2.13-1) ... 163s Selecting previously unselected package libclass-xsaccessor-perl. 163s Preparing to unpack .../055-libclass-xsaccessor-perl_1.19-3build9_ppc64el.deb ... 163s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 163s Selecting previously unselected package libb-hooks-op-check-perl. 163s Preparing to unpack .../056-libb-hooks-op-check-perl_0.22-1build5_ppc64el.deb ... 163s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 163s Selecting previously unselected package libdynaloader-functions-perl. 163s Preparing to unpack .../057-libdynaloader-functions-perl_0.003-1.1_all.deb ... 163s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 163s Selecting previously unselected package libdevel-callchecker-perl. 163s Preparing to unpack .../058-libdevel-callchecker-perl_0.008-1ubuntu4_ppc64el.deb ... 163s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 163s Selecting previously unselected package libparams-classify-perl. 163s Preparing to unpack .../059-libparams-classify-perl_0.015-1build5_ppc64el.deb ... 163s Unpacking libparams-classify-perl (0.015-1build5) ... 163s Selecting previously unselected package libmodule-runtime-perl. 163s Preparing to unpack .../060-libmodule-runtime-perl_0.016-1_all.deb ... 163s Unpacking libmodule-runtime-perl (0.016-1) ... 163s Selecting previously unselected package libimport-into-perl. 163s Preparing to unpack .../061-libimport-into-perl_1.002005-1_all.deb ... 163s Unpacking libimport-into-perl (1.002005-1) ... 163s Selecting previously unselected package librole-tiny-perl. 163s Preparing to unpack .../062-librole-tiny-perl_2.002004-1_all.deb ... 163s Unpacking librole-tiny-perl (2.002004-1) ... 163s Selecting previously unselected package libsub-quote-perl. 163s Preparing to unpack .../063-libsub-quote-perl_2.006006-1_all.deb ... 163s Unpacking libsub-quote-perl (2.006006-1) ... 163s Selecting previously unselected package libmoo-perl. 163s Preparing to unpack .../064-libmoo-perl_2.005004-3_all.deb ... 163s Unpacking libmoo-perl (2.005004-3) ... 163s Selecting previously unselected package libencode-locale-perl. 163s Preparing to unpack .../065-libencode-locale-perl_1.05-1.1_all.deb ... 163s Unpacking libencode-locale-perl (1.05-1.1) ... 163s Selecting previously unselected package libtimedate-perl. 163s Preparing to unpack .../066-libtimedate-perl_2.3300-2_all.deb ... 163s Unpacking libtimedate-perl (2.3300-2) ... 163s Selecting previously unselected package libhttp-date-perl. 163s Preparing to unpack .../067-libhttp-date-perl_6.05-1_all.deb ... 163s Unpacking libhttp-date-perl (6.05-1) ... 163s Selecting previously unselected package libfile-listing-perl. 163s Preparing to unpack .../068-libfile-listing-perl_6.14-1_all.deb ... 163s Unpacking libfile-listing-perl (6.14-1) ... 163s Selecting previously unselected package libhtml-tagset-perl. 163s Preparing to unpack .../069-libhtml-tagset-perl_3.20-4_all.deb ... 163s Unpacking libhtml-tagset-perl (3.20-4) ... 163s Selecting previously unselected package liburi-perl. 163s Preparing to unpack .../070-liburi-perl_5.10-1_all.deb ... 163s Unpacking liburi-perl (5.10-1) ... 163s Selecting previously unselected package libhtml-parser-perl:ppc64el. 163s Preparing to unpack .../071-libhtml-parser-perl_3.76-1build2_ppc64el.deb ... 163s Unpacking libhtml-parser-perl:ppc64el (3.76-1build2) ... 163s Selecting previously unselected package libhtml-tree-perl. 163s Preparing to unpack .../072-libhtml-tree-perl_5.07-2_all.deb ... 163s Unpacking libhtml-tree-perl (5.07-2) ... 163s Selecting previously unselected package libio-html-perl. 163s Preparing to unpack .../073-libio-html-perl_1.004-2_all.deb ... 163s Unpacking libio-html-perl (1.004-2) ... 163s Selecting previously unselected package liblwp-mediatypes-perl. 163s Preparing to unpack .../074-liblwp-mediatypes-perl_6.04-1_all.deb ... 163s Unpacking liblwp-mediatypes-perl (6.04-1) ... 163s Selecting previously unselected package libhttp-message-perl. 163s Preparing to unpack .../075-libhttp-message-perl_6.36-1_all.deb ... 163s Unpacking libhttp-message-perl (6.36-1) ... 163s Selecting previously unselected package libhttp-cookies-perl. 163s Preparing to unpack .../076-libhttp-cookies-perl_6.10-1_all.deb ... 163s Unpacking libhttp-cookies-perl (6.10-1) ... 163s Selecting previously unselected package libhttp-negotiate-perl. 163s Preparing to unpack .../077-libhttp-negotiate-perl_6.01-1_all.deb ... 163s Unpacking libhttp-negotiate-perl (6.01-1) ... 163s Selecting previously unselected package perl-openssl-defaults:ppc64el. 163s Preparing to unpack .../078-perl-openssl-defaults_5build2_ppc64el.deb ... 163s Unpacking perl-openssl-defaults:ppc64el (5build2) ... 163s Selecting previously unselected package libnet-ssleay-perl:ppc64el. 163s Preparing to unpack .../079-libnet-ssleay-perl_1.92-1build2_ppc64el.deb ... 163s Unpacking libnet-ssleay-perl:ppc64el (1.92-1build2) ... 163s Selecting previously unselected package libio-socket-ssl-perl. 163s Preparing to unpack .../080-libio-socket-ssl-perl_2.074-2_all.deb ... 163s Unpacking libio-socket-ssl-perl (2.074-2) ... 163s Selecting previously unselected package libnet-http-perl. 163s Preparing to unpack .../081-libnet-http-perl_6.22-1_all.deb ... 163s Unpacking libnet-http-perl (6.22-1) ... 163s Selecting previously unselected package liblwp-protocol-https-perl. 163s Preparing to unpack .../082-liblwp-protocol-https-perl_6.10-1_all.deb ... 163s Unpacking liblwp-protocol-https-perl (6.10-1) ... 163s Selecting previously unselected package libtry-tiny-perl. 163s Preparing to unpack .../083-libtry-tiny-perl_0.31-1_all.deb ... 163s Unpacking libtry-tiny-perl (0.31-1) ... 163s Selecting previously unselected package libwww-robotrules-perl. 163s Preparing to unpack .../084-libwww-robotrules-perl_6.02-1_all.deb ... 163s Unpacking libwww-robotrules-perl (6.02-1) ... 163s Selecting previously unselected package libwww-perl. 163s Preparing to unpack .../085-libwww-perl_6.61-1_all.deb ... 163s Unpacking libwww-perl (6.61-1) ... 163s Selecting previously unselected package patchutils. 163s Preparing to unpack .../086-patchutils_0.4.2-1build2_ppc64el.deb ... 163s Unpacking patchutils (0.4.2-1build2) ... 163s Selecting previously unselected package wdiff. 163s Preparing to unpack .../087-wdiff_1.2.2-2build3_ppc64el.deb ... 163s Unpacking wdiff (1.2.2-2build3) ... 163s Selecting previously unselected package devscripts. 163s Preparing to unpack .../088-devscripts_2.22.1ubuntu1_ppc64el.deb ... 163s Unpacking devscripts (2.22.1ubuntu1) ... 163s Selecting previously unselected package liberror-perl. 163s Preparing to unpack .../089-liberror-perl_0.17029-1_all.deb ... 163s Unpacking liberror-perl (0.17029-1) ... 163s Selecting previously unselected package git-man. 163s Preparing to unpack .../090-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 163s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 164s Selecting previously unselected package git. 164s Preparing to unpack .../091-git_1%3a2.34.1-1ubuntu1.12_ppc64el.deb ... 164s Unpacking git (1:2.34.1-1ubuntu1.12) ... 164s Selecting previously unselected package python3-dateutil. 164s Preparing to unpack .../092-python3-dateutil_2.8.1-6_all.deb ... 164s Unpacking python3-dateutil (2.8.1-6) ... 164s Selecting previously unselected package git-buildpackage. 164s Preparing to unpack .../093-git-buildpackage_0.9.25_all.deb ... 164s Unpacking git-buildpackage (0.9.25) ... 164s Selecting previously unselected package libexporter-tiny-perl. 164s Preparing to unpack .../094-libexporter-tiny-perl_1.002002-1_all.deb ... 164s Unpacking libexporter-tiny-perl (1.002002-1) ... 164s Selecting previously unselected package liblist-moreutils-xs-perl. 164s Preparing to unpack .../095-liblist-moreutils-xs-perl_0.430-2build2_ppc64el.deb ... 164s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 164s Selecting previously unselected package liblist-moreutils-perl. 164s Preparing to unpack .../096-liblist-moreutils-perl_0.430-2_all.deb ... 164s Unpacking liblist-moreutils-perl (0.430-2) ... 164s Selecting previously unselected package python3-debian. 164s Preparing to unpack .../097-python3-debian_0.1.43ubuntu1.1_all.deb ... 164s Unpacking python3-debian (0.1.43ubuntu1.1) ... 164s Selecting previously unselected package python3-gpg. 164s Preparing to unpack .../098-python3-gpg_1.16.0-1.2ubuntu4.2_ppc64el.deb ... 164s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 164s Selecting previously unselected package dput. 164s Preparing to unpack .../099-dput_1.1.0ubuntu2.1_all.deb ... 164s Unpacking dput (1.1.0ubuntu2.1) ... 164s Selecting previously unselected package libjson-perl. 164s Preparing to unpack .../100-libjson-perl_4.04000-1_all.deb ... 164s Unpacking libjson-perl (4.04000-1) ... 164s Selecting previously unselected package libtext-glob-perl. 164s Preparing to unpack .../101-libtext-glob-perl_0.11-2_all.deb ... 164s Unpacking libtext-glob-perl (0.11-2) ... 164s Selecting previously unselected package libwww-curl-perl. 164s Preparing to unpack .../102-libwww-curl-perl_4.17-7build2_ppc64el.deb ... 164s Unpacking libwww-curl-perl (4.17-7build2) ... 164s Selecting previously unselected package libtext-csv-perl. 164s Preparing to unpack .../103-libtext-csv-perl_2.01-1_all.deb ... 164s Unpacking libtext-csv-perl (2.01-1) ... 164s Selecting previously unselected package dgit. 164s Preparing to unpack .../104-dgit_9.15_all.deb ... 164s Unpacking dgit (9.15) ... 164s Selecting previously unselected package diffstat. 164s Preparing to unpack .../105-diffstat_1.64-1build2_ppc64el.deb ... 164s Unpacking diffstat (1.64-1build2) ... 164s Selecting previously unselected package libfile-fnmatch-perl. 164s Preparing to unpack .../106-libfile-fnmatch-perl_0.02-2build8_ppc64el.deb ... 164s Unpacking libfile-fnmatch-perl (0.02-2build8) ... 164s Selecting previously unselected package git-debrebase. 164s Preparing to unpack .../107-git-debrebase_9.15_all.deb ... 164s Unpacking git-debrebase (9.15) ... 164s Selecting previously unselected package libdbi-perl:ppc64el. 164s Preparing to unpack .../108-libdbi-perl_1.643-3build3_ppc64el.deb ... 164s Unpacking libdbi-perl:ppc64el (1.643-3build3) ... 164s Selecting previously unselected package libdbd-sqlite3-perl:ppc64el. 164s Preparing to unpack .../109-libdbd-sqlite3-perl_1.70-3build1_ppc64el.deb ... 164s Unpacking libdbd-sqlite3-perl:ppc64el (1.70-3build1) ... 164s Selecting previously unselected package libfile-chdir-perl. 164s Preparing to unpack .../110-libfile-chdir-perl_0.1008-1.1_all.deb ... 164s Unpacking libfile-chdir-perl (0.1008-1.1) ... 164s Selecting previously unselected package libsort-versions-perl. 164s Preparing to unpack .../111-libsort-versions-perl_1.62-1_all.deb ... 164s Unpacking libsort-versions-perl (1.62-1) ... 164s Selecting previously unselected package libgit-wrapper-perl. 164s Preparing to unpack .../112-libgit-wrapper-perl_0.048-1_all.deb ... 164s Unpacking libgit-wrapper-perl (0.048-1) ... 164s Selecting previously unselected package liblist-compare-perl. 164s Preparing to unpack .../113-liblist-compare-perl_0.55-1_all.deb ... 164s Unpacking liblist-compare-perl (0.55-1) ... 164s Selecting previously unselected package libstring-shellquote-perl. 164s Preparing to unpack .../114-libstring-shellquote-perl_1.04-1_all.deb ... 164s Unpacking libstring-shellquote-perl (1.04-1) ... 164s Selecting previously unselected package quilt. 164s Preparing to unpack .../115-quilt_0.66-2.1_all.deb ... 164s Unpacking quilt (0.66-2.1) ... 164s Selecting previously unselected package sqlite3. 164s Preparing to unpack .../116-sqlite3_3.37.2-2ubuntu0.3_ppc64el.deb ... 164s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 164s Selecting previously unselected package chiark-utils-bin. 164s Preparing to unpack .../117-chiark-utils-bin_6.1.2+nmu1_ppc64el.deb ... 164s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 164s Selecting previously unselected package dgit-infrastructure. 164s Preparing to unpack .../118-dgit-infrastructure_9.15_all.deb ... 164s Unpacking dgit-infrastructure (9.15) ... 164s Selecting previously unselected package libfaketime:ppc64el. 164s Preparing to unpack .../119-libfaketime_0.9.8-9_ppc64el.deb ... 164s Unpacking libfaketime:ppc64el (0.9.8-9) ... 164s Selecting previously unselected package faketime. 164s Preparing to unpack .../120-faketime_0.9.8-9_ppc64el.deb ... 164s Unpacking faketime (0.9.8-9) ... 164s Setting up wdiff (1.2.2-2build3) ... 164s Setting up gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 164s Setting up libfile-which-perl (1.23-1) ... 164s Setting up libdynaloader-functions-perl (0.003-1.1) ... 164s Setting up libtext-glob-perl (0.11-2) ... 164s Setting up libclass-method-modifiers-perl (2.13-1) ... 164s Setting up liblist-compare-perl (0.55-1) ... 164s Setting up libio-pty-perl (1:1.15-2build2) ... 164s Setting up libarchive-zip-perl (1.68-1) ... 164s Setting up libhtml-tagset-perl (3.20-4) ... 164s Setting up libdebhelper-perl (13.6ubuntu1) ... 164s Setting up liblwp-mediatypes-perl (6.04-1) ... 164s Setting up libtry-tiny-perl (0.31-1) ... 164s Setting up perl-openssl-defaults:ppc64el (5build2) ... 164s Setting up linux-libc-dev:ppc64el (5.15.0-136.147) ... 164s Setting up m4 (1.4.18-5ubuntu2) ... 164s Setting up libwww-curl-perl (4.17-7build2) ... 164s Setting up libencode-locale-perl (1.05-1.1) ... 164s Setting up libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 164s Setting up libstring-shellquote-perl (1.04-1) ... 164s Setting up libfakeroot:ppc64el (1.28-1ubuntu1) ... 164s Setting up libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 164s Setting up chiark-utils-bin (6.1.2+nmu1) ... 164s Setting up fakeroot (1.28-1ubuntu1) ... 164s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 164s Setting up liberror-perl (0.17029-1) ... 164s Setting up patchutils (0.4.2-1build2) ... 164s Setting up autotools-dev (20220109.1) ... 164s Setting up libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 164s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 164s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 165s Setting up python3-debian (0.1.43ubuntu1.1) ... 165s Setting up libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 165s Setting up diffstat (1.64-1build2) ... 165s Setting up libmpc3:ppc64el (1.2.1-2build1) ... 165s Setting up libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 165s Setting up libio-html-perl (1.004-2) ... 165s Setting up autopoint (0.21-4ubuntu4) ... 165s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 165s Setting up libipc-run-perl (20200505.0-1) ... 165s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 165s Setting up autoconf (2.71-2) ... 165s Setting up libfile-fnmatch-perl (0.02-2build8) ... 165s Setting up libtimedate-perl (2.3300-2) ... 165s Setting up libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 165s Setting up dwz (0.14-1build2) ... 165s Setting up libfile-chdir-perl (0.1008-1.1) ... 165s Setting up libnsl-dev:ppc64el (1.3.0-2build2) ... 165s Setting up libcrypt-dev:ppc64el (1:4.4.27-1) ... 165s Setting up libjson-perl (4.04000-1) ... 165s Setting up librole-tiny-perl (2.002004-1) ... 165s Setting up debugedit (1:5.0-4build1) ... 165s Setting up libsub-override-perl (0.09-2) ... 165s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 165s Setting up python3-dateutil (2.8.1-6) ... 165s Setting up libsub-quote-perl (2.006006-1) ... 165s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 165s Setting up libsort-versions-perl (1.62-1) ... 165s Setting up libexporter-tiny-perl (1.002002-1) ... 165s Setting up libfile-dirlist-perl (0.05-2) ... 165s Setting up libisl23:ppc64el (0.24-2build1) ... 165s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 165s Setting up libfile-homedir-perl (1.006-1) ... 165s Setting up libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 165s Setting up liburi-perl (5.10-1) ... 165s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 165s Setting up libfile-touch-perl (0.12-1) ... 165s Setting up libdbi-perl:ppc64el (1.643-3build3) ... 165s Setting up liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 165s Setting up libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 165s Setting up libfaketime:ppc64el (0.9.8-9) ... 165s Setting up libtext-csv-perl (2.01-1) ... 165s Setting up libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 165s Setting up libnet-ssleay-perl:ppc64el (1.92-1build2) ... 165s Setting up automake (1:1.16.5-1.3) ... 165s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 165s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 165s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 165s Setting up faketime (0.9.8-9) ... 165s Setting up libhttp-date-perl (6.05-1) ... 165s Setting up gettext (0.21-4ubuntu4) ... 165s Setting up libfile-listing-perl (6.14-1) ... 165s Setting up liblist-moreutils-perl (0.430-2) ... 165s Setting up libnet-http-perl (6.22-1) ... 165s Setting up quilt (0.66-2.1) ... 165s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 165s Setting up dput (1.1.0ubuntu2.1) ... 165s Setting up intltool-debian (0.35.0+20060710.5) ... 165s Setting up git (1:2.34.1-1ubuntu1.12) ... 165s Setting up dh-strip-nondeterminism (1.13.0-1) ... 165s Setting up libwww-robotrules-perl (6.02-1) ... 165s Setting up libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 165s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 165s Setting up cpp (4:11.2.0-1ubuntu1) ... 165s Setting up libhtml-parser-perl:ppc64el (3.76-1build2) ... 165s Setting up libgit-wrapper-perl (0.048-1) ... 165s Setting up libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 165s Setting up libdbd-sqlite3-perl:ppc64el (1.70-3build1) ... 165s Setting up libio-socket-ssl-perl (2.074-2) ... 165s Setting up libhttp-message-perl (6.36-1) ... 165s Setting up libhttp-negotiate-perl (6.01-1) ... 165s Setting up libhttp-cookies-perl (6.10-1) ... 165s Setting up libtool (2.4.6-15build2) ... 165s Setting up po-debconf (1.0.21+nmu1) ... 165s Setting up libhtml-tree-perl (5.07-2) ... 165s Setting up libparams-classify-perl (0.015-1build5) ... 165s Setting up gcc (4:11.2.0-1ubuntu1) ... 165s Setting up dh-autoreconf (20) ... 165s Setting up libmodule-runtime-perl (0.016-1) ... 165s Setting up libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 165s Setting up dgit-infrastructure (9.15) ... 165s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 165s Setting up libimport-into-perl (1.002005-1) ... 165s Setting up libmoo-perl (2.005004-3) ... 165s Setting up debhelper (13.6ubuntu1) ... 165s Setting up g++ (4:11.2.0-1ubuntu1) ... 165s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 165s Setting up build-essential (12.9ubuntu3) ... 165s Setting up liblwp-protocol-https-perl (6.10-1) ... 165s Setting up libwww-perl (6.61-1) ... 165s Setting up devscripts (2.22.1ubuntu1) ... 165s Setting up git-buildpackage (0.9.25) ... 165s Setting up git-debrebase (9.15) ... 165s Setting up dgit (9.15) ... 165s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 166s Processing triggers for man-db (2.10.2-1) ... 166s Processing triggers for install-info (6.8-4build1) ... 168s autopkgtest [22:49:58]: test baredebian-multitar: [----------------------- 168s ++ set -o pipefail 168s ++ . tests/lib-core 168s ++ . tests/lib-restricts 168s ++ trap ' 168s rc=$? 168s set +x 168s test $rc = 0 || echo " 168s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 168s 168s Most relevant logs are just before assignment rc=$rc 168s Will now do cleanup etc. 168s " 168s set -x 168s set +e 168s pwd 168s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 168s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 168s set -e 168s test $rc = 0 || t-report-failure 168s ' EXIT 168s ++ t-filter-out-git-hyphen-dir 168s ++ local pathent 168s +++ type -p git-rev-parse 168s +++ : 168s ++ pathent= 168s ++ case "$pathent" in 168s ++ return 168s ++ t-set-intree 168s ++ '[' x = x ']' 168s ++ return 168s ++ : -D 168s ++ export DGIT_TEST_DEBUG 168s ++ : x 168s ++ export DGIT_TEST_DEBPUSH_DEBUG 168s ++ : 168s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 168s ++ GIT_COMMITTER_DATE='1530000000 +0100' 168s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 168s ++ GIT_AUTHOR_DATE='1530000000 +0100' 168s ++ export LC_CTYPE=C.UTF-8 168s ++ LC_CTYPE=C.UTF-8 168s ++ unset CDPATH 168s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 168s ++ FILTER_BRANCH_SQUELCH_WARNING=1 168s +++ pwd 168s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 168s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 168s ++ testname=baredebian-multitar 168s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 168s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 168s ++ bpd=.. 168s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 168s ++ '[' x '!=' x ']' 168s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s +++ pwd 168s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ t-set-using-tmp 168s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 168s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 168s ++ export 'DEBFULLNAME=dgit test git user' 168s ++ DEBFULLNAME='dgit test git user' 168s ++ git config --global user.email dgit-test@debian.example.net 168s ++ git config --global user.name 'dgit test git user' 168s ++ git config --global protocol.ext.allow always 168s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 168s ++ env -0 168s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 168s ++ export DEBCHANGE_VENDOR=dpkg 168s ++ DEBCHANGE_VENDOR=dpkg 168s ++ unset VISUAL 168s ++ unset GIT_EDITOR 168s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 168s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 168s ++ cat 168s ++ schroot=build 168s ++ : aq 168s ++ : archive/test-dummy 168s ++ : sid:unstable 168s ++ t-git-config dgit.default.old-dsc-distro test-dummy 168s ++ git config --global dgit.default.old-dsc-distro test-dummy 168s ++ for import in ${autoimport-gnupg} 168s ++ case "$0" in 168s ++ t-setup-import gnupg 168s ++ local setupname=gnupg 168s ++ local setupsrc 168s ++ local lock 168s ++ '[' x = x ']' 168s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 168s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 168s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 168s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 168s cd "$1"; shift 168s setupname="$1"; shift 168s simport="$1"; shift 168s if [ -e "$simport" ]; then exit 0; fi 168s env - "$@" \ 168s "tests/setup/$setupname" 168s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 168s + cd /tmp/autopkgtest.XK8uun/build.980/src 168s + shift 168s + setupname=gnupg 168s + shift 168s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 168s + shift 168s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 168s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/baredebian-multitar-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/baredebian-multitar-stderr --stdout=/tmp/autopkgtest.XK8uun/baredebian-multitar-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/baredebian-multitar -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/baredebian-multitar' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/baredebian-multitar-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 168s ++ set -o pipefail 168s ++ . tests/lib-core 168s ++ . tests/lib-restricts 168s ++ trap ' 168s rc=$? 168s set +x 168s test $rc = 0 || echo " 168s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 168s 168s Most relevant logs are just before assignment rc=$rc 168s Will now do cleanup etc. 168s " 168s set -x 168s set +e 168s pwd 168s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 168s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 168s set -e 168s test $rc = 0 || t-report-failure 168s ' EXIT 168s ++ t-filter-out-git-hyphen-dir 168s ++ local pathent 168s +++ type -p git-rev-parse 168s +++ : 168s ++ pathent= 168s ++ case "$pathent" in 168s ++ return 168s ++ t-set-intree 168s ++ '[' x = x ']' 168s ++ return 168s ++ : -D 168s ++ export DGIT_TEST_DEBUG 168s ++ : x 168s ++ export DGIT_TEST_DEBPUSH_DEBUG 168s ++ : 168s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 168s ++ GIT_COMMITTER_DATE='1530000000 +0100' 168s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 168s ++ GIT_AUTHOR_DATE='1530000000 +0100' 168s ++ export LC_CTYPE=C.UTF-8 168s ++ LC_CTYPE=C.UTF-8 168s ++ unset CDPATH 168s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 168s ++ FILTER_BRANCH_SQUELCH_WARNING=1 168s +++ pwd 168s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 168s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 168s ++ testname=gnupg 168s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 168s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 168s ++ bpd=.. 168s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 168s ++ '[' x '!=' x ']' 168s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s +++ pwd 168s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ t-set-using-tmp 168s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 168s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 168s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 168s ++ export 'DEBFULLNAME=dgit test git user' 168s ++ DEBFULLNAME='dgit test git user' 168s ++ git config --global user.email dgit-test@debian.example.net 168s ++ git config --global user.name 'dgit test git user' 168s ++ git config --global protocol.ext.allow always 168s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 168s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 168s ++ export DEBCHANGE_VENDOR=dpkg 168s ++ DEBCHANGE_VENDOR=dpkg 168s ++ unset VISUAL 168s ++ unset GIT_EDITOR 168s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 168s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 168s ++ cat 168s ++ schroot=build 168s ++ : aq 168s ++ : archive/test-dummy 168s ++ : sid:unstable 168s ++ t-git-config dgit.default.old-dsc-distro test-dummy 168s ++ git config --global dgit.default.old-dsc-distro test-dummy 168s ++ for import in ${autoimport-gnupg} 168s ++ case "$0" in 168s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 168s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 168s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 168s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 168s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 168s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 168s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 168s + setup=' 168s export GNUPGHOME=$tmp/gnupg 168s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 168s 168s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 168s ssb rsa2048 2013-11-17 [E] 168s 168s sec rsa2048 2014-01-26 [SC] 168s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 168s uid [ultimate] Populus Romanus (test key) 168s ssb rsa2048 2014-01-26 [E] 168s 168s sec rsa2048 2014-01-26 [SC] 168s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 168s uid [ unknown] Hannibal (test key) 168s ssb rsa2048 2014-01-26 [E] 168s 168s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 168s export GNUPGHOME=$tmp/gnupg 168s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 168s 168s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 169s "sha256sum" => "$2", 169s "component" => "$3", 169s "filename" => "$4", 169s }; 169s END { 169s my $json = JSON->new->canonical(); 169s print $json->encode(\@v) or die $!; 169s } 169s ' 169s + t-aq-archive-updated new example 169s + local suite=new 169s + local p=example 169s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 169s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 169s + perl -wne ' 169s use JSON; 169s use strict; 169s our @v; 169s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 169s push @v, { 169s "version" => "$1", 169s "sha256sum" => "$2", 169s "component" => "$3", 169s "filename" => "$4", 169s }; 169s END { 169s my $json = JSON->new->canonical(); 169s print $json->encode(\@v) or die $!; 169s } 169s ' 169s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 169s + cat 169s + jsondelim=' },' 169s + cat 169s + t-git-none 169s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 169s + set -e 169s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 169s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 169s + t-gdr-gbp-import-core-with-queue 169s + t-gdr-gbp-import-core 169s + p=example 169s + t-worktree 1.1 169s + rm -rf example 169s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1 169s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 169s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 169s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 169s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 169s + cd example 169s + : 'fake up some kind of upstream' 169s + git checkout -b upstream quilt-tip 169s Switched to a new branch 'upstream' 169s + rm -rf debian 169s + mkdir debian 169s + echo junk 169s + git add debian 169s + git commit -m 'an upstream retcon (tests/setup/baredebian)' 169s [upstream aa9b151] an upstream retcon (tests/setup/baredebian) 169s 6 files changed, 1 insertion(+), 36 deletions(-) 169s delete mode 100644 debian/changelog 169s delete mode 100644 debian/compat 169s delete mode 100644 debian/control 169s delete mode 100644 debian/example.install 169s mode change 100755 => 100644 debian/rules 169s delete mode 100644 debian/source/format 169s + git tag v1.0 169s + : 'fake up that our quilt-tip was descended from upstream' 169s + git checkout quilt-tip 169s Switched to branch 'quilt-tip' 169s + git merge --no-edit -s ours upstream 169s Merge made by the 'ours' strategy. 169s + : 'fake up that our quilt-tip had the patch queue in it' 169s + git checkout patch-queue/quilt-tip 169s Switched to branch 'patch-queue/quilt-tip' 169s + gbp pq export 169s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 169s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 169s + git add debian/patches 169s + git commit -m 'patch queue update (tests/setup/baredebian)' 169s [quilt-tip 474da4c] patch queue update (tests/setup/baredebian) 169s 4 files changed, 50 insertions(+) 169s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 169s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 169s create mode 100644 debian/patches/series 169s create mode 100644 debian/patches/subdir/addnewups 169s + : 'make branch names more conventional' 169s + git branch -D master 169s Deleted branch master (was 17d67db). 169s + git branch -m quilt-tip master 169s + git-deborig 169s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 169s + git branch -D patch-queue/quilt-tip 169s Deleted branch patch-queue/quilt-tip (was d843a68). 169s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 169s + git branch -D gitish-only 169s Deleted branch gitish-only (was 2b2ddc8). 169s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 169s + git branch -D quilt-tip-1.1 169s Deleted branch quilt-tip-1.1 (was 7fc34be). 169s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 169s + git branch -D quilt-tip-2 169s Deleted branch quilt-tip-2 (was 99fcab4). 169s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 169s + git branch -D indep-arch 169s Deleted branch indep-arch (was e215729). 169s + git rm -rf . 169s rm '.gitignore' 169s rm 'debian/changelog' 169s rm 'debian/compat' 169s rm 'debian/control' 169s rm 'debian/example.install' 169s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 169s rm 'debian/patches/0002-Edit-the-.c-file.patch' 169s rm 'debian/patches/series' 169s rm 'debian/patches/subdir/addnewups' 169s rm 'debian/rules' 169s rm 'debian/source/format' 169s rm 'docs/README' 169s rm 'example' 169s rm 'src.c' 169s + git checkout HEAD -- debian 169s ++ git write-tree 169s + t=1b876c7f2ff3a5f3e269aa710210897c32caee00 169s ++ git commit-tree -m 'Convert to bare debian' 1b876c7f2ff3a5f3e269aa710210897c32caee00 169s + t=5c410cc573946394fbd85950449595317108dca9 169s + git reset --hard 5c410cc573946394fbd85950449595317108dca9 169s HEAD is now at 5c410cc Convert to bare debian 169s ++ echo 'example*' 169s + t-setup-done '' 'example* git mirror aq' ' 169s t-select-package example 169s t-git-next-date 169s ' 169s + local savevars= 169s + local 'savedirs=example* git mirror aq' 169s + local 'importeval= 169s t-select-package example 169s t-git-next-date 169s ' 169s + local import=IMPORT.baredebian 169s + exec 169s + local vn 169s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 169s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 169s print STDERR "saving-exporting $vn\n"; 169s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 169s or die $!; 169s } 169s ' 169s saving-exporting DGIT_TEST_REAL_GPG 169s saving-exporting DGIT_TEST_REAL_GPG_AGENT 169s saving-exporting DGIT_TEST_REAL_DEBCHANGE 169s + set -e 169s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 169s + tar cf IMPORT.baredebian.tar example example_1.0.orig.tar.xz git mirror aq 169s + printf '\n%s\n' ' 169s t-select-package example 169s t-git-next-date 169s ' 169s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian 169s + rc=0 169s + set +x 169s + set +e 169s + pwd 169s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 169s + '[' x '!=' x ']' 169s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 169s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 169s + set -e 169s + test 0 = 0 169s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 169s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 169s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian 169s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 169s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 169s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 169s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 169s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 169s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 169s ++ t-select-package example 169s ++ p=example 169s ++ dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 169s ++ t-git-next-date 169s ++ GIT_COMMITTER_DATE='1530000001 +0100' 169s ++ GIT_AUTHOR_DATE='1530000001 +0100' 169s + t-tstunt-parsechangelog 169s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 169s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 169s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 169s + local var=PATH 169s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 169s + eval ' 169s case "$PATH" in 169s "$tstunt:"*) ;; 169s *":$tstunt:"*) ;; 169s "") PATH="$tstunt" ;; 169s *) PATH="$tstunt:$PATH" ;; 169s esac 169s export PATH 169s ' 169s ++ case "$PATH" in 169s ++ export PATH 169s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 169s + local var=PERLLIB 169s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 169s + eval ' 169s case "$PERLLIB" in 169s "$tstunt:"*) ;; 169s *":$tstunt:"*) ;; 169s "") PERLLIB="$tstunt" ;; 169s *) PERLLIB="$tstunt:$PERLLIB" ;; 169s esac 169s export PERLLIB 169s ' 169s ++ case "$PERLLIB" in 169s ++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 169s ++ export PERLLIB 169s + local f 169s + for f in "$@" 169s + t-tstunt--save-real dpkg-parsechangelog 169s + local f=dpkg-parsechangelog 169s + case "$f" in 169s + local rc 169s + local real 169s + set +e 169s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 169s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 169s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 169s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 169s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 169s ++ type -p dpkg-parsechangelog 169s + real=/usr/bin/dpkg-parsechangelog 169s + rc=0 169s + set -e 169s + case $rc in 169s + local varname=dpkg_parsechangelog 169s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 169s + eval ' 169s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 169s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 169s ' 169s ++ : /usr/bin/dpkg-parsechangelog 169s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 169s + f=./dpkg-parsechangelog 169s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 169s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 169s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 169s + for f in "$@" 169s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 169s + local f=Dpkg/Changelog/Parse.pm 169s + case "$f" in 169s + return 169s + f=./Dpkg/Changelog/Parse.pm 169s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 169s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 169s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 169s + cd example 169s + baredebian-test-vars 169s + quiltmode=baredebian 169s + v=1.0-1 169s + suite=sid 169s + uv=1.0 169s + uvtag=v1.0 169s + origbase=example_1.0.orig 169s + xorigcomps= 169s + baredebian-tarball-mode 169s + git tag -d v1.0 169s Deleted tag 'v1.0' (was aa9b151) 169s + uvtag= 169s + quiltmode=baredebian+tarball 169s + rm -f ../example_1.0.orig.tar.xz 169s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0.orig-docs.tar.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0.orig.tar.gz .. 169s + xorigcomps=docs 169s + git tag -d 169s + baredebian-test-minimum 169s + t-expect-fail 'contradicts clean mode git-ff' t-dgit -wgf --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 169s + local 'mpat=contradicts clean mode git-ff' 169s + shift 169s + set +o pipefail 169s + LC_MESSAGES=C 169s + LANGUAGE=C 169s + t-dgit -wgf --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 169s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 169s + local dgit=dgit 169s + pwd 169s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 169s + : ' 169s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 169s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 169s | git rev-parse --show-toplevel 169s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 169s | git config -z --get-regexp --local '.*' 169s | git config -z --get-regexp --local '.*' 169s | git config -z --get-regexp --global '.*' 169s | git config -z --get-regexp --system '.*' 169s format 3.0 (quilt), quilt mode baredebian+tarball 169s Format `3.0 (quilt)', need to check/update patch stack 169s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 169s => `' 169s + git diff --quiet HEAD 169s 169s dgit: error: quilt mode baredebian+tarball (generally needs untracked upstream files) 169s dgit: contradicts clean mode git-ff (which would delete them) 169s + local 'ps=255 0' 169s + set -o pipefail 169s + case $ps in 169s + t-grep-mpat 'contradicts clean mode git-ff' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 169s + local 'mpat=contradicts clean mode git-ff' 169s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 169s + local grepper=fgrep 169s + case "$mpat" in 169s + fgrep -e 'contradicts clean mode git-ff' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 169s dgit: contradicts clean mode git-ff (which would delete them) 169s + t-dgit -wn --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 169s + local dgit=dgit 169s + pwd 169s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 169s + : ' 169s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 169s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 170s | git rev-parse --show-toplevel 170s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 170s | git config -z --get-regexp --local '.*' 170s | git config -z --get-regexp --local '.*' 170s | git config -z --get-regexp --global '.*' 170s | git config -z --get-regexp --system '.*' 170s format 3.0 (quilt), quilt mode baredebian+tarball 170s Format `3.0 (quilt)', need to check/update patch stack 170s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 170s => `' 170s + git diff --quiet HEAD 170s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 170s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 170s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 170s | git rev-parse 'HEAD~0' 170s => `5c410cc573946394fbd85950449595317108dca9' 170s | git symbolic-ref -q HEAD 170s => `refs/heads/master' 170s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 170s QF linkorigs example_1.0.orig-docs.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig-docs.tar.gz Y 170s QF linkorigs example_1.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.gz Y 170s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 170s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 170s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 170s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball 5c410cc573946394fbd85950449595317108dca9 - 22379dc8d076edb6a883b89f889dc02b152201727ecdd5fa687bf96250a22052 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 170s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 170s >(no reflog) 170s splitbrain cache miss 170s CD work 170s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 170s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 170s + git checkout -q -b dgit-view 170s examining quilt state (multiple patches, baredebian+tarball mode) 170s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 170s CD fake 170s | find -name .git -prune -print0 170s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 170s + git checkout -f 5c410cc573946394fbd85950449595317108dca9 -- debian 170s + git add -Af . 170s | git write-tree 170s => `e24b70dab05337283037dfefde87e77ee7ff43f6' 170s fake orig tree object e24b70dab05337283037dfefde87e77ee7ff43f6 170s CD .. 170s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 170s CD ../fake 170s + git add -Af . 170s | git write-tree 170s => `f45019e20f793efa44bafe38eef6dd784f356f59' 170s fake o+d/p tree object e24b70dab05337283037dfefde87e77ee7ff43f6 170s CD ../work 170s | git ls-tree --name-only -z 5c410cc573946394fbd85950449595317108dca9 170s => `debian\x00' 170s CD .. 170s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 170s + chmod -R '+rwX' _unpack-tar 170s CD _unpack-tar 170s | find -name .git -prune -print0 170s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 170s + git add -Af . 170s | git write-tree 170s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 170s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 170s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 170s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 170s CD .. 170s import considering example_1.0.orig.tar.gz Y .gz orig 170s + chmod -R '+rwX' _unpack-tar 170s CD _unpack-tar 170s | find -name .git -prune -print0 170s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 170s + git add -Af . 170s | git write-tree 170s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 170s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 170s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 170s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 170s CD .. 170s CD work 170s import clog search... 170s | dpkg-parsechangelog --format rfc822 --all 170s import clog 1.0-1 package changelog, entry no.1... 170s import clog 1.0-1 vs 1.0... 170s import clog 1.0-1 becomes r1 170s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 170s => `1431548802 +0000' 170s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 170s => `1431548802 +0000' 170s import tartrees authline Ian Jackson 1431548802 +0000 170s import tartrees r1authline Ian Jackson 1431548802 +0000 170s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 170s | git hash-object -w -t commit --stdin 170s => 94c010931d011cbd6c1861bb9d453aa12d826298 170s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 170s | git hash-object -w -t commit --stdin 170s => a5bb1f49c872a76a5d703570fd5352e424719bda 170s + git rm --quiet -rf --cached --ignore-unmatch . 170s + git read-tree 94c010931d011cbd6c1861bb9d453aa12d826298 170s + git rm --quiet -rf --cached --ignore-unmatch docs 170s + git read-tree --prefix=docs/ a5bb1f49c872a76a5d703570fd5352e424719bda 170s | git write-tree 170s => `b5c653c509621c62608ee67507d359ddd46a900b' 170s | git hash-object -w -t commit --stdin 170s => c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 170s + git reset -q 170s | git diff-tree -z --no-renames -r e24b70dab05337283037dfefde87e77ee7ff43f6 c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 170s => `: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' 170s quiltify_trees_differ e24b70dab05337283037dfefde87e77ee7ff43f6 c54c10146a9aad6d3dcba4e07eeddde7cb1eebef => 0 170s | git diff-tree -z --no-renames --name-only -r c54c10146a9aad6d3dcba4e07eeddde7cb1eebef f45019e20f793efa44bafe38eef6dd784f356f59 170s => `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' 170s quiltify_trees_differ c54c10146a9aad6d3dcba4e07eeddde7cb1eebef f45019e20f793efa44bafe38eef6dd784f356f59 => 1 170s | git diff-tree -z --no-renames --name-only -r e24b70dab05337283037dfefde87e77ee7ff43f6 f45019e20f793efa44bafe38eef6dd784f356f59 170s => `lib.c\x00new-upstream-file\x00src.c\x00' 170s quiltify_trees_differ e24b70dab05337283037dfefde87e77ee7ff43f6 f45019e20f793efa44bafe38eef6dd784f356f59 => 1 170s differences @dl == ## ## == == ==. 170s dgit: base trees orig=e24b70dab05337283037 o+d/p=f45019e20f793efa44ba 170s dgit: quilt differences: src: == orig ## gitignores: == orig == 170s dgit: quilt differences: tarballs ## o+d/p tarballs == o+d/p 170s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 170s => `1431548802 +0000' 170s + git read-tree c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 170s + git rm --quiet -rf --cached --ignore-unmatch debian 170s + git read-tree --prefix=debian/ 5c410cc573946394fbd85950449595317108dca9:debian 170s | git write-tree 170s => `e24b70dab05337283037dfefde87e77ee7ff43f6' 170s | git commit-tree e24b70dab05337283037dfefde87e77ee7ff43f6 -p 5c410cc573946394fbd85950449595317108dca9 -p c54c10146a9aad6d3dcba4e07eeddde7cb1eebef -m 'Combine debian/ with upstream source for 1.0 170s ' -m '' -m '[dgit (9.15) baredebian-merge 1.0-1 *orig*] 170s ' 170s => `8118bec61036025f8586b14741872963b435daa9' 170s + git reset -q --hard 8118bec61036025f8586b14741872963b435daa9 170s dgit view: creating patches-applied version using gbp pq 170s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 170s + git update-ref refs/heads/dgit-view HEAD 170s + git checkout -q dgit-view 170s | git rev-parse 'HEAD~0' 170s => `ea581faf12044c3dca1617bde6556e587f8906a3' 170s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 170s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 170s => `' 170s + git update-ref -m 'dgit 9.15 1.0 baredebian+tarball 5c410cc573946394fbd85950449595317108dca9 - 22379dc8d076edb6a883b89f889dc02b152201727ecdd5fa687bf96250a22052 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache ea581faf12044c3dca1617bde6556e587f8906a3 170s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 170s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=5c410cc573946394fbd85950449595317108dca9' refs/heads/split.f1 ea581faf12044c3dca1617bde6556e587f8906a3 170s dgit view: created (and left in refs/heads/split.f1) 170s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 170s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 170s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 170s ' 170s + baredebian-test-core 170s + baredebian-test-core-prepush 170s + tar --strip-components=1 -axf ../example_1.0.orig.tar.gz 170s + for comp in $xorigcomps 170s + mkdir docs 170s + cd docs 170s + tar --strip-components=1 -axf ../../example_1.0.orig-docs.tar.gz 170s + cd .. 170s + cd debian 170s + git clean -xdff 170s Removing TRASH 170s + git checkout HEAD -- . 170s + cd .. 170s + export QUILT_PATCHES=debian/patches 170s + QUILT_PATCHES=debian/patches 170s + quilt push -a 170s Applying patch debian/patches/0001-Add-a-new-upstream-file.patch 170s patching file new-upstream-file 170s 170s Applying patch debian/patches/0002-Edit-the-.c-file.patch 170s patching file src.c 170s 170s Applying patch debian/patches/subdir/addnewups 170s patching file lib.c 170s 170s Now at patch debian/patches/subdir/addnewups 170s + git add -Af . 170s + git reset .pc 170s + git diff --cached --exit-code split.f1 -- :/ ':!/debian' 170s + git diff --exit-code HEAD..split.f1 -- :/debian 170s + git reset 170s + quilt new made-with-quilt 170s Patch debian/patches/made-with-quilt is now on top 170s + quilt add src.c 171s File src.c added to patch debian/patches/made-with-quilt 171s + echo //omg 171s + quilt refresh 171s Refreshed patch debian/patches/made-with-quilt 171s + git add debian/patches/. 171s + t-commit 'extra patch made with quilt' 1.0-2 171s + local 'msg=extra patch made with quilt' 171s + v=1.0-2 171s + t-debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 171s + DEBEMAIL=dgit-tests@example.org 171s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 171s + 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 171s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 171s libdistro-info-perl is not installed, Debian release names are not known. 171s libdistro-info-perl is not installed, Ubuntu release names are not known. 171s + git add debian/changelog 171s + debcommit 171s git commit -m 'extra patch made with quilt' 171s [master d0c1094] extra patch made with quilt 171s 3 files changed, 14 insertions(+) 171s create mode 100644 debian/patches/made-with-quilt 171s + revision=1 171s + t-refs-same-start 171s + unset t_ref_val 171s + t_ref_names=() 171s + t-ref-head 171s + local val 171s ++ git rev-parse HEAD 171s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 171s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 171s + local name=HEAD 171s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 171s + case "${t_ref_val-unset}" in 171s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 171s + t_ref_names+=("$name") 171s + t-dgit -wn --quilt=baredebian+tarball --dgit-view-save=split.b quilt-fixup 171s + local dgit=dgit 171s + pwd 171s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 171s + : ' 171s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 171s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 171s | git rev-parse --show-toplevel 171s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 171s | git config -z --get-regexp --local '.*' 171s | git config -z --get-regexp --local '.*' 171s | git config -z --get-regexp --global '.*' 171s | git config -z --get-regexp --system '.*' 171s format 3.0 (quilt), quilt mode baredebian+tarball 171s Format `3.0 (quilt)', need to check/update patch stack 171s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 171s => `' 171s + git diff --quiet HEAD 171s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 171s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 171s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 171s | git rev-parse 'HEAD~0' 171s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 171s | git symbolic-ref -q HEAD 171s => `refs/heads/master' 171s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 171s QF linkorigs example_1.0.orig-docs.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig-docs.tar.gz Y 171s QF linkorigs example_1.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.gz Y 171s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 171s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 171s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 171s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - 141e98e350a34159b62cdd807f736a2e3553d1776a2db7d73ca08f79b29bed27 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 171s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 171s splitbrain cache miss 171s CD work 171s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 171s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 171s + git checkout -q -b dgit-view 171s examining quilt state (multiple patches, baredebian+tarball mode) 171s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 171s CD fake 171s | find -name .git -prune -print0 171s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 171s + git checkout -f d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -- debian 171s + git add -Af . 171s | git write-tree 171s => `1a39a2c773a44fe277aaae01894089f5c9074760' 171s fake orig tree object 1a39a2c773a44fe277aaae01894089f5c9074760 171s CD .. 171s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 171s CD ../fake 171s + git add -Af . 171s | git write-tree 171s => `1002894b031bff44b52d1a9231fdcb9ecdf913e2' 171s fake o+d/p tree object 1a39a2c773a44fe277aaae01894089f5c9074760 171s CD ../work 171s | git ls-tree --name-only -z d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 171s => `debian\x00' 171s CD .. 171s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 171s + chmod -R '+rwX' _unpack-tar 171s CD _unpack-tar 171s | find -name .git -prune -print0 171s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 171s + git add -Af . 171s | git write-tree 171s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 171s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 171s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 171s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 171s CD .. 171s import considering example_1.0.orig.tar.gz Y .gz orig 171s + chmod -R '+rwX' _unpack-tar 171s CD _unpack-tar 171s | find -name .git -prune -print0 171s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 171s + git add -Af . 171s | git write-tree 171s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 171s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 171s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 171s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 171s CD .. 171s CD work 171s import clog search... 171s | dpkg-parsechangelog --format rfc822 --all 172s import clog 1.0-2 package changelog, entry no.1... 172s import clog 1.0-2 vs 1.0... 172s import clog 1.0-2 becomes r1 172s import clog 1.0-1 package changelog, entry no.2... 172s import clog 1.0-1 vs 1.0... 172s import clog 1.0-1 becomes r1 172s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 172s => `1530000001 +0000' 172s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 172s => `1431548802 +0000' 172s import tartrees authline dgit test git user 1530000001 +0000 172s import tartrees r1authline Ian Jackson 1431548802 +0000 172s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 172s | git hash-object -w -t commit --stdin 172s => 94c010931d011cbd6c1861bb9d453aa12d826298 172s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 172s | git hash-object -w -t commit --stdin 172s => a5bb1f49c872a76a5d703570fd5352e424719bda 172s + git rm --quiet -rf --cached --ignore-unmatch . 172s + git read-tree 94c010931d011cbd6c1861bb9d453aa12d826298 172s + git rm --quiet -rf --cached --ignore-unmatch docs 172s + git read-tree --prefix=docs/ a5bb1f49c872a76a5d703570fd5352e424719bda 172s | git write-tree 172s => `b5c653c509621c62608ee67507d359ddd46a900b' 172s | git hash-object -w -t commit --stdin 172s => c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 172s + git reset -q 172s | git diff-tree -z --no-renames -r 1a39a2c773a44fe277aaae01894089f5c9074760 c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 172s => `: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' 172s quiltify_trees_differ 1a39a2c773a44fe277aaae01894089f5c9074760 c54c10146a9aad6d3dcba4e07eeddde7cb1eebef => 0 172s | git diff-tree -z --no-renames --name-only -r c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 1002894b031bff44b52d1a9231fdcb9ecdf913e2 172s => `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' 172s quiltify_trees_differ c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 1002894b031bff44b52d1a9231fdcb9ecdf913e2 => 1 172s | git diff-tree -z --no-renames --name-only -r 1a39a2c773a44fe277aaae01894089f5c9074760 1002894b031bff44b52d1a9231fdcb9ecdf913e2 172s => `lib.c\x00new-upstream-file\x00src.c\x00' 172s quiltify_trees_differ 1a39a2c773a44fe277aaae01894089f5c9074760 1002894b031bff44b52d1a9231fdcb9ecdf913e2 => 1 172s differences @dl == ## ## == == ==. 172s dgit: base trees orig=1a39a2c773a44fe277aa o+d/p=1002894b031bff44b52d 172s dgit: quilt differences: src: == orig ## gitignores: == orig == 172s dgit: quilt differences: tarballs ## o+d/p tarballs == o+d/p 172s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 172s => `1530000001 +0000' 172s + git read-tree c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 172s + git rm --quiet -rf --cached --ignore-unmatch debian 172s + git read-tree --prefix=debian/ d0c109478cdb46a6564ea8f5ee5c36484a39f9c7:debian 172s | git write-tree 172s => `1a39a2c773a44fe277aaae01894089f5c9074760' 172s | git commit-tree 1a39a2c773a44fe277aaae01894089f5c9074760 -p d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -p c54c10146a9aad6d3dcba4e07eeddde7cb1eebef -m 'Combine debian/ with upstream source for 1.0 172s ' -m '' -m '[dgit (9.15) baredebian-merge 1.0-2 *orig*] 172s ' 172s => `33f0f124d41647e4ae7b32d7ed90615f9ad6fe30' 172s + git reset -q --hard 33f0f124d41647e4ae7b32d7ed90615f9ad6fe30 172s dgit view: creating patches-applied version using gbp pq 172s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 172s gbp:warning: Patch 'made-with-quilt' has no authorship information, using 'Ian Jackson ' 172s + git update-ref refs/heads/dgit-view HEAD 172s + git checkout -q dgit-view 172s | git rev-parse 'HEAD~0' 172s => `cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92' 172s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 172s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 172s => `ea581faf12044c3dca1617bde6556e587f8906a3' 172s + git update-ref -m 'dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - 141e98e350a34159b62cdd807f736a2e3553d1776a2db7d73ca08f79b29bed27 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 172s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 172s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.b cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 172s dgit view: created (and left in refs/heads/split.b) 172s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 172s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 172s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 172s ' 172s + t-ref-head 172s + local val 172s ++ git rev-parse HEAD 172s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 172s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 172s + local name=HEAD 172s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 172s + case "${t_ref_val-unset}" in 172s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 172s + t_ref_names+=("$name") 172s + baredebian-test-core-push 172s + dpkg-buildpackage -uc -us --build=source 172s dpkg-buildpackage: info: source package example 172s dpkg-buildpackage: info: source version 1.0-2 172s dpkg-buildpackage: info: source distribution unstable 172s dpkg-buildpackage: info: source changed by dgit test git user 172s dpkg-source --before-build . 172s fakeroot debian/rules clean 172s EXAMPLE RULES TARGET clean 172s dh_clean 172s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 172s dpkg-source -b . 172s dpkg-source: info: using source format '3.0 (quilt)' 172s dpkg-source: info: building example using existing ./example_1.0.orig-docs.tar.gz 172s dpkg-source: info: building example using existing ./example_1.0.orig.tar.gz 172s dpkg-source: info: using patch list from debian/patches/series 172s dpkg-source: info: building example in example_1.0-2.debian.tar.xz 172s dpkg-source: info: building example in example_1.0-2.dsc 172s dpkg-genbuildinfo --build=source -O../example_1.0-2_source.buildinfo 172s dpkg-genchanges --build=source -O../example_1.0-2_source.changes 173s dpkg-genchanges: info: not including original source code in upload 173s dpkg-source --after-build . 173s dpkg-buildpackage: info: source-only, diff-only upload (original source NOT included) 173s + t-dgit -wn --quilt=baredebian+tarball --dgit-view-save=split.p --new push 173s + local dgit=dgit 173s + pwd 173s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 173s + : ' 173s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 173s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 173s | git rev-parse --show-toplevel 173s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 173s | git config -z --get-regexp --local '.*' 173s | git config -z --get-regexp --local '.*' 173s | git config -z --get-regexp --global '.*' 173s | git config -z --get-regexp --system '.*' 173s format 3.0 (quilt), quilt mode baredebian+tarball 173s Format `3.0 (quilt)', need to check/update patch stack 173s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 173s => `' 173s + git diff --quiet HEAD 173s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 173s canonical suite name for unstable is sid 173s actually entering push 173s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 173s => `0' 173s + git config remote.dgit.skipdefaultupdate true 173s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 173s get_archive_dsc: nothing in archive, returning undef 173s no version available from the archive 173s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 173s => `' 173s previous reference hash= 173s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 173s => `' 173s fetch_from_archive: lastfetch= 173s nothing found! 173s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 173s + git check-ref-format archive/test-dummy/1.0-2 173s | git symbolic-ref -q HEAD 173s => `refs/heads/master' 173s | git rev-parse 'HEAD~0' 173s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 173s ffq_prev_branchinfo branch current refs/heads/master 173s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 173s => `' 173s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 173s => `' 173s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 173s QF linkorigs example_1.0.orig-docs.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig-docs.tar.gz Y 173s QF linkorigs example_1.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.gz Y 173s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 173s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 173s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 173s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - 141e98e350a34159b62cdd807f736a2e3553d1776a2db7d73ca08f79b29bed27 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 173s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 173s CD work 173s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 173s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 173s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save cache-hit HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.p cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 173s dgit view: found cached (and left in refs/heads/split.p) 173s + git checkout -q -b dgit-view cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 173s splitbrain_pseudomerge... 173s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 173s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 173s => `' 173s + git diff --quiet HEAD 173s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.0-2' 173s => `' 173s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 173s checking that example_1.0-2.dsc corresponds to HEAD 173s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0-2.dsc 173s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0-2.dsc) 173s dpkg-source: info: extracting example in example-1.0 173s dpkg-source: info: unpacking example_1.0.orig.tar.gz 173s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 173s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 173s dpkg-source: info: using patch list from debian/patches/series 173s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 173s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 173s dpkg-source: info: applying subdir/addnewups 173s dpkg-source: info: applying made-with-quilt 173s CD example-1.0 173s | find -name .git -prune -print0 173s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 173s + git add -Af . 173s | git write-tree 173s => `1002894b031bff44b52d1a9231fdcb9ecdf913e2' 173s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 173s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 173s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 173s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 173s + git diff --quiet 1002894b031bff44b52d1a9231fdcb9ecdf913e2 cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 173s files_compare_inputs example_1.0-2.dsc 173s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 173s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0.orig-docs.tar.gz 173s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0.orig.tar.gz 173s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0-2.debian.tar.xz 173s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 173s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0.orig-docs.tar.gz 173s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0.orig.tar.gz 173s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0-2.debian.tar.xz 173s files_compare_inputs example_1.0-2.dsc Files 173s files_compare_inputs example_1.0-2.dsc Files example_1.0.orig-docs.tar.gz 173s files_compare_inputs example_1.0-2.dsc Files example_1.0.orig.tar.gz 173s files_compare_inputs example_1.0-2.dsc Files example_1.0-2.debian.tar.xz 173s files_compare_inputs example_1.0-2_source.changes 173s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 173s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.dsc 173s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.debian.tar.xz 173s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2_source.buildinfo 173s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 173s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.dsc 173s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.debian.tar.xz 173s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2_source.buildinfo 173s files_compare_inputs example_1.0-2_source.changes Files 173s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.dsc 173s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.debian.tar.xz 173s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2_source.buildinfo 173s checking origs needed (1.0)... 173s checking origs needed placement 'devel extra'... 173s origs example_1.0.orig-docs.tar.gz | cb0cb5487b1e5bcb82547396b4fe93e5 236 example_1.0.orig-docs.tar.gz 173s origs example_1.0.orig-docs.tar.gz is_orig 173s -| sh -ec 'cd "$1"; shift 173s 173s find -name "$1" -print0 | 173s xargs -0r sha256sum 173s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_1.0.orig-docs.tar.gz 173s origs example_1.0.orig-docs.tar.gz $#$have=-1 173s origs example_1.0.orig-docs.tar.gz f.same=0 #f._differ=-1 173s origs example_1.0.orig.tar.gz | 599f47808a7754c66aea3cda1b3208d6 373 example_1.0.orig.tar.gz 173s origs example_1.0.orig.tar.gz is_orig 173s -| sh -ec 'cd "$1"; shift 173s 173s find -name "$1" -print0 | 173s xargs -0r sha256sum 173s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_1.0.orig.tar.gz 173s origs example_1.0.orig.tar.gz $#$have=-1 173s origs example_1.0.orig.tar.gz f.same=0 #f._differ=-1 173s origs example_1.0-2.debian.tar.xz | 33d973e7522208030e046b0e5a15006d 1336 example_1.0-2.debian.tar.xz 173s edited .changes for archive .orig contents: added example_1.0.orig.tar.gz 173s edited .changes for archive .orig contents: added example_1.0.orig-docs.tar.gz 173s push_tagwants: $VAR1 = [ 173s '1.0-2', 173s 'cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92', 173s 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 173s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 173s ]; 173s $VAR2 = [ 173s { 173s 'Tfn' => sub { "DUMMY" }, 173s 'Objid' => 'cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92', 173s 'TagFn' => sub { "DUMMY" }, 173s 'View' => 'dgit', 173s 'Tag' => 'archive/test-dummy/1.0-2', 173s 'TfSuffix' => '' 173s }, 173s { 173s 'Objid' => 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 173s 'Tfn' => sub { "DUMMY" }, 173s 'Tag' => 'test-dummy/1.0-2', 173s 'TfSuffix' => '-maintview', 173s 'TagFn' => sub { "DUMMY" }, 173s 'View' => 'maint' 173s } 173s ]; 173s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 173s => `1530000001 +0000' 173s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 173s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 173s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 173s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 173s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 173s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 173s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 173s => `4b81b450113c61771afb2000e0ae63111ff54d97' 173s + git verify-tag 4b81b450113c61771afb2000e0ae63111ff54d97 173s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 173s gpg: Signature made Mon Mar 31 22:50:03 2025 UTC 173s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 173s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 173s gpg: WARNING: This key is not certified with a trusted signature! 173s gpg: There is no indication that the signature belongs to the owner. 173s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 173s + git update-ref refs/tags/archive/test-dummy/1.0-2 4b81b450113c61771afb2000e0ae63111ff54d97 173s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 173s => `b3c4923209433a282203b32e567f3760ded88c7a' 173s + git verify-tag b3c4923209433a282203b32e567f3760ded88c7a 174s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 174s gpg: Signature made Mon Mar 31 22:50:03 2025 UTC 174s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 174s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 174s gpg: WARNING: This key is not certified with a trusted signature! 174s gpg: There is no indication that the signature belongs to the owner. 174s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 174s + git update-ref refs/tags/test-dummy/1.0-2 b3c4923209433a282203b32e567f3760ded88c7a 174s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 174s => `0' 174s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 174s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92:refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 refs/tags/test-dummy/1.0-2 174s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 174s * [new reference] cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 -> refs/dgit/sid 174s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 174s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 174s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 174s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.0-2_source.changes 174s signfile dsc ../example_1.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 174s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 174s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 174s 174s fixup_buildinfo ../example_1.0-2.dsc ../example_1.0-2_source.buildinfo 174s signfile buildinfo ../example_1.0-2_source.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 174s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 174s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 174s 174s fixup_changes dsc ../example_1.0-2.dsc ../example_1.0-2_source.changes 174s fixup_changes buildinfo ../example_1.0-2_source.buildinfo ../example_1.0-2_source.changes 174s signfile changes ../example_1.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 174s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 174s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 174s 174s Successfully signed dsc, buildinfo, changes files 174s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_1.0-2_source.changes 174s gpg: ../example_1.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 174s gpg: ../example_1.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 174s D: Setting host argument. 174s Checking signature on .changes 174s Checking signature on .dsc 174s Package includes an .orig.tar.gz file although the debian revision suggests 174s that it might not be required. Multiple uploads of the .orig.tar.gz may be 174s rejected by the upload queue management software. 174s Uploading to test-dummy (via local to localhost): 174s Successfully uploaded packages. 174s dgit ok: pushed and uploaded 1.0-2 174s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 174s del_lrfetchrefs... 174s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 174s ' 174s + baredebian-test-core-postpush 174s + git merge-base --is-ancestor HEAD split.p 174s + '[' '' ']' 174s + git clean -xdff 174s Removing .pc/ 174s Removing debian/files 174s Removing docs/ 174s Removing example 174s Removing lib.c 174s Removing new-upstream-file 174s Removing src.c 174s + t-splitbrain-pushed-good-start 174s + dep14tag=refs/tags/test-dummy/1.0-2 174s ++ t-v-tag 174s ++ echo refs/tags/archive/test-dummy/1.0-2 174s + dgittag=refs/tags/archive/test-dummy/1.0-2 174s + t-output '' git status --porcelain 174s + printf %s '' 174s + shift 174s + git status --porcelain 174s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 174s + t-ref-head 174s + local val 174s ++ git rev-parse HEAD 174s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + local name=HEAD 174s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + case "${t_ref_val-unset}" in 174s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + t_ref_names+=("$name") 174s + t-refs-same refs/tags/test-dummy/1.0-2 174s + local g 174s + for g in $* 174s + t-ref-same refs/tags/test-dummy/1.0-2 174s + local name=refs/tags/test-dummy/1.0-2 174s + local val 174s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 174s ++ local ref=refs/tags/test-dummy/1.0-2 174s ++ case "$ref" in 174s ++ git show-ref -d refs/tags/test-dummy/1.0-2 174s ++ perl -ne ' 174s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 174s END { print "$x\n" if length $x; } 174s ' 174s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + local name=refs/tags/test-dummy/1.0-2 174s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + case "${t_ref_val-unset}" in 174s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + t_ref_names+=("$name") 174s + set -e 174s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 174s + t-refs-same refs/tags/test-dummy/1.0-2 174s + local g 174s + for g in $* 174s + t-ref-same refs/tags/test-dummy/1.0-2 174s + local name=refs/tags/test-dummy/1.0-2 174s + local val 174s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 174s ++ local ref=refs/tags/test-dummy/1.0-2 174s ++ case "$ref" in 174s ++ perl -ne ' 174s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 174s END { print "$x\n" if length $x; } 174s ++ git show-ref -d refs/tags/test-dummy/1.0-2 174s ' 174s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + local name=refs/tags/test-dummy/1.0-2 174s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + case "${t_ref_val-unset}" in 174s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 174s + t_ref_names+=("$name") 174s + git merge-base --is-ancestor refs/tags/test-dummy/1.0-2 refs/tags/archive/test-dummy/1.0-2 174s + t-refs-same-start 174s + unset t_ref_val 174s + t_ref_names=() 174s + t-ref-same refs/heads/split.p 174s + local name=refs/heads/split.p 174s + local val 174s ++ t-git-get-ref refs/heads/split.p 174s ++ local ref=refs/heads/split.p 174s ++ case "$ref" in 174s ++ git show-ref -d refs/heads/split.p 174s ++ perl -ne ' 174s $x = $1 if m#^(\w+) \Qrefs/heads/split.p\E(?:\^\{\})?$#; 174s END { print "$x\n" if length $x; } 174s ' 174s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 174s + t-ref-same-val refs/heads/split.p cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 174s + local name=refs/heads/split.p 174s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 174s + case "${t_ref_val-unset}" in 174s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 174s + t_ref_names+=("$name") 174s ++ t-git-get-ref refs/heads/split.b 174s ++ local ref=refs/heads/split.b 174s ++ case "$ref" in 174s ++ git show-ref -d refs/heads/split.b 174s ++ perl -ne ' 174s $x = $1 if m#^(\w+) \Qrefs/heads/split.b\E(?:\^\{\})?$#; 174s END { print "$x\n" if length $x; } 174s ' 174s + local split_b=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 174s + case "$split_b" in 174s + t-pushed-good-core 174s + t-ref-dsc-dgit 174s + t-incoming-dsc 174s + local dsc=example_1.0-2.dsc 174s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 174s + local val 174s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit 174s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 174s ++ local field=Dgit 174s ++ perl -e ' 174s use Dpkg::Control::Hash; 174s my $h = new Dpkg::Control::Hash allow_pgp=>1; 174s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc"); 174s my $val = $h->{"Dgit"},"\n"; 174s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit" unless defined $val; 174s print $val,"\n"; 174s ' 175s + val='cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 175s ++ perl -e ' 175s $_=shift @ARGV; 175s die "Dgit $_ ?" unless m/^\w+\b/; 175s print $&,"\n" or die $!; 175s ' 'cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 175s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 175s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + case "${t_ref_val-unset}" in 175s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + t_ref_names+=("$name") 175s ++ t-v-tag 175s ++ echo refs/tags/archive/test-dummy/1.0-2 175s + t-refs-same refs/tags/archive/test-dummy/1.0-2 refs/remotes/dgit/dgit/sid 175s + local g 175s + for g in $* 175s + t-ref-same refs/tags/archive/test-dummy/1.0-2 175s + local name=refs/tags/archive/test-dummy/1.0-2 175s + local val 175s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 175s ++ local ref=refs/tags/archive/test-dummy/1.0-2 175s ++ case "$ref" in 175s ++ perl -ne ' 175s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 175s END { print "$x\n" if length $x; } 175s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 175s ' 175s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + local name=refs/tags/archive/test-dummy/1.0-2 175s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + case "${t_ref_val-unset}" in 175s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + t_ref_names+=("$name") 175s + for g in $* 175s + t-ref-same refs/remotes/dgit/dgit/sid 175s + local name=refs/remotes/dgit/dgit/sid 175s + local val 175s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 175s ++ local ref=refs/remotes/dgit/dgit/sid 175s ++ case "$ref" in 175s ++ perl -ne ' 175s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 175s END { print "$x\n" if length $x; } 175s ++ git show-ref -d refs/remotes/dgit/dgit/sid 175s ' 175s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + t-ref-same-val refs/remotes/dgit/dgit/sid cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + local name=refs/remotes/dgit/dgit/sid 175s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + case "${t_ref_val-unset}" in 175s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + t_ref_names+=("$name") 175s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 175s + local val 175s + for g in $* 175s ++ t-git-get-ref refs/heads/dgit/unstable 175s ++ local ref=refs/heads/dgit/unstable 175s ++ case "$ref" in 175s ++ git show-ref -d refs/heads/dgit/unstable 175s ++ perl -ne ' 175s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 175s END { print "$x\n" if length $x; } 175s ' 175s ++ test 1 = 1 175s + val= 175s + '[' x '!=' x ']' 175s + for g in $* 175s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 175s ++ local ref=refs/remotes/dgit/dgit/unstable 175s ++ case "$ref" in 175s ++ perl -ne ' 175s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 175s END { print "$x\n" if length $x; } 175s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 175s ' 175s ++ test 1 = 1 175s + val= 175s + '[' x '!=' x ']' 175s + set -e 175s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 175s ++ t-v-tag 175s ++ echo refs/tags/archive/test-dummy/1.0-2 175s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 175s + local g 175s + for g in $* 175s + t-ref-same refs/dgit/sid 175s + local name=refs/dgit/sid 175s + local val 175s ++ t-git-get-ref refs/dgit/sid 175s ++ local ref=refs/dgit/sid 175s ++ case "$ref" in 175s ++ perl -ne ' 175s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 175s END { print "$x\n" if length $x; } 175s ++ git show-ref -d refs/dgit/sid 175s ' 175s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + t-ref-same-val refs/dgit/sid cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + local name=refs/dgit/sid 175s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + case "${t_ref_val-unset}" in 175s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + t_ref_names+=("$name") 175s + for g in $* 175s + t-ref-same refs/tags/archive/test-dummy/1.0-2 175s + local name=refs/tags/archive/test-dummy/1.0-2 175s + local val 175s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 175s ++ local ref=refs/tags/archive/test-dummy/1.0-2 175s ++ case "$ref" in 175s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 175s ++ perl -ne ' 175s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 175s END { print "$x\n" if length $x; } 175s ' 175s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + local name=refs/tags/archive/test-dummy/1.0-2 175s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + case "${t_ref_val-unset}" in 175s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 175s + t_ref_names+=("$name") 175s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 175s + t-refs-notexist refs/dgit/unstable 175s + local val 175s + for g in $* 175s ++ t-git-get-ref refs/dgit/unstable 175s ++ local ref=refs/dgit/unstable 175s ++ case "$ref" in 175s ++ git show-ref -d refs/dgit/unstable 175s ++ perl -ne ' 175s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 175s END { print "$x\n" if length $x; } 175s ' 175s ++ test 1 = 1 175s + val= 175s + '[' x '!=' x ']' 175s ++ t-v-tag 175s ++ echo refs/tags/archive/test-dummy/1.0-2 175s + git verify-tag refs/tags/archive/test-dummy/1.0-2 175s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 175s gpg: Signature made Mon Mar 31 22:50:03 2025 UTC 175s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 175s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 175s gpg: WARNING: This key is not certified with a trusted signature! 175s gpg: There is no indication that the signature belongs to the owner. 175s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 175s + t-incoming-dsc 175s + local dsc=example_1.0-2.dsc 175s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 175s + t-splitbrain-pushed-good--unpack 175s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 175s + rm -rf t-unpack 175s + mkdir t-unpack 175s + cd t-unpack 175s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 175s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0.orig-docs.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0.orig.tar.gz . 175s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc . 175s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 175s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 175s + dpkg-source -x example_1.0-2.dsc 175s gpgv: Signature made Mon Mar 31 22:50:04 2025 UTC 175s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 175s gpgv: Can't check signature: No public key 175s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 175s dpkg-source: info: extracting example in example-1.0 175s dpkg-source: info: unpacking example_1.0.orig.tar.gz 175s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 175s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 175s dpkg-source: info: using patch list from debian/patches/series 175s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 175s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 175s dpkg-source: info: applying subdir/addnewups 175s dpkg-source: info: applying made-with-quilt 175s + cd example-1.0/. 175s + git init 175s hint: Using 'master' as the name for the initial branch. This default branch name 175s hint: is subject to change. To configure the initial branch name to use in all 175s hint: of your new repositories, which will suppress this warning, call: 175s hint: 175s hint: git config --global init.defaultBranch 175s hint: 175s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 175s hint: 'development'. The just-created branch can be renamed via this command: 175s hint: 175s hint: git branch -m 175s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t-unpack/example-1.0/.git/ 175s + git fetch ../../example 'refs/tags/*:refs/tags/*' 175s From ../../example 175s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 175s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 175s + t-splitbrain-pushed-good--checkdiff refs/tags/archive/test-dummy/1.0-2 175s + local tag=refs/tags/archive/test-dummy/1.0-2 175s + t-splitbrain-pushed-good--checkprep 175s + git add -Af . 175s + git rm --cached -r --ignore-unmatch .pc 175s rm '.pc/.quilt_patches' 175s rm '.pc/.quilt_series' 175s rm '.pc/.version' 175s rm '.pc/0001-Add-a-new-upstream-file.patch/new-upstream-file' 175s rm '.pc/0002-Edit-the-.c-file.patch/src.c' 175s rm '.pc/applied-patches' 175s rm '.pc/made-with-quilt/src.c' 175s rm '.pc/subdir/addnewups/lib.c' 175s + t-output '' git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 175s + printf %s '' 175s + shift 175s + git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 175s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 175s + t-splitbrain-pushed-good--unpack 175s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 175s + rm -rf t-unpack 175s + mkdir t-unpack 175s + cd t-unpack 175s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 175s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0.orig-docs.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0.orig.tar.gz . 175s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc . 175s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 175s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 175s + dpkg-source -x example_1.0-2.dsc 175s gpgv: Signature made Mon Mar 31 22:50:04 2025 UTC 175s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 175s gpgv: Can't check signature: No public key 175s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 175s dpkg-source: info: extracting example in example-1.0 175s dpkg-source: info: unpacking example_1.0.orig.tar.gz 175s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 175s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 175s dpkg-source: info: using patch list from debian/patches/series 175s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 175s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 175s dpkg-source: info: applying subdir/addnewups 175s dpkg-source: info: applying made-with-quilt 175s + cd example-1.0/. 175s + git init 175s hint: Using 'master' as the name for the initial branch. This default branch name 175s hint: is subject to change. To configure the initial branch name to use in all 175s hint: of your new repositories, which will suppress this warning, call: 175s hint: 175s hint: git config --global init.defaultBranch 175s hint: 175s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 175s hint: 'development'. The just-created branch can be renamed via this command: 175s hint: 175s hint: git branch -m 175s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t-unpack/example-1.0/.git/ 175s + git fetch ../../example 'refs/tags/*:refs/tags/*' 175s From ../../example 175s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 175s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 175s + find . -mindepth 1 -maxdepth 1 '!' -path ./debian '!' -path ./.git -print0 175s + xargs -0r rm -rf -- 175s + t-splitbrain-pushed-good-end-made-dep14 175s + t-splitbrain-pushed-good--checkdiff refs/tags/test-dummy/1.0-2 175s + local tag=refs/tags/test-dummy/1.0-2 175s + t-splitbrain-pushed-good--checkprep 175s + git add -Af . 175s + git rm --cached -r --ignore-unmatch .pc 175s + t-output '' git diff --stat --cached refs/tags/test-dummy/1.0-2 175s + printf %s '' 175s + shift 175s + git diff --stat --cached refs/tags/test-dummy/1.0-2 175s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 175s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 175s ++ git log --pretty=format:%H --grep 'Combine orig tarballs for example 1.0' split.p 175s + combine=c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 175s + parentnum=0 175s + for comp in '' $xorigcomps 175s + parentnum=1 175s + fn=example_1.0.orig.tar.gz 175s + git checkout --orphan imp1 175s Switched to a new branch 'imp1' 175s + git rm -rf . 175s rm 'debian/changelog' 175s rm 'debian/compat' 175s rm 'debian/control' 175s rm 'debian/example.install' 175s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 175s rm 'debian/patches/0002-Edit-the-.c-file.patch' 175s rm 'debian/patches/made-with-quilt' 175s rm 'debian/patches/series' 175s rm 'debian/patches/subdir/addnewups' 175s rm 'debian/rules' 175s rm 'debian/source/format' 175s + tar --strip-components=1 -axf ../example_1.0.orig.tar.gz 175s + git add -Af . 175s + git commit -m P1 175s [imp1 (root-commit) b3963f4] P1 175s 3 files changed, 4 insertions(+) 175s create mode 100644 debian/TRASH 175s create mode 100755 example 175s create mode 100644 src.c 175s + git diff --stat --exit-code 'c54c10146a9aad6d3dcba4e07eeddde7cb1eebef^1' 175s ++ git log 'c54c10146a9aad6d3dcba4e07eeddde7cb1eebef^1' 175s ++ grep -Fc example_1.0.orig.tar.gz 175s + count=2 175s + '[' 2 = 2 ']' 175s + for comp in '' $xorigcomps 175s + parentnum=2 175s + fn=example_1.0.orig-docs.tar.gz 175s + git checkout --orphan imp2 175s Switched to a new branch 'imp2' 175s + git rm -rf . 175s rm 'debian/TRASH' 175s rm 'example' 175s rm 'src.c' 175s + tar --strip-components=1 -axf ../example_1.0.orig-docs.tar.gz 175s + git add -Af . 175s + git commit -m P2 175s [imp2 (root-commit) b176913] P2 175s 1 file changed, 1 insertion(+) 175s create mode 100644 README 175s + git diff --stat --exit-code 'c54c10146a9aad6d3dcba4e07eeddde7cb1eebef^2' 175s ++ git log 'c54c10146a9aad6d3dcba4e07eeddde7cb1eebef^2' 175s ++ grep -Fc example_1.0.orig-docs.tar.gz 175s + count=2 175s + '[' 2 = 2 ']' 175s + t-ok 175s + : ======================================== 175s + t-check-only-bpd 175s + '[' .. = .. ']' 175s + return 175s + t-fscks 175s + shopt -s nullglob 175s + for d in $tmp/*/.git $tmp/git/*.git 175s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 175s + t-git-fsck 175s ++ git rev-parse --git-dir 175s + local fsckerrs=.git/dgit-test-fsck.errs 175s + set +e 175s + LC_MESSAGES=C 175s + git fsck --no-dangling --strict 175s + tee .git/dgit-test-fsck.errs 175s + ps='0 0' 175s + set -e 175s + local pats 175s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 175s + test '0 0' = '0 0' 175s + pats+=(-e 'notice: HEAD points to an unborn branch') 175s + pats+=(-e 'notice: No default references') 175s + set +e 175s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 175s + rc=1 175s + set -e 175s + case $rc in 175s + for d in $tmp/*/.git $tmp/git/*.git 175s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 175s + t-git-fsck 175s ++ git rev-parse --git-dir 175s + local fsckerrs=./dgit-test-fsck.errs 175s + set +e 175s + LC_MESSAGES=C 175s + git fsck --no-dangling --strict 175s + tee ./dgit-test-fsck.errs 175s notice: HEAD points to an unborn branch (master) 175s + ps='0 0' 175s + set -e 175s + local pats 175s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 175s + test '0 0' = '0 0' 175s + pats+=(-e 'notice: HEAD points to an unborn branch') 175s + pats+=(-e 'notice: No default references') 175s + set +e 175s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 175s + rc=1 175s + set -e 175s + case $rc in 175s + t-save-artifacts 175s + artifacts=/tmp/autopkgtest.XK8uun/baredebian-multitar-artifacts 175s + '[' x/tmp/autopkgtest.XK8uun/baredebian-multitar-artifacts = x ']' 175s + '[' xtmp = x ']' 175s + GZIP=-1v 175s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/baredebian-multitar-artifacts/baredebian-multitar.tar.gz '--exclude=*.tar' . 175s gzip: warning: GZIP environment variable is deprecated; use an alias or script 175s 79.4% 175s + echo ok. 175s ok. 175s + rc=0 175s + set +x 175s + set +e 175s + pwd 175s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 175s + '[' x '!=' x ']' 175s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 175s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 175s + set -e 175s + test 0 = 0 175s autopkgtest [22:50:05]: test baredebian-multitar: -----------------------] 176s baredebian-multitar PASS 176s autopkgtest [22:50:06]: test baredebian-multitar: - - - - - - - - - - results - - - - - - - - - - 176s autopkgtest [22:50:06]: test baredebian-plusgit: preparing testbed 176s Reading package lists... 177s Building dependency tree... 177s Reading state information... 177s Starting pkgProblemResolver with broken count: 0 177s Starting 2 pkgProblemResolver with broken count: 0 177s Done 177s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 178s autopkgtest [22:50:08]: test baredebian-plusgit: [----------------------- 178s ++ set -o pipefail 178s ++ . tests/lib-core 178s ++ . tests/lib-restricts 178s ++ trap ' 178s rc=$? 178s set +x 178s test $rc = 0 || echo " 178s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 178s 178s Most relevant logs are just before assignment rc=$rc 178s Will now do cleanup etc. 178s " 178s set -x 178s set +e 178s pwd 178s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 178s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 178s set -e 178s test $rc = 0 || t-report-failure 178s ' EXIT 178s ++ t-filter-out-git-hyphen-dir 178s ++ local pathent 178s +++ type -p git-rev-parse 178s +++ : 178s ++ pathent= 178s ++ case "$pathent" in 178s ++ return 178s ++ t-set-intree 178s ++ '[' x = x ']' 178s ++ return 178s ++ : -D 178s ++ export DGIT_TEST_DEBUG 178s ++ : x 178s ++ export DGIT_TEST_DEBPUSH_DEBUG 178s ++ : 178s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 178s ++ GIT_COMMITTER_DATE='1530000000 +0100' 178s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 178s ++ GIT_AUTHOR_DATE='1530000000 +0100' 178s ++ export LC_CTYPE=C.UTF-8 178s ++ LC_CTYPE=C.UTF-8 178s ++ unset CDPATH 178s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 178s ++ FILTER_BRANCH_SQUELCH_WARNING=1 178s +++ pwd 178s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 178s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 178s ++ testname=baredebian-plusgit 178s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 178s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 178s ++ bpd=.. 178s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 178s ++ '[' x '!=' x ']' 178s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s +++ pwd 178s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ t-set-using-tmp 178s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 178s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 178s ++ export 'DEBFULLNAME=dgit test git user' 178s ++ DEBFULLNAME='dgit test git user' 178s ++ git config --global user.email dgit-test@debian.example.net 178s ++ git config --global user.name 'dgit test git user' 178s ++ git config --global protocol.ext.allow always 178s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 178s ++ env -0 178s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 178s ++ export DEBCHANGE_VENDOR=dpkg 178s ++ DEBCHANGE_VENDOR=dpkg 178s ++ unset VISUAL 178s ++ unset GIT_EDITOR 178s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 178s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 178s ++ cat 178s ++ schroot=build 178s ++ : aq 178s ++ : archive/test-dummy 178s ++ : sid:unstable 178s ++ t-git-config dgit.default.old-dsc-distro test-dummy 178s ++ git config --global dgit.default.old-dsc-distro test-dummy 178s ++ for import in ${autoimport-gnupg} 178s ++ case "$0" in 178s ++ t-setup-import gnupg 178s ++ local setupname=gnupg 178s ++ local setupsrc 178s ++ local lock 178s ++ '[' x = x ']' 178s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 178s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 178s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 178s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 178s cd "$1"; shift 178s setupname="$1"; shift 178s simport="$1"; shift 178s if [ -e "$simport" ]; then exit 0; fi 178s env - "$@" \ 178s "tests/setup/$setupname" 178s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 178s + cd /tmp/autopkgtest.XK8uun/build.980/src 178s + shift 178s + setupname=gnupg 178s + shift 178s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 178s + shift 178s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 178s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/baredebian-plusgit-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/baredebian-plusgit-stderr --stdout=/tmp/autopkgtest.XK8uun/baredebian-plusgit-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/baredebian-plusgit -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/baredebian-plusgit' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/baredebian-plusgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 178s ++ set -o pipefail 178s ++ . tests/lib-core 178s ++ . tests/lib-restricts 178s ++ trap ' 178s rc=$? 178s set +x 178s test $rc = 0 || echo " 178s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 178s 178s Most relevant logs are just before assignment rc=$rc 178s Will now do cleanup etc. 178s " 178s set -x 178s set +e 178s pwd 178s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 178s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 178s set -e 178s test $rc = 0 || t-report-failure 178s ' EXIT 178s ++ t-filter-out-git-hyphen-dir 178s ++ local pathent 178s +++ type -p git-rev-parse 178s +++ : 178s ++ pathent= 178s ++ case "$pathent" in 178s ++ return 178s ++ t-set-intree 178s ++ '[' x = x ']' 178s ++ return 178s ++ : -D 178s ++ export DGIT_TEST_DEBUG 178s ++ : x 178s ++ export DGIT_TEST_DEBPUSH_DEBUG 178s ++ : 178s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 178s ++ GIT_COMMITTER_DATE='1530000000 +0100' 178s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 178s ++ GIT_AUTHOR_DATE='1530000000 +0100' 178s ++ export LC_CTYPE=C.UTF-8 178s ++ LC_CTYPE=C.UTF-8 178s ++ unset CDPATH 178s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 178s ++ FILTER_BRANCH_SQUELCH_WARNING=1 178s +++ pwd 178s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 178s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 178s ++ testname=gnupg 178s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 178s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 178s ++ bpd=.. 178s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 178s ++ '[' x '!=' x ']' 178s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s +++ pwd 178s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ t-set-using-tmp 178s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 178s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 178s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 178s ++ export 'DEBFULLNAME=dgit test git user' 178s ++ DEBFULLNAME='dgit test git user' 178s ++ git config --global user.email dgit-test@debian.example.net 178s ++ git config --global user.name 'dgit test git user' 178s ++ git config --global protocol.ext.allow always 178s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 178s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 178s ++ export DEBCHANGE_VENDOR=dpkg 178s ++ DEBCHANGE_VENDOR=dpkg 178s ++ unset VISUAL 178s ++ unset GIT_EDITOR 178s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 178s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 178s ++ cat 178s ++ schroot=build 178s ++ : aq 178s ++ : archive/test-dummy 178s ++ : sid:unstable 178s ++ t-git-config dgit.default.old-dsc-distro test-dummy 178s ++ git config --global dgit.default.old-dsc-distro test-dummy 178s ++ for import in ${autoimport-gnupg} 178s ++ case "$0" in 178s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 178s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 178s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 178s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 178s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 178s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 178s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 178s + setup=' 178s export GNUPGHOME=$tmp/gnupg 178s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 178s 178s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 178s ssb rsa2048 2013-11-17 [E] 178s 178s sec rsa2048 2014-01-26 [SC] 178s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 178s uid [ultimate] Populus Romanus (test key) 178s ssb rsa2048 2014-01-26 [E] 178s 178s sec rsa2048 2014-01-26 [SC] 178s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 178s uid [ unknown] Hannibal (test key) 178s ssb rsa2048 2014-01-26 [E] 178s 178s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 178s export GNUPGHOME=$tmp/gnupg 178s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 178s 178s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 179s "sha256sum" => "$2", 179s "component" => "$3", 179s "filename" => "$4", 179s }; 179s END { 179s my $json = JSON->new->canonical(); 179s print $json->encode(\@v) or die $!; 179s } 179s ' 179s + t-aq-archive-updated new example 179s + local suite=new 179s + local p=example 179s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 179s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 179s + perl -wne ' 179s use JSON; 179s use strict; 179s our @v; 179s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 179s push @v, { 179s "version" => "$1", 179s "sha256sum" => "$2", 179s "component" => "$3", 179s "filename" => "$4", 179s }; 179s END { 179s my $json = JSON->new->canonical(); 179s print $json->encode(\@v) or die $!; 179s } 179s ' 179s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 179s + cat 179s + jsondelim=' },' 179s + cat 179s + t-git-none 179s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 179s + set -e 179s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 179s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 179s + t-gdr-gbp-import-core-with-queue 179s + t-gdr-gbp-import-core 179s + p=example 179s + t-worktree 1.1 179s + rm -rf example 179s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1 179s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 179s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 179s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 179s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 179s + cd example 179s + : 'fake up some kind of upstream' 179s + git checkout -b upstream quilt-tip 179s Switched to a new branch 'upstream' 179s + rm -rf debian 179s + mkdir debian 179s + echo junk 179s + git add debian 179s + git commit -m 'an upstream retcon (tests/setup/baredebian)' 179s [upstream aa9b151] an upstream retcon (tests/setup/baredebian) 179s 6 files changed, 1 insertion(+), 36 deletions(-) 179s delete mode 100644 debian/changelog 179s delete mode 100644 debian/compat 179s delete mode 100644 debian/control 179s delete mode 100644 debian/example.install 179s mode change 100755 => 100644 debian/rules 179s delete mode 100644 debian/source/format 179s + git tag v1.0 179s + : 'fake up that our quilt-tip was descended from upstream' 179s + git checkout quilt-tip 179s Switched to branch 'quilt-tip' 179s + git merge --no-edit -s ours upstream 179s Merge made by the 'ours' strategy. 179s + : 'fake up that our quilt-tip had the patch queue in it' 179s + git checkout patch-queue/quilt-tip 179s Switched to branch 'patch-queue/quilt-tip' 179s + gbp pq export 179s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 179s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 179s + git add debian/patches 179s + git commit -m 'patch queue update (tests/setup/baredebian)' 179s [quilt-tip 474da4c] patch queue update (tests/setup/baredebian) 179s 4 files changed, 50 insertions(+) 179s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 179s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 179s create mode 100644 debian/patches/series 179s create mode 100644 debian/patches/subdir/addnewups 179s + : 'make branch names more conventional' 179s + git branch -D master 179s Deleted branch master (was 17d67db). 179s + git branch -m quilt-tip master 179s + git-deborig 179s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 179s + git branch -D patch-queue/quilt-tip 179s Deleted branch patch-queue/quilt-tip (was d843a68). 179s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 179s + git branch -D gitish-only 179s Deleted branch gitish-only (was 2b2ddc8). 179s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 179s + git branch -D quilt-tip-1.1 179s Deleted branch quilt-tip-1.1 (was 7fc34be). 179s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 179s + git branch -D quilt-tip-2 179s Deleted branch quilt-tip-2 (was 99fcab4). 179s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 179s + git branch -D indep-arch 179s Deleted branch indep-arch (was e215729). 179s + git rm -rf . 179s rm '.gitignore' 179s rm 'debian/changelog' 179s rm 'debian/compat' 179s rm 'debian/control' 179s rm 'debian/example.install' 179s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 179s rm 'debian/patches/0002-Edit-the-.c-file.patch' 179s rm 'debian/patches/series' 179s rm 'debian/patches/subdir/addnewups' 179s rm 'debian/rules' 179s rm 'debian/source/format' 179s rm 'docs/README' 179s rm 'example' 179s rm 'src.c' 179s + git checkout HEAD -- debian 179s ++ git write-tree 179s + t=1b876c7f2ff3a5f3e269aa710210897c32caee00 179s ++ git commit-tree -m 'Convert to bare debian' 1b876c7f2ff3a5f3e269aa710210897c32caee00 179s + t=5c410cc573946394fbd85950449595317108dca9 179s + git reset --hard 5c410cc573946394fbd85950449595317108dca9 179s HEAD is now at 5c410cc Convert to bare debian 179s ++ echo 'example*' 179s + t-setup-done '' 'example* git mirror aq' ' 179s t-select-package example 179s t-git-next-date 179s ' 179s + local savevars= 179s + local 'savedirs=example* git mirror aq' 179s + local 'importeval= 179s t-select-package example 179s t-git-next-date 179s ' 179s + local import=IMPORT.baredebian 179s + exec 179s + local vn 179s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 179s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 179s print STDERR "saving-exporting $vn\n"; 179s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 179s or die $!; 179s } 179s ' 179s saving-exporting DGIT_TEST_REAL_DEBCHANGE 179s saving-exporting DGIT_TEST_REAL_GPG_AGENT 179s saving-exporting DGIT_TEST_REAL_GPG 179s + set -e 179s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 179s + tar cf IMPORT.baredebian.tar example example_1.0.orig.tar.xz git mirror aq 179s + printf '\n%s\n' ' 179s t-select-package example 179s t-git-next-date 179s ' 179s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian 179s + rc=0 179s + set +x 179s + set +e 179s + pwd 179s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 179s + '[' x '!=' x ']' 179s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 179s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 179s + set -e 179s + test 0 = 0 179s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 179s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 179s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian 179s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 179s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 179s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 179s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 179s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 179s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 179s ++ t-select-package example 179s ++ p=example 179s ++ dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 179s ++ t-git-next-date 179s ++ GIT_COMMITTER_DATE='1530000001 +0100' 179s ++ GIT_AUTHOR_DATE='1530000001 +0100' 179s + t-tstunt-parsechangelog 179s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 179s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 179s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 179s + local var=PATH 179s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 179s + eval ' 179s case "$PATH" in 179s "$tstunt:"*) ;; 179s *":$tstunt:"*) ;; 179s "") PATH="$tstunt" ;; 179s *) PATH="$tstunt:$PATH" ;; 179s esac 179s export PATH 179s ' 179s ++ case "$PATH" in 179s ++ export PATH 179s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 179s + local var=PERLLIB 179s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 179s + eval ' 179s case "$PERLLIB" in 179s "$tstunt:"*) ;; 179s *":$tstunt:"*) ;; 179s "") PERLLIB="$tstunt" ;; 179s *) PERLLIB="$tstunt:$PERLLIB" ;; 179s esac 179s export PERLLIB 179s ' 179s ++ case "$PERLLIB" in 179s ++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 179s ++ export PERLLIB 179s + local f 179s + for f in "$@" 179s + t-tstunt--save-real dpkg-parsechangelog 179s + local f=dpkg-parsechangelog 179s + case "$f" in 179s + local rc 179s + local real 179s + set +e 179s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 179s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 179s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 179s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 179s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 179s ++ type -p dpkg-parsechangelog 179s + real=/usr/bin/dpkg-parsechangelog 179s + rc=0 179s + set -e 179s + case $rc in 179s + local varname=dpkg_parsechangelog 179s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 179s + eval ' 179s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 179s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 179s ' 179s ++ : /usr/bin/dpkg-parsechangelog 179s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 179s + f=./dpkg-parsechangelog 179s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 179s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 179s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 179s + for f in "$@" 179s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 179s + local f=Dpkg/Changelog/Parse.pm 179s + case "$f" in 179s + return 179s + f=./Dpkg/Changelog/Parse.pm 179s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 179s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 179s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 179s + cd example 179s + baredebian-test-vars 179s + quiltmode=baredebian 179s + v=1.0-1 179s + suite=sid 179s + uv=1.0 179s + uvtag=v1.0 179s + origbase=example_1.0.orig 179s + xorigcomps= 179s + quiltmode=baredebian+git 179s + baredebian-test-minimum 179s + t-expect-fail 'contradicts clean mode git-ff' t-dgit -wgf --dgit-view-save=split.f1 --baredebian+git quilt-fixup 179s + local 'mpat=contradicts clean mode git-ff' 179s + shift 179s + set +o pipefail 179s + LC_MESSAGES=C 179s + LANGUAGE=C 179s + t-dgit -wgf --dgit-view-save=split.f1 --baredebian+git quilt-fixup 179s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 179s + local dgit=dgit 179s + pwd 179s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 179s + : ' 179s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 179s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 179s | git rev-parse --show-toplevel 179s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 179s | git config -z --get-regexp --local '.*' 179s | git config -z --get-regexp --local '.*' 179s | git config -z --get-regexp --global '.*' 179s | git config -z --get-regexp --system '.*' 179s format 3.0 (quilt), quilt mode baredebian 179s Format `3.0 (quilt)', need to check/update patch stack 179s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 179s => `' 179s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 179s => `aa9b15129f92e99418effffef1bae210b11b6eed' 179s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 179s => `' 179s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 179s => `aa9b15129f92e99418effffef1bae210b11b6eed' 179s dgit: --quilt=baredebian, using upstream from git tag v1.0 179s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 179s => `' 179s + git diff --quiet HEAD 179s 179s dgit: error: quilt mode baredebian (generally needs untracked upstream files) 179s dgit: contradicts clean mode git-ff (which would delete them) 179s + local 'ps=255 0' 179s + set -o pipefail 179s + case $ps in 179s + t-grep-mpat 'contradicts clean mode git-ff' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 179s + local 'mpat=contradicts clean mode git-ff' 179s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 179s + local grepper=fgrep 179s + case "$mpat" in 179s + fgrep -e 'contradicts clean mode git-ff' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 179s dgit: contradicts clean mode git-ff (which would delete them) 179s + t-dgit -wn --dgit-view-save=split.f1 --baredebian+git quilt-fixup 179s + local dgit=dgit 179s + pwd 179s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 179s + : ' 179s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 179s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 179s | git rev-parse --show-toplevel 179s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 179s | git config -z --get-regexp --local '.*' 179s | git config -z --get-regexp --local '.*' 179s | git config -z --get-regexp --global '.*' 179s | git config -z --get-regexp --system '.*' 179s format 3.0 (quilt), quilt mode baredebian 179s Format `3.0 (quilt)', need to check/update patch stack 179s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 179s => `' 179s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 179s => `aa9b15129f92e99418effffef1bae210b11b6eed' 179s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 179s => `' 179s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 179s => `aa9b15129f92e99418effffef1bae210b11b6eed' 179s dgit: --quilt=baredebian, using upstream from git tag v1.0 179s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 179s => `' 179s + git diff --quiet HEAD 179s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 179s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 179s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 179s | git rev-parse 'HEAD~0' 179s => `5c410cc573946394fbd85950449595317108dca9' 179s | git symbolic-ref -q HEAD 179s => `refs/heads/master' 179s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 179s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 179s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 179s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 179s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian). 179s splitbrain cachekey dgit 9.15 1.0 baredebian 5c410cc573946394fbd85950449595317108dca9 aa9b15129f92e99418effffef1bae210b11b6eed 44a8e312316e71367840bba9ddfa2180658fc45cdf6621883d8e40efa06d2f31 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 179s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 179s >(no reflog) 179s splitbrain cache miss 179s CD work 179s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 180s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 180s + git checkout -q -b dgit-view 180s examining quilt state (multiple patches, baredebian mode) 180s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 180s CD fake 180s | find -name .git -prune -print0 180s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 180s + git checkout -f 5c410cc573946394fbd85950449595317108dca9 -- debian 180s + git add -Af . 180s | git write-tree 180s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 180s fake orig tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 180s CD .. 180s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 180s CD ../fake 180s + git add -Af . 180s | git write-tree 180s => `763a72c3d91f517f4a54c0759ccf4876f1fbb304' 180s fake o+d/p tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 180s CD ../work 180s | git ls-tree --name-only -z 5c410cc573946394fbd85950449595317108dca9 180s => `debian\x00' 180s | git diff-tree -z --no-renames -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 aa9b15129f92e99418effffef1bae210b11b6eed 180s => `: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' 180s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 aa9b15129f92e99418effffef1bae210b11b6eed => 0 180s | git diff-tree -z --no-renames --name-only -r aa9b15129f92e99418effffef1bae210b11b6eed 763a72c3d91f517f4a54c0759ccf4876f1fbb304 180s => `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' 180s quiltify_trees_differ aa9b15129f92e99418effffef1bae210b11b6eed 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 180s | git diff-tree -z --no-renames --name-only -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 180s => `lib.c\x00new-upstream-file\x00src.c\x00' 180s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 180s differences @dl == ## ## == == ==. 180s dgit: base trees orig=bf7987f1ad573f033a09 o+d/p=763a72c3d91f517f4a54 180s dgit: quilt differences: src: == orig ## gitignores: == orig == 180s dgit: quilt differences: upstream ## o+d/p upstream == o+d/p 180s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 180s => `1431548802 +0000' 180s + git read-tree aa9b15129f92e99418effffef1bae210b11b6eed 180s + git rm --quiet -rf --cached --ignore-unmatch debian 180s + git read-tree --prefix=debian/ 5c410cc573946394fbd85950449595317108dca9:debian 180s | git write-tree 180s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 180s | git commit-tree bf7987f1ad573f033a09951c00ab7bdaa7c98445 -p 5c410cc573946394fbd85950449595317108dca9 -p aa9b15129f92e99418effffef1bae210b11b6eed -m 'Combine debian/ with upstream source for 1.0 180s ' -m 'using upstream from git tag v1.0' -m '[dgit (9.15) baredebian-merge 1.0-1 v1.0] 180s ' 180s => `b458f9044514fb0fed66d018e26e5fcc1a6dfeed' 180s + git reset -q --hard b458f9044514fb0fed66d018e26e5fcc1a6dfeed 180s dgit view: creating patches-applied version using gbp pq 180s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 180s + git update-ref refs/heads/dgit-view HEAD 180s + git checkout -q dgit-view 180s | git rev-parse 'HEAD~0' 180s => `47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c' 180s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 180s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 180s => `' 180s + git update-ref -m 'dgit 9.15 1.0 baredebian 5c410cc573946394fbd85950449595317108dca9 aa9b15129f92e99418effffef1bae210b11b6eed 44a8e312316e71367840bba9ddfa2180658fc45cdf6621883d8e40efa06d2f31 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c 180s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 180s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=5c410cc573946394fbd85950449595317108dca9' refs/heads/split.f1 47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c 180s dgit view: created (and left in refs/heads/split.f1) 180s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 180s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 180s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 180s ' 180s + t-ok 180s + : ======================================== 180s + t-check-only-bpd 180s + '[' .. = .. ']' 180s + return 180s + t-fscks 180s + shopt -s nullglob 180s + for d in $tmp/*/.git $tmp/git/*.git 180s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 180s + t-git-fsck 180s ++ git rev-parse --git-dir 180s + local fsckerrs=.git/dgit-test-fsck.errs 180s + set +e 180s + LC_MESSAGES=C 180s + git fsck --no-dangling --strict 180s + tee .git/dgit-test-fsck.errs 180s + ps='0 0' 180s + set -e 180s + local pats 180s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 180s + test '0 0' = '0 0' 180s + pats+=(-e 'notice: HEAD points to an unborn branch') 180s + pats+=(-e 'notice: No default references') 180s + set +e 180s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 180s + rc=1 180s + set -e 180s + case $rc in 180s + t-save-artifacts 180s + artifacts=/tmp/autopkgtest.XK8uun/baredebian-plusgit-artifacts 180s + '[' x/tmp/autopkgtest.XK8uun/baredebian-plusgit-artifacts = x ']' 180s + '[' xtmp = x ']' 180s + GZIP=-1v 180s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/baredebian-plusgit-artifacts/baredebian-plusgit.tar.gz '--exclude=*.tar' . 180s gzip: warning: GZIP environment variable is deprecated; use an alias or script 180s 76.9% 180s + echo ok. 180s ok. 180s + rc=0 180s + set +x 180s + set +e 180s + pwd 180s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 180s + '[' x '!=' x ']' 180s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 180s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 180s + set -e 180s + test 0 = 0 180s autopkgtest [22:50:10]: test baredebian-plusgit: -----------------------] 181s autopkgtest [22:50:11]: test baredebian-plusgit: - - - - - - - - - - results - - - - - - - - - - 181s baredebian-plusgit PASS 181s autopkgtest [22:50:11]: test baredebian-push: preparing testbed 182s Reading package lists... 182s Building dependency tree... 182s Reading state information... 182s Starting pkgProblemResolver with broken count: 0 182s Starting 2 pkgProblemResolver with broken count: 0 182s Done 182s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 183s autopkgtest [22:50:13]: test baredebian-push: [----------------------- 183s ++ set -o pipefail 183s ++ . tests/lib-core 183s ++ . tests/lib-restricts 183s ++ trap ' 183s rc=$? 183s set +x 183s test $rc = 0 || echo " 183s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 183s 183s Most relevant logs are just before assignment rc=$rc 183s Will now do cleanup etc. 183s " 183s set -x 183s set +e 183s pwd 183s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 183s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 183s set -e 183s test $rc = 0 || t-report-failure 183s ' EXIT 183s ++ t-filter-out-git-hyphen-dir 183s ++ local pathent 183s +++ type -p git-rev-parse 183s +++ : 183s ++ pathent= 183s ++ case "$pathent" in 183s ++ return 183s ++ t-set-intree 183s ++ '[' x = x ']' 183s ++ return 183s ++ : -D 183s ++ export DGIT_TEST_DEBUG 183s ++ : x 183s ++ export DGIT_TEST_DEBPUSH_DEBUG 183s ++ : 183s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 183s ++ GIT_COMMITTER_DATE='1530000000 +0100' 183s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 183s ++ GIT_AUTHOR_DATE='1530000000 +0100' 183s ++ export LC_CTYPE=C.UTF-8 183s ++ LC_CTYPE=C.UTF-8 183s ++ unset CDPATH 183s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 183s ++ FILTER_BRANCH_SQUELCH_WARNING=1 183s +++ pwd 183s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 183s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 183s ++ testname=baredebian-push 183s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 183s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 183s ++ bpd=.. 183s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 183s ++ '[' x '!=' x ']' 183s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s +++ pwd 183s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ t-set-using-tmp 183s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 183s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 183s ++ export 'DEBFULLNAME=dgit test git user' 183s ++ DEBFULLNAME='dgit test git user' 183s ++ git config --global user.email dgit-test@debian.example.net 183s ++ git config --global user.name 'dgit test git user' 183s ++ git config --global protocol.ext.allow always 183s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 183s ++ env -0 183s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 183s ++ export DEBCHANGE_VENDOR=dpkg 183s ++ DEBCHANGE_VENDOR=dpkg 183s ++ unset VISUAL 183s ++ unset GIT_EDITOR 183s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 183s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 183s ++ cat 183s ++ schroot=build 183s ++ : aq 183s ++ : archive/test-dummy 183s ++ : sid:unstable 183s ++ t-git-config dgit.default.old-dsc-distro test-dummy 183s ++ git config --global dgit.default.old-dsc-distro test-dummy 183s ++ for import in ${autoimport-gnupg} 183s ++ case "$0" in 183s ++ t-setup-import gnupg 183s ++ local setupname=gnupg 183s ++ local setupsrc 183s ++ local lock 183s ++ '[' x = x ']' 183s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 183s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 183s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 183s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 183s cd "$1"; shift 183s setupname="$1"; shift 183s simport="$1"; shift 183s if [ -e "$simport" ]; then exit 0; fi 183s env - "$@" \ 183s "tests/setup/$setupname" 183s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 183s + cd /tmp/autopkgtest.XK8uun/build.980/src 183s + shift 183s + setupname=gnupg 183s + shift 183s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 183s + shift 183s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 183s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/baredebian-push-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/baredebian-push-stderr --stdout=/tmp/autopkgtest.XK8uun/baredebian-push-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/baredebian-push -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/baredebian-push' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/baredebian-push-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 183s ++ set -o pipefail 183s ++ . tests/lib-core 183s ++ . tests/lib-restricts 183s ++ trap ' 183s rc=$? 183s set +x 183s test $rc = 0 || echo " 183s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 183s 183s Most relevant logs are just before assignment rc=$rc 183s Will now do cleanup etc. 183s " 183s set -x 183s set +e 183s pwd 183s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 183s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 183s set -e 183s test $rc = 0 || t-report-failure 183s ' EXIT 183s ++ t-filter-out-git-hyphen-dir 183s ++ local pathent 183s +++ type -p git-rev-parse 183s +++ : 183s ++ pathent= 183s ++ case "$pathent" in 183s ++ return 183s ++ t-set-intree 183s ++ '[' x = x ']' 183s ++ return 183s ++ : -D 183s ++ export DGIT_TEST_DEBUG 183s ++ : x 183s ++ export DGIT_TEST_DEBPUSH_DEBUG 183s ++ : 183s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 183s ++ GIT_COMMITTER_DATE='1530000000 +0100' 183s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 183s ++ GIT_AUTHOR_DATE='1530000000 +0100' 183s ++ export LC_CTYPE=C.UTF-8 183s ++ LC_CTYPE=C.UTF-8 183s ++ unset CDPATH 183s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 183s ++ FILTER_BRANCH_SQUELCH_WARNING=1 183s +++ pwd 183s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 183s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 183s ++ testname=gnupg 183s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 183s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 183s ++ bpd=.. 183s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 183s ++ '[' x '!=' x ']' 183s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s +++ pwd 183s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ t-set-using-tmp 183s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 183s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 183s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 183s ++ export 'DEBFULLNAME=dgit test git user' 183s ++ DEBFULLNAME='dgit test git user' 183s ++ git config --global user.email dgit-test@debian.example.net 183s ++ git config --global user.name 'dgit test git user' 183s ++ git config --global protocol.ext.allow always 183s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 183s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 183s ++ export DEBCHANGE_VENDOR=dpkg 183s ++ DEBCHANGE_VENDOR=dpkg 183s ++ unset VISUAL 183s ++ unset GIT_EDITOR 183s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 183s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 183s ++ cat 183s ++ schroot=build 183s ++ : aq 183s ++ : archive/test-dummy 183s ++ : sid:unstable 183s ++ t-git-config dgit.default.old-dsc-distro test-dummy 183s ++ git config --global dgit.default.old-dsc-distro test-dummy 183s ++ for import in ${autoimport-gnupg} 183s ++ case "$0" in 183s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 183s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 183s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 183s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 183s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 183s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 183s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 183s + setup=' 183s export GNUPGHOME=$tmp/gnupg 183s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 183s 183s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 183s ssb rsa2048 2013-11-17 [E] 183s 183s sec rsa2048 2014-01-26 [SC] 183s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 183s uid [ultimate] Populus Romanus (test key) 183s ssb rsa2048 2014-01-26 [E] 183s 183s sec rsa2048 2014-01-26 [SC] 183s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 183s uid [ unknown] Hannibal (test key) 183s ssb rsa2048 2014-01-26 [E] 183s 183s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 183s export GNUPGHOME=$tmp/gnupg 183s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 183s 183s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 184s "sha256sum" => "$2", 184s "component" => "$3", 184s "filename" => "$4", 184s }; 184s END { 184s my $json = JSON->new->canonical(); 184s print $json->encode(\@v) or die $!; 184s } 184s ' 184s + t-aq-archive-updated new example 184s + local suite=new 184s + local p=example 184s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 184s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 184s + perl -wne ' 184s use JSON; 184s use strict; 184s our @v; 184s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 184s push @v, { 184s "version" => "$1", 184s "sha256sum" => "$2", 184s "component" => "$3", 184s "filename" => "$4", 184s }; 184s END { 184s my $json = JSON->new->canonical(); 184s print $json->encode(\@v) or die $!; 184s } 184s ' 184s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 184s + cat 184s + jsondelim=' },' 184s + cat 184s + t-git-none 184s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 184s + set -e 184s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 184s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 184s + t-gdr-gbp-import-core-with-queue 184s + t-gdr-gbp-import-core 184s + p=example 184s + t-worktree 1.1 184s + rm -rf example 184s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1 184s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 184s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 184s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 184s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 184s + cd example 184s + : 'fake up some kind of upstream' 184s + git checkout -b upstream quilt-tip 184s Switched to a new branch 'upstream' 184s + rm -rf debian 184s + mkdir debian 184s + echo junk 184s + git add debian 184s + git commit -m 'an upstream retcon (tests/setup/baredebian)' 184s [upstream aa9b151] an upstream retcon (tests/setup/baredebian) 184s 6 files changed, 1 insertion(+), 36 deletions(-) 184s delete mode 100644 debian/changelog 184s delete mode 100644 debian/compat 184s delete mode 100644 debian/control 184s delete mode 100644 debian/example.install 184s mode change 100755 => 100644 debian/rules 184s delete mode 100644 debian/source/format 184s + git tag v1.0 184s + : 'fake up that our quilt-tip was descended from upstream' 184s + git checkout quilt-tip 184s Switched to branch 'quilt-tip' 184s + git merge --no-edit -s ours upstream 184s Merge made by the 'ours' strategy. 184s + : 'fake up that our quilt-tip had the patch queue in it' 184s + git checkout patch-queue/quilt-tip 184s Switched to branch 'patch-queue/quilt-tip' 184s + gbp pq export 184s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 184s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 184s + git add debian/patches 184s + git commit -m 'patch queue update (tests/setup/baredebian)' 184s [quilt-tip 474da4c] patch queue update (tests/setup/baredebian) 184s 4 files changed, 50 insertions(+) 184s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 184s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 184s create mode 100644 debian/patches/series 184s create mode 100644 debian/patches/subdir/addnewups 184s + : 'make branch names more conventional' 184s + git branch -D master 184s Deleted branch master (was 17d67db). 184s + git branch -m quilt-tip master 184s + git-deborig 184s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 184s + git branch -D patch-queue/quilt-tip 184s Deleted branch patch-queue/quilt-tip (was d843a68). 184s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 184s + git branch -D gitish-only 184s Deleted branch gitish-only (was 2b2ddc8). 184s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 184s + git branch -D quilt-tip-1.1 184s Deleted branch quilt-tip-1.1 (was 7fc34be). 184s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 184s + git branch -D quilt-tip-2 184s Deleted branch quilt-tip-2 (was 99fcab4). 184s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 184s + git branch -D indep-arch 184s Deleted branch indep-arch (was e215729). 184s + git rm -rf . 184s rm '.gitignore' 184s rm 'debian/changelog' 184s rm 'debian/compat' 184s rm 'debian/control' 184s rm 'debian/example.install' 184s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 184s rm 'debian/patches/0002-Edit-the-.c-file.patch' 184s rm 'debian/patches/series' 184s rm 'debian/patches/subdir/addnewups' 184s rm 'debian/rules' 184s rm 'debian/source/format' 184s rm 'docs/README' 184s rm 'example' 184s rm 'src.c' 184s + git checkout HEAD -- debian 184s ++ git write-tree 184s + t=1b876c7f2ff3a5f3e269aa710210897c32caee00 184s ++ git commit-tree -m 'Convert to bare debian' 1b876c7f2ff3a5f3e269aa710210897c32caee00 184s + t=5c410cc573946394fbd85950449595317108dca9 184s + git reset --hard 5c410cc573946394fbd85950449595317108dca9 184s HEAD is now at 5c410cc Convert to bare debian 184s ++ echo 'example*' 184s + t-setup-done '' 'example* git mirror aq' ' 184s t-select-package example 184s t-git-next-date 184s ' 184s + local savevars= 184s + local 'savedirs=example* git mirror aq' 184s + local 'importeval= 184s t-select-package example 184s t-git-next-date 184s ' 184s + local import=IMPORT.baredebian 184s + exec 184s + local vn 184s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 184s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 184s print STDERR "saving-exporting $vn\n"; 184s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 184s or die $!; 184s } 184s ' 184s saving-exporting DGIT_TEST_REAL_GPG_AGENT 184s saving-exporting DGIT_TEST_REAL_DEBCHANGE 184s saving-exporting DGIT_TEST_REAL_GPG 184s + set -e 184s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 184s + tar cf IMPORT.baredebian.tar example example_1.0.orig.tar.xz git mirror aq 184s + printf '\n%s\n' ' 184s t-select-package example 184s t-git-next-date 184s ' 184s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian 184s + rc=0 184s + set +x 184s + set +e 184s + pwd 184s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 184s + '[' x '!=' x ']' 184s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 184s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 184s + set -e 184s + test 0 = 0 184s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 184s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 184s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian 184s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 184s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 184s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 184s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 184s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 184s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 184s ++ t-select-package example 184s ++ p=example 184s ++ dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 184s ++ t-git-next-date 184s ++ GIT_COMMITTER_DATE='1530000001 +0100' 184s ++ GIT_AUTHOR_DATE='1530000001 +0100' 184s + t-tstunt-parsechangelog 184s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 184s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 184s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 184s + local var=PATH 184s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 184s + eval ' 184s case "$PATH" in 184s "$tstunt:"*) ;; 184s *":$tstunt:"*) ;; 184s "") PATH="$tstunt" ;; 184s *) PATH="$tstunt:$PATH" ;; 184s esac 184s export PATH 184s ' 184s ++ case "$PATH" in 184s ++ export PATH 184s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 184s + local var=PERLLIB 184s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 184s + eval ' 184s case "$PERLLIB" in 184s "$tstunt:"*) ;; 184s *":$tstunt:"*) ;; 184s "") PERLLIB="$tstunt" ;; 184s *) PERLLIB="$tstunt:$PERLLIB" ;; 184s esac 184s export PERLLIB 184s ' 184s ++ case "$PERLLIB" in 184s ++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 184s ++ export PERLLIB 184s + local f 184s + for f in "$@" 184s + t-tstunt--save-real dpkg-parsechangelog 184s + local f=dpkg-parsechangelog 184s + case "$f" in 184s + local rc 184s + local real 184s + set +e 184s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 184s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 184s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 184s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 184s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 184s ++ type -p dpkg-parsechangelog 184s + real=/usr/bin/dpkg-parsechangelog 184s + rc=0 184s + set -e 184s + case $rc in 184s + local varname=dpkg_parsechangelog 184s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 184s + eval ' 184s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 184s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 184s ' 184s ++ : /usr/bin/dpkg-parsechangelog 184s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 184s + f=./dpkg-parsechangelog 184s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 184s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 184s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 184s + for f in "$@" 184s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 184s + local f=Dpkg/Changelog/Parse.pm 184s + case "$f" in 184s + return 184s + f=./Dpkg/Changelog/Parse.pm 184s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 184s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 184s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 184s + cd example 184s + baredebian-test 184s + baredebian-test-vars 184s + quiltmode=baredebian 184s + v=1.0-1 184s + suite=sid 184s + uv=1.0 184s + uvtag=v1.0 184s + origbase=example_1.0.orig 184s + xorigcomps= 184s + baredebian-test-minimum 184s + t-expect-fail 'contradicts clean mode git-ff' t-dgit -wgf --dgit-view-save=split.f1 --baredebian quilt-fixup 184s + local 'mpat=contradicts clean mode git-ff' 184s + shift 184s + set +o pipefail 184s + LC_MESSAGES=C 184s + LANGUAGE=C 184s + t-dgit -wgf --dgit-view-save=split.f1 --baredebian quilt-fixup 184s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 184s + local dgit=dgit 184s + pwd 184s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 184s + : ' 184s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 184s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 184s | git rev-parse --show-toplevel 184s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 184s | git config -z --get-regexp --local '.*' 184s | git config -z --get-regexp --local '.*' 184s | git config -z --get-regexp --global '.*' 184s | git config -z --get-regexp --system '.*' 184s format 3.0 (quilt), quilt mode baredebian 184s Format `3.0 (quilt)', need to check/update patch stack 184s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 184s => `' 184s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 184s => `aa9b15129f92e99418effffef1bae210b11b6eed' 184s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 184s => `' 184s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 184s => `aa9b15129f92e99418effffef1bae210b11b6eed' 184s dgit: --quilt=baredebian, using upstream from git tag v1.0 184s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 184s => `' 184s + git diff --quiet HEAD 184s 184s dgit: error: quilt mode baredebian (generally needs untracked upstream files) 184s dgit: contradicts clean mode git-ff (which would delete them) 184s + local 'ps=255 0' 184s + set -o pipefail 184s + case $ps in 184s + t-grep-mpat 'contradicts clean mode git-ff' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 184s + local 'mpat=contradicts clean mode git-ff' 184s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 184s + local grepper=fgrep 184s + case "$mpat" in 184s + fgrep -e 'contradicts clean mode git-ff' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 184s dgit: contradicts clean mode git-ff (which would delete them) 184s + t-dgit -wn --dgit-view-save=split.f1 --baredebian quilt-fixup 184s + local dgit=dgit 184s + pwd 184s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 184s + : ' 184s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 184s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 184s | git rev-parse --show-toplevel 184s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 184s | git config -z --get-regexp --local '.*' 184s | git config -z --get-regexp --local '.*' 184s | git config -z --get-regexp --global '.*' 184s | git config -z --get-regexp --system '.*' 184s format 3.0 (quilt), quilt mode baredebian 184s Format `3.0 (quilt)', need to check/update patch stack 184s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 184s => `' 184s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 184s => `aa9b15129f92e99418effffef1bae210b11b6eed' 184s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 184s => `' 184s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 184s => `aa9b15129f92e99418effffef1bae210b11b6eed' 184s dgit: --quilt=baredebian, using upstream from git tag v1.0 184s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 184s => `' 184s + git diff --quiet HEAD 184s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 184s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 184s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 184s | git rev-parse 'HEAD~0' 184s => `5c410cc573946394fbd85950449595317108dca9' 184s | git symbolic-ref -q HEAD 184s => `refs/heads/master' 184s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 184s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 184s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 184s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 184s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian). 184s splitbrain cachekey dgit 9.15 1.0 baredebian 5c410cc573946394fbd85950449595317108dca9 aa9b15129f92e99418effffef1bae210b11b6eed 9aebaec9e0d6d4a3a39c0619b2671f25d498f3d7e2190f1ea7714d3302254dd3 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 184s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 184s >(no reflog) 184s splitbrain cache miss 184s CD work 184s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 185s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 185s + git checkout -q -b dgit-view 185s examining quilt state (multiple patches, baredebian mode) 185s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 185s CD fake 185s | find -name .git -prune -print0 185s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 185s + git checkout -f 5c410cc573946394fbd85950449595317108dca9 -- debian 185s + git add -Af . 185s | git write-tree 185s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 185s fake orig tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 185s CD .. 185s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 185s CD ../fake 185s + git add -Af . 185s | git write-tree 185s => `763a72c3d91f517f4a54c0759ccf4876f1fbb304' 185s fake o+d/p tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 185s CD ../work 185s | git ls-tree --name-only -z 5c410cc573946394fbd85950449595317108dca9 185s => `debian\x00' 185s | git diff-tree -z --no-renames -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 aa9b15129f92e99418effffef1bae210b11b6eed 185s => `: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' 185s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 aa9b15129f92e99418effffef1bae210b11b6eed => 0 185s | git diff-tree -z --no-renames --name-only -r aa9b15129f92e99418effffef1bae210b11b6eed 763a72c3d91f517f4a54c0759ccf4876f1fbb304 185s => `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' 185s quiltify_trees_differ aa9b15129f92e99418effffef1bae210b11b6eed 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 185s | git diff-tree -z --no-renames --name-only -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 185s => `lib.c\x00new-upstream-file\x00src.c\x00' 185s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 185s differences @dl == ## ## == == ==. 185s dgit: base trees orig=bf7987f1ad573f033a09 o+d/p=763a72c3d91f517f4a54 185s dgit: quilt differences: src: == orig ## gitignores: == orig == 185s dgit: quilt differences: upstream ## o+d/p upstream == o+d/p 185s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 185s => `1431548802 +0000' 185s + git read-tree aa9b15129f92e99418effffef1bae210b11b6eed 185s + git rm --quiet -rf --cached --ignore-unmatch debian 185s + git read-tree --prefix=debian/ 5c410cc573946394fbd85950449595317108dca9:debian 185s | git write-tree 185s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 185s | git commit-tree bf7987f1ad573f033a09951c00ab7bdaa7c98445 -p 5c410cc573946394fbd85950449595317108dca9 -p aa9b15129f92e99418effffef1bae210b11b6eed -m 'Combine debian/ with upstream source for 1.0 185s ' -m 'using upstream from git tag v1.0' -m '[dgit (9.15) baredebian-merge 1.0-1 v1.0] 185s ' 185s => `b458f9044514fb0fed66d018e26e5fcc1a6dfeed' 185s + git reset -q --hard b458f9044514fb0fed66d018e26e5fcc1a6dfeed 185s dgit view: creating patches-applied version using gbp pq 185s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 185s + git update-ref refs/heads/dgit-view HEAD 185s + git checkout -q dgit-view 185s | git rev-parse 'HEAD~0' 185s => `47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c' 185s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 185s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 185s => `' 185s + git update-ref -m 'dgit 9.15 1.0 baredebian 5c410cc573946394fbd85950449595317108dca9 aa9b15129f92e99418effffef1bae210b11b6eed 9aebaec9e0d6d4a3a39c0619b2671f25d498f3d7e2190f1ea7714d3302254dd3 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c 185s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 185s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=5c410cc573946394fbd85950449595317108dca9' refs/heads/split.f1 47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c 185s dgit view: created (and left in refs/heads/split.f1) 185s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 185s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 185s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 185s ' 185s + baredebian-test-core 185s + baredebian-test-core-prepush 185s + tar --strip-components=1 -axf ../example_1.0.orig.tar.xz 185s + cd debian 185s + git clean -xdff 185s + git checkout HEAD -- . 185s + cd .. 185s + export QUILT_PATCHES=debian/patches 185s + QUILT_PATCHES=debian/patches 185s + quilt push -a 185s Applying patch debian/patches/0001-Add-a-new-upstream-file.patch 185s patching file new-upstream-file 185s 185s Applying patch debian/patches/0002-Edit-the-.c-file.patch 185s patching file src.c 185s 185s Applying patch debian/patches/subdir/addnewups 185s patching file lib.c 185s 185s Now at patch debian/patches/subdir/addnewups 185s + git add -Af . 185s + git reset .pc 185s + git diff --cached --exit-code split.f1 -- :/ ':!/debian' 185s + git diff --exit-code HEAD..split.f1 -- :/debian 185s + git reset 185s + quilt new made-with-quilt 185s Patch debian/patches/made-with-quilt is now on top 185s + quilt add src.c 185s File src.c added to patch debian/patches/made-with-quilt 185s + echo //omg 185s + quilt refresh 185s Refreshed patch debian/patches/made-with-quilt 185s + git add debian/patches/. 185s + t-commit 'extra patch made with quilt' 1.0-2 185s + local 'msg=extra patch made with quilt' 185s + v=1.0-2 185s + t-debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 185s + DEBEMAIL=dgit-tests@example.org 185s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 185s + 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 185s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 185s libdistro-info-perl is not installed, Debian release names are not known. 185s libdistro-info-perl is not installed, Ubuntu release names are not known. 185s + git add debian/changelog 185s + debcommit 185s git commit -m 'extra patch made with quilt' 185s [master d0c1094] extra patch made with quilt 185s 3 files changed, 14 insertions(+) 185s create mode 100644 debian/patches/made-with-quilt 185s + revision=1 185s + t-refs-same-start 185s + unset t_ref_val 185s + t_ref_names=() 185s + t-ref-head 185s + local val 185s ++ git rev-parse HEAD 185s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 185s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 185s + local name=HEAD 185s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 185s + case "${t_ref_val-unset}" in 185s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 185s + t_ref_names+=("$name") 185s + t-dgit -wn --quilt=baredebian --dgit-view-save=split.b quilt-fixup 185s + local dgit=dgit 185s + pwd 185s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 185s + : ' 185s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 185s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 186s | git rev-parse --show-toplevel 186s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 186s | git config -z --get-regexp --local '.*' 186s | git config -z --get-regexp --local '.*' 186s | git config -z --get-regexp --global '.*' 186s | git config -z --get-regexp --system '.*' 186s format 3.0 (quilt), quilt mode baredebian 186s Format `3.0 (quilt)', need to check/update patch stack 186s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 186s => `' 186s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 186s => `aa9b15129f92e99418effffef1bae210b11b6eed' 186s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 186s => `' 186s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 186s => `aa9b15129f92e99418effffef1bae210b11b6eed' 186s dgit: --quilt=baredebian, using upstream from git tag v1.0 186s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 186s => `' 186s + git diff --quiet HEAD 186s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 186s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 186s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 186s | git rev-parse 'HEAD~0' 186s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 186s | git symbolic-ref -q HEAD 186s => `refs/heads/master' 186s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 186s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 186s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 186s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 186s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian). 186s splitbrain cachekey dgit 9.15 1.0 baredebian d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 aa9b15129f92e99418effffef1bae210b11b6eed 47f8cfaf7a930c54b9a322e9fc58649100ab99810218587873cfff405cdcefc1 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 186s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 186s splitbrain cache miss 186s CD work 186s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 186s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 186s + git checkout -q -b dgit-view 186s examining quilt state (multiple patches, baredebian mode) 186s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 186s CD fake 186s | find -name .git -prune -print0 186s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 186s + git checkout -f d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -- debian 186s + git add -Af . 186s | git write-tree 186s => `13afe261a5f954761b36d126fa74b978765116a8' 186s fake orig tree object 13afe261a5f954761b36d126fa74b978765116a8 186s CD .. 186s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 186s CD ../fake 186s + git add -Af . 186s | git write-tree 186s => `09583ba28b17d629329903d2cfda3a22eceef550' 186s fake o+d/p tree object 13afe261a5f954761b36d126fa74b978765116a8 186s CD ../work 186s | git ls-tree --name-only -z d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 186s => `debian\x00' 186s | git diff-tree -z --no-renames -r 13afe261a5f954761b36d126fa74b978765116a8 aa9b15129f92e99418effffef1bae210b11b6eed 186s => `: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' 186s quiltify_trees_differ 13afe261a5f954761b36d126fa74b978765116a8 aa9b15129f92e99418effffef1bae210b11b6eed => 0 186s | git diff-tree -z --no-renames --name-only -r aa9b15129f92e99418effffef1bae210b11b6eed 09583ba28b17d629329903d2cfda3a22eceef550 186s => `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' 186s quiltify_trees_differ aa9b15129f92e99418effffef1bae210b11b6eed 09583ba28b17d629329903d2cfda3a22eceef550 => 1 186s | git diff-tree -z --no-renames --name-only -r 13afe261a5f954761b36d126fa74b978765116a8 09583ba28b17d629329903d2cfda3a22eceef550 186s => `lib.c\x00new-upstream-file\x00src.c\x00' 186s quiltify_trees_differ 13afe261a5f954761b36d126fa74b978765116a8 09583ba28b17d629329903d2cfda3a22eceef550 => 1 186s differences @dl == ## ## == == ==. 186s dgit: base trees orig=13afe261a5f954761b36 o+d/p=09583ba28b17d6293299 186s dgit: quilt differences: src: == orig ## gitignores: == orig == 186s dgit: quilt differences: upstream ## o+d/p upstream == o+d/p 186s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 186s => `1530000001 +0000' 186s + git read-tree aa9b15129f92e99418effffef1bae210b11b6eed 186s + git rm --quiet -rf --cached --ignore-unmatch debian 186s + git read-tree --prefix=debian/ d0c109478cdb46a6564ea8f5ee5c36484a39f9c7:debian 186s | git write-tree 186s => `13afe261a5f954761b36d126fa74b978765116a8' 186s | git commit-tree 13afe261a5f954761b36d126fa74b978765116a8 -p d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -p aa9b15129f92e99418effffef1bae210b11b6eed -m 'Combine debian/ with upstream source for 1.0 186s ' -m 'using upstream from git tag v1.0' -m '[dgit (9.15) baredebian-merge 1.0-2 v1.0] 186s ' 186s => `48a67f5916c472f60fce0570f52fe1cbc2a816b4' 186s + git reset -q --hard 48a67f5916c472f60fce0570f52fe1cbc2a816b4 186s dgit view: creating patches-applied version using gbp pq 186s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 186s gbp:warning: Patch 'made-with-quilt' has no authorship information, using 'Ian Jackson ' 186s + git update-ref refs/heads/dgit-view HEAD 186s + git checkout -q dgit-view 186s | git rev-parse 'HEAD~0' 186s => `446b27d44feb30f14d38c53e07fafadd95dc90ef' 186s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 186s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 186s => `47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c' 186s + git update-ref -m 'dgit 9.15 1.0 baredebian d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 aa9b15129f92e99418effffef1bae210b11b6eed 47f8cfaf7a930c54b9a322e9fc58649100ab99810218587873cfff405cdcefc1 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 446b27d44feb30f14d38c53e07fafadd95dc90ef 186s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 186s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.b 446b27d44feb30f14d38c53e07fafadd95dc90ef 186s dgit view: created (and left in refs/heads/split.b) 186s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 186s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 186s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 186s ' 186s + t-ref-head 186s + local val 186s ++ git rev-parse HEAD 186s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 186s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 186s + local name=HEAD 186s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 186s + case "${t_ref_val-unset}" in 186s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 186s + t_ref_names+=("$name") 186s + baredebian-test-core-push 186s + dpkg-buildpackage -uc -us --build=source 186s dpkg-buildpackage: info: source package example 186s dpkg-buildpackage: info: source version 1.0-2 186s dpkg-buildpackage: info: source distribution unstable 186s dpkg-buildpackage: info: source changed by dgit test git user 186s dpkg-source --before-build . 187s fakeroot debian/rules clean 187s EXAMPLE RULES TARGET clean 187s dh_clean 187s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 187s dpkg-source -b . 187s dpkg-source: info: using source format '3.0 (quilt)' 187s dpkg-source: info: building example using existing ./example_1.0.orig.tar.xz 187s dpkg-source: info: using patch list from debian/patches/series 187s dpkg-source: info: building example in example_1.0-2.debian.tar.xz 187s dpkg-source: info: building example in example_1.0-2.dsc 187s dpkg-genbuildinfo --build=source -O../example_1.0-2_source.buildinfo 187s dpkg-genchanges --build=source -O../example_1.0-2_source.changes 187s dpkg-genchanges: info: not including original source code in upload 187s dpkg-source --after-build . 187s dpkg-buildpackage: info: source-only, diff-only upload (original source NOT included) 187s + t-dgit -wn --quilt=baredebian --dgit-view-save=split.p --new push 187s + local dgit=dgit 187s + pwd 187s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 187s + : ' 187s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 187s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 187s | git rev-parse --show-toplevel 187s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 187s | git config -z --get-regexp --local '.*' 187s | git config -z --get-regexp --local '.*' 187s | git config -z --get-regexp --global '.*' 187s | git config -z --get-regexp --system '.*' 187s format 3.0 (quilt), quilt mode baredebian 187s Format `3.0 (quilt)', need to check/update patch stack 187s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 187s => `' 187s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 187s => `aa9b15129f92e99418effffef1bae210b11b6eed' 187s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 187s => `' 187s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 187s => `aa9b15129f92e99418effffef1bae210b11b6eed' 187s dgit: --quilt=baredebian, using upstream from git tag v1.0 187s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 187s => `' 187s + git diff --quiet HEAD 187s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 187s canonical suite name for unstable is sid 187s actually entering push 187s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 187s => `0' 187s + git config remote.dgit.skipdefaultupdate true 187s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 187s get_archive_dsc: nothing in archive, returning undef 187s no version available from the archive 187s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 187s => `' 187s previous reference hash= 187s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 187s => `' 187s fetch_from_archive: lastfetch= 187s nothing found! 187s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 187s + git check-ref-format archive/test-dummy/1.0-2 187s | git symbolic-ref -q HEAD 187s => `refs/heads/master' 187s | git rev-parse 'HEAD~0' 187s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 187s ffq_prev_branchinfo branch current refs/heads/master 187s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 187s => `' 187s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 187s => `' 187s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 187s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 187s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 187s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 187s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian). 187s splitbrain cachekey dgit 9.15 1.0 baredebian d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 aa9b15129f92e99418effffef1bae210b11b6eed 47f8cfaf7a930c54b9a322e9fc58649100ab99810218587873cfff405cdcefc1 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 187s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 187s CD work 187s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 187s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 187s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save cache-hit HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.p 446b27d44feb30f14d38c53e07fafadd95dc90ef 187s dgit view: found cached (and left in refs/heads/split.p) 187s + git checkout -q -b dgit-view 446b27d44feb30f14d38c53e07fafadd95dc90ef 187s splitbrain_pseudomerge... 187s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 187s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 187s => `' 187s + git diff --quiet HEAD 187s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.0-2' 187s => `' 187s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 187s checking that example_1.0-2.dsc corresponds to HEAD 187s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0-2.dsc 188s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0-2.dsc) 188s dpkg-source: info: extracting example in example-1.0 188s dpkg-source: info: unpacking example_1.0.orig.tar.xz 188s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 188s dpkg-source: info: using patch list from debian/patches/series 188s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 188s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 188s dpkg-source: info: applying subdir/addnewups 188s dpkg-source: info: applying made-with-quilt 188s CD example-1.0 188s | find -name .git -prune -print0 188s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 188s + git add -Af . 188s | git write-tree 188s => `09583ba28b17d629329903d2cfda3a22eceef550' 188s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 188s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 188s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 188s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 188s + git diff --quiet 09583ba28b17d629329903d2cfda3a22eceef550 446b27d44feb30f14d38c53e07fafadd95dc90ef 188s files_compare_inputs example_1.0-2.dsc 188s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 188s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0.orig.tar.xz 188s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0-2.debian.tar.xz 188s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 188s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0.orig.tar.xz 188s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0-2.debian.tar.xz 188s files_compare_inputs example_1.0-2.dsc Files 188s files_compare_inputs example_1.0-2.dsc Files example_1.0.orig.tar.xz 188s files_compare_inputs example_1.0-2.dsc Files example_1.0-2.debian.tar.xz 188s files_compare_inputs example_1.0-2_source.changes 188s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 188s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.dsc 188s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.debian.tar.xz 188s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2_source.buildinfo 188s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 188s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.dsc 188s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.debian.tar.xz 188s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2_source.buildinfo 188s files_compare_inputs example_1.0-2_source.changes Files 188s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.dsc 188s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.debian.tar.xz 188s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2_source.buildinfo 188s checking origs needed (1.0)... 188s checking origs needed placement 'devel extra'... 188s origs example_1.0.orig.tar.xz | 9ff3b1cef499c0c890e9366b9da974c2 460 example_1.0.orig.tar.xz 188s origs example_1.0.orig.tar.xz is_orig 188s -| sh -ec 'cd "$1"; shift 188s 188s find -name "$1" -print0 | 188s xargs -0r sha256sum 188s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_1.0.orig.tar.xz 188s origs example_1.0.orig.tar.xz $#$have=-1 188s origs example_1.0.orig.tar.xz f.same=0 #f._differ=-1 188s origs example_1.0-2.debian.tar.xz | 33d973e7522208030e046b0e5a15006d 1336 example_1.0-2.debian.tar.xz 188s edited .changes for archive .orig contents: added example_1.0.orig.tar.xz 188s push_tagwants: $VAR1 = [ 188s '1.0-2', 188s '446b27d44feb30f14d38c53e07fafadd95dc90ef', 188s 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 188s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 188s ]; 188s $VAR2 = [ 188s { 188s 'Tfn' => sub { "DUMMY" }, 188s 'Tag' => 'archive/test-dummy/1.0-2', 188s 'TfSuffix' => '', 188s 'View' => 'dgit', 188s 'Objid' => '446b27d44feb30f14d38c53e07fafadd95dc90ef', 188s 'TagFn' => sub { "DUMMY" } 188s }, 188s { 188s 'Tag' => 'test-dummy/1.0-2', 188s 'Tfn' => sub { "DUMMY" }, 188s 'View' => 'maint', 188s 'TagFn' => sub { "DUMMY" }, 188s 'Objid' => 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 188s 'TfSuffix' => '-maintview' 188s } 188s ]; 188s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 188s => `1530000001 +0000' 188s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 188s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 188s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 188s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 188s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 188s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 188s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 188s => `743a39e2aa6944de2a291a19be6ad51d5c582391' 188s + git verify-tag 743a39e2aa6944de2a291a19be6ad51d5c582391 188s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 188s gpg: Signature made Mon Mar 31 22:50:18 2025 UTC 188s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 188s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 188s gpg: WARNING: This key is not certified with a trusted signature! 188s gpg: There is no indication that the signature belongs to the owner. 188s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 188s + git update-ref refs/tags/archive/test-dummy/1.0-2 743a39e2aa6944de2a291a19be6ad51d5c582391 188s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 188s => `78ffe476d7d516668d8bdfd14a9b41c046357e9a' 188s + git verify-tag 78ffe476d7d516668d8bdfd14a9b41c046357e9a 188s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 188s gpg: Signature made Mon Mar 31 22:50:18 2025 UTC 188s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 188s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 188s gpg: WARNING: This key is not certified with a trusted signature! 188s gpg: There is no indication that the signature belongs to the owner. 188s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 188s + git update-ref refs/tags/test-dummy/1.0-2 78ffe476d7d516668d8bdfd14a9b41c046357e9a 188s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 188s => `0' 188s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 188s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 446b27d44feb30f14d38c53e07fafadd95dc90ef:refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 refs/tags/test-dummy/1.0-2 188s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 188s * [new reference] 446b27d44feb30f14d38c53e07fafadd95dc90ef -> refs/dgit/sid 188s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 188s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 188s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 446b27d44feb30f14d38c53e07fafadd95dc90ef 188s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.0-2_source.changes 188s signfile dsc ../example_1.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 188s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 188s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 188s 188s fixup_buildinfo ../example_1.0-2.dsc ../example_1.0-2_source.buildinfo 188s signfile buildinfo ../example_1.0-2_source.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 188s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 188s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 188s 188s fixup_changes dsc ../example_1.0-2.dsc ../example_1.0-2_source.changes 188s fixup_changes buildinfo ../example_1.0-2_source.buildinfo ../example_1.0-2_source.changes 188s signfile changes ../example_1.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 188s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 189s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 189s 189s Successfully signed dsc, buildinfo, changes files 189s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_1.0-2_source.changes 189s gpg: ../example_1.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 189s gpg: ../example_1.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 189s D: Setting host argument. 189s Checking signature on .changes 189s Checking signature on .dsc 189s Uploading to test-dummy (via local to localhost): 189s Successfully uploaded packages. 189s dgit ok: pushed and uploaded 1.0-2 189s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 189s del_lrfetchrefs... 189s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 189s ' 189s + baredebian-test-core-postpush 189s + git merge-base --is-ancestor HEAD split.p 189s + '[' v1.0 ']' 189s + git merge-base --is-ancestor v1.0 split.p 189s + set +e 189s + git merge-base HEAD v1.0 189s + rc=1 189s + set -e 189s + '[' 1 = 1 ']' 189s + git clean -xdff 189s Removing .gitignore 189s Removing .pc/ 189s Removing debian/files 189s Removing docs/ 189s Removing example 189s Removing lib.c 189s Removing new-upstream-file 189s Removing src.c 189s + t-splitbrain-pushed-good-start 189s + dep14tag=refs/tags/test-dummy/1.0-2 189s ++ t-v-tag 189s ++ echo refs/tags/archive/test-dummy/1.0-2 189s + dgittag=refs/tags/archive/test-dummy/1.0-2 189s + t-output '' git status --porcelain 189s + printf %s '' 189s + shift 189s + git status --porcelain 189s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 189s + t-ref-head 189s + local val 189s ++ git rev-parse HEAD 189s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + local name=HEAD 189s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + case "${t_ref_val-unset}" in 189s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + t_ref_names+=("$name") 189s + t-refs-same refs/tags/test-dummy/1.0-2 189s + local g 189s + for g in $* 189s + t-ref-same refs/tags/test-dummy/1.0-2 189s + local name=refs/tags/test-dummy/1.0-2 189s + local val 189s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 189s ++ local ref=refs/tags/test-dummy/1.0-2 189s ++ case "$ref" in 189s ++ git show-ref -d refs/tags/test-dummy/1.0-2 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ' 189s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + local name=refs/tags/test-dummy/1.0-2 189s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + case "${t_ref_val-unset}" in 189s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + t_ref_names+=("$name") 189s + set -e 189s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 189s + t-refs-same refs/tags/test-dummy/1.0-2 189s + local g 189s + for g in $* 189s + t-ref-same refs/tags/test-dummy/1.0-2 189s + local name=refs/tags/test-dummy/1.0-2 189s + local val 189s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 189s ++ local ref=refs/tags/test-dummy/1.0-2 189s ++ case "$ref" in 189s ++ git show-ref -d refs/tags/test-dummy/1.0-2 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ' 189s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + local name=refs/tags/test-dummy/1.0-2 189s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + case "${t_ref_val-unset}" in 189s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 189s + t_ref_names+=("$name") 189s + git merge-base --is-ancestor refs/tags/test-dummy/1.0-2 refs/tags/archive/test-dummy/1.0-2 189s + t-refs-same-start 189s + unset t_ref_val 189s + t_ref_names=() 189s + t-ref-same refs/heads/split.p 189s + local name=refs/heads/split.p 189s + local val 189s ++ t-git-get-ref refs/heads/split.p 189s ++ local ref=refs/heads/split.p 189s ++ case "$ref" in 189s ++ git show-ref -d refs/heads/split.p 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/heads/split.p\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ' 189s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t-ref-same-val refs/heads/split.p 446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + local name=refs/heads/split.p 189s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + case "${t_ref_val-unset}" in 189s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t_ref_names+=("$name") 189s ++ t-git-get-ref refs/heads/split.b 189s ++ local ref=refs/heads/split.b 189s ++ case "$ref" in 189s ++ git show-ref -d refs/heads/split.b 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/heads/split.b\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ' 189s + local split_b=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + case "$split_b" in 189s + t-pushed-good-core 189s + t-ref-dsc-dgit 189s + t-incoming-dsc 189s + local dsc=example_1.0-2.dsc 189s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 189s + local val 189s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit 189s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 189s ++ local field=Dgit 189s ++ perl -e ' 189s use Dpkg::Control::Hash; 189s my $h = new Dpkg::Control::Hash allow_pgp=>1; 189s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc"); 189s my $val = $h->{"Dgit"},"\n"; 189s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit" unless defined $val; 189s print $val,"\n"; 189s ' 189s + val='446b27d44feb30f14d38c53e07fafadd95dc90ef test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 189s ++ perl -e ' 189s $_=shift @ARGV; 189s die "Dgit $_ ?" unless m/^\w+\b/; 189s print $&,"\n" or die $!; 189s ' '446b27d44feb30f14d38c53e07fafadd95dc90ef test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 189s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 189s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + case "${t_ref_val-unset}" in 189s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t_ref_names+=("$name") 189s ++ t-v-tag 189s ++ echo refs/tags/archive/test-dummy/1.0-2 189s + t-refs-same refs/tags/archive/test-dummy/1.0-2 refs/remotes/dgit/dgit/sid 189s + local g 189s + for g in $* 189s + t-ref-same refs/tags/archive/test-dummy/1.0-2 189s + local name=refs/tags/archive/test-dummy/1.0-2 189s + local val 189s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 189s ++ local ref=refs/tags/archive/test-dummy/1.0-2 189s ++ case "$ref" in 189s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ' 189s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + local name=refs/tags/archive/test-dummy/1.0-2 189s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + case "${t_ref_val-unset}" in 189s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t_ref_names+=("$name") 189s + for g in $* 189s + t-ref-same refs/remotes/dgit/dgit/sid 189s + local name=refs/remotes/dgit/dgit/sid 189s + local val 189s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 189s ++ local ref=refs/remotes/dgit/dgit/sid 189s ++ case "$ref" in 189s ++ git show-ref -d refs/remotes/dgit/dgit/sid 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ' 189s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t-ref-same-val refs/remotes/dgit/dgit/sid 446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + local name=refs/remotes/dgit/dgit/sid 189s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + case "${t_ref_val-unset}" in 189s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t_ref_names+=("$name") 189s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 189s + local val 189s + for g in $* 189s ++ t-git-get-ref refs/heads/dgit/unstable 189s ++ local ref=refs/heads/dgit/unstable 189s ++ case "$ref" in 189s ++ git show-ref -d refs/heads/dgit/unstable 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ' 189s ++ test 1 = 1 189s + val= 189s + '[' x '!=' x ']' 189s + for g in $* 189s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 189s ++ local ref=refs/remotes/dgit/dgit/unstable 189s ++ case "$ref" in 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 189s ' 189s ++ test 1 = 1 189s + val= 189s + '[' x '!=' x ']' 189s + set -e 189s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 189s ++ t-v-tag 189s ++ echo refs/tags/archive/test-dummy/1.0-2 189s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 189s + local g 189s + for g in $* 189s + t-ref-same refs/dgit/sid 189s + local name=refs/dgit/sid 189s + local val 189s ++ t-git-get-ref refs/dgit/sid 189s ++ local ref=refs/dgit/sid 189s ++ case "$ref" in 189s ++ git show-ref -d refs/dgit/sid 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ' 189s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t-ref-same-val refs/dgit/sid 446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + local name=refs/dgit/sid 189s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + case "${t_ref_val-unset}" in 189s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t_ref_names+=("$name") 189s + for g in $* 189s + t-ref-same refs/tags/archive/test-dummy/1.0-2 189s + local name=refs/tags/archive/test-dummy/1.0-2 189s + local val 189s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 189s ++ local ref=refs/tags/archive/test-dummy/1.0-2 189s ++ case "$ref" in 189s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ' 189s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + local name=refs/tags/archive/test-dummy/1.0-2 189s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + case "${t_ref_val-unset}" in 189s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 189s + t_ref_names+=("$name") 189s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 189s + t-refs-notexist refs/dgit/unstable 189s + local val 189s + for g in $* 189s ++ t-git-get-ref refs/dgit/unstable 189s ++ local ref=refs/dgit/unstable 189s ++ case "$ref" in 189s ++ git show-ref -d refs/dgit/unstable 189s ++ perl -ne ' 189s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 189s END { print "$x\n" if length $x; } 189s ' 189s ++ test 1 = 1 189s + val= 189s + '[' x '!=' x ']' 189s ++ t-v-tag 189s ++ echo refs/tags/archive/test-dummy/1.0-2 189s + git verify-tag refs/tags/archive/test-dummy/1.0-2 189s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 189s gpg: Signature made Mon Mar 31 22:50:18 2025 UTC 189s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 189s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 189s gpg: WARNING: This key is not certified with a trusted signature! 189s gpg: There is no indication that the signature belongs to the owner. 189s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 189s + t-incoming-dsc 189s + local dsc=example_1.0-2.dsc 189s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 189s + t-splitbrain-pushed-good--unpack 189s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 189s + rm -rf t-unpack 189s + mkdir t-unpack 189s + cd t-unpack 189s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 189s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0.orig.tar.xz . 189s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc . 189s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 189s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 189s + dpkg-source -x example_1.0-2.dsc 189s gpgv: Signature made Mon Mar 31 22:50:18 2025 UTC 189s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 189s gpgv: Can't check signature: No public key 189s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 189s dpkg-source: info: extracting example in example-1.0 189s dpkg-source: info: unpacking example_1.0.orig.tar.xz 189s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 189s dpkg-source: info: using patch list from debian/patches/series 189s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 189s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 189s dpkg-source: info: applying subdir/addnewups 189s dpkg-source: info: applying made-with-quilt 189s + cd example-1.0/. 189s + git init 189s hint: Using 'master' as the name for the initial branch. This default branch name 189s hint: is subject to change. To configure the initial branch name to use in all 189s hint: of your new repositories, which will suppress this warning, call: 189s hint: 189s hint: git config --global init.defaultBranch 189s hint: 189s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 189s hint: 'development'. The just-created branch can be renamed via this command: 189s hint: 189s hint: git branch -m 189s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t-unpack/example-1.0/.git/ 189s + git fetch ../../example 'refs/tags/*:refs/tags/*' 189s From ../../example 189s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 189s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 189s * [new tag] v1.0 -> v1.0 189s + t-splitbrain-pushed-good--checkdiff refs/tags/archive/test-dummy/1.0-2 189s + local tag=refs/tags/archive/test-dummy/1.0-2 189s + t-splitbrain-pushed-good--checkprep 189s + git add -Af . 189s + git rm --cached -r --ignore-unmatch .pc 189s rm '.pc/.quilt_patches' 189s rm '.pc/.quilt_series' 189s rm '.pc/.version' 189s rm '.pc/0001-Add-a-new-upstream-file.patch/new-upstream-file' 189s rm '.pc/0002-Edit-the-.c-file.patch/src.c' 189s rm '.pc/applied-patches' 189s rm '.pc/made-with-quilt/src.c' 189s rm '.pc/subdir/addnewups/lib.c' 189s + t-output '' git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 189s + printf %s '' 189s + shift 189s + git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 189s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 189s + t-splitbrain-pushed-good--unpack 189s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 189s + rm -rf t-unpack 189s + mkdir t-unpack 189s + cd t-unpack 189s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 189s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0.orig.tar.xz . 189s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc . 189s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 189s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 189s + dpkg-source -x example_1.0-2.dsc 189s gpgv: Signature made Mon Mar 31 22:50:18 2025 UTC 189s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 189s gpgv: Can't check signature: No public key 189s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 189s dpkg-source: info: extracting example in example-1.0 189s dpkg-source: info: unpacking example_1.0.orig.tar.xz 189s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 189s dpkg-source: info: using patch list from debian/patches/series 189s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 189s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 189s dpkg-source: info: applying subdir/addnewups 189s dpkg-source: info: applying made-with-quilt 189s + cd example-1.0/. 189s + git init 189s hint: Using 'master' as the name for the initial branch. This default branch name 189s hint: is subject to change. To configure the initial branch name to use in all 189s hint: of your new repositories, which will suppress this warning, call: 189s hint: 189s hint: git config --global init.defaultBranch 189s hint: 189s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 189s hint: 'development'. The just-created branch can be renamed via this command: 189s hint: 189s hint: git branch -m 189s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t-unpack/example-1.0/.git/ 189s + git fetch ../../example 'refs/tags/*:refs/tags/*' 189s From ../../example 189s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 189s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 189s * [new tag] v1.0 -> v1.0 189s + find . -mindepth 1 -maxdepth 1 '!' -path ./debian '!' -path ./.git -print0 189s + xargs -0r rm -rf -- 189s + t-splitbrain-pushed-good-end-made-dep14 189s + t-splitbrain-pushed-good--checkdiff refs/tags/test-dummy/1.0-2 189s + local tag=refs/tags/test-dummy/1.0-2 189s + t-splitbrain-pushed-good--checkprep 189s + git add -Af . 189s + git rm --cached -r --ignore-unmatch .pc 189s + t-output '' git diff --stat --cached refs/tags/test-dummy/1.0-2 189s + printf %s '' 189s + shift 189s + git diff --stat --cached refs/tags/test-dummy/1.0-2 189s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 189s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 189s + t-ok 189s + : ======================================== 189s + t-check-only-bpd 189s + '[' .. = .. ']' 189s + return 189s + t-fscks 189s + shopt -s nullglob 189s + for d in $tmp/*/.git $tmp/git/*.git 189s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 189s + t-git-fsck 189s ++ git rev-parse --git-dir 189s + local fsckerrs=.git/dgit-test-fsck.errs 189s + set +e 189s + LC_MESSAGES=C 189s + git fsck --no-dangling --strict 189s + tee .git/dgit-test-fsck.errs 189s + ps='0 0' 189s + set -e 189s + local pats 189s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 189s + test '0 0' = '0 0' 189s + pats+=(-e 'notice: HEAD points to an unborn branch') 189s + pats+=(-e 'notice: No default references') 189s + set +e 189s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 189s + rc=1 189s + set -e 189s + case $rc in 189s + for d in $tmp/*/.git $tmp/git/*.git 189s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 189s + t-git-fsck 189s ++ git rev-parse --git-dir 189s + local fsckerrs=./dgit-test-fsck.errs 189s + set +e 189s + LC_MESSAGES=C 189s + git fsck --no-dangling --strict 189s + tee ./dgit-test-fsck.errs 189s notice: HEAD points to an unborn branch (master) 189s + ps='0 0' 189s + set -e 189s + local pats 189s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 189s + test '0 0' = '0 0' 189s + pats+=(-e 'notice: HEAD points to an unborn branch') 189s + pats+=(-e 'notice: No default references') 189s + set +e 189s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 189s + rc=1 189s + set -e 189s + case $rc in 189s + t-save-artifacts 189s + artifacts=/tmp/autopkgtest.XK8uun/baredebian-push-artifacts 189s + '[' x/tmp/autopkgtest.XK8uun/baredebian-push-artifacts = x ']' 189s + '[' xtmp = x ']' 189s + GZIP=-1v 189s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/baredebian-push-artifacts/baredebian-push.tar.gz '--exclude=*.tar' . 189s gzip: warning: GZIP environment variable is deprecated; use an alias or script 189s 80.0% 189s + echo ok. 189s ok. 189s + rc=0 189s + set +x 189s + set +e 189s + pwd 189s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 189s + '[' x '!=' x ']' 189s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 189s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 189s + set -e 189s + test 0 = 0 190s autopkgtest [22:50:20]: test baredebian-push: -----------------------] 190s autopkgtest [22:50:20]: test baredebian-push: - - - - - - - - - - results - - - - - - - - - - 190s baredebian-push PASS 191s autopkgtest [22:50:21]: test baredebian-tarball: preparing testbed 191s Reading package lists... 191s Building dependency tree... 191s Reading state information... 191s Starting pkgProblemResolver with broken count: 0 191s Starting 2 pkgProblemResolver with broken count: 0 191s Done 191s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 192s autopkgtest [22:50:22]: test baredebian-tarball: [----------------------- 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.XK8uun/build.980/src 193s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 193s ++ testname=baredebian-tarball 193s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 193s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 193s ++ bpd=.. 193s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 193s ++ '[' x '!=' x ']' 193s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s +++ pwd 193s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ t-set-using-tmp 193s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 193s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/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.XK8uun/autopkgtest_tmp/.save-env 193s ++ env -0 193s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/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.XK8uun/autopkgtest_tmp/must-clean 193s ++ mkdir -p /tmp/autopkgtest.XK8uun/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.XK8uun/autopkgtest_tmp 193s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 193s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 193s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 193s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 193s + cd /tmp/autopkgtest.XK8uun/build.980/src 193s + shift 193s + setupname=gnupg 193s + shift 193s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 193s + shift 193s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 193s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/baredebian-tarball-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/baredebian-tarball-stderr --stdout=/tmp/autopkgtest.XK8uun/baredebian-tarball-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/baredebian-tarball -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/baredebian-tarball' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/baredebian-tarball-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/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.XK8uun/build.980/src 193s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 193s ++ testname=gnupg 193s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 193s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 193s ++ bpd=.. 193s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 193s ++ '[' x '!=' x ']' 193s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s +++ pwd 193s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ t-set-using-tmp 193s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 193s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/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.XK8uun/autopkgtest_tmp/.save-env 193s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/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.XK8uun/autopkgtest_tmp/must-clean 193s ++ mkdir -p /tmp/autopkgtest.XK8uun/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.XK8uun/autopkgtest_tmp/gnupg 193s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 193s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 193s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 193s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 193s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 193s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/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.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 193s + mkdir -p /tmp/autopkgtest.XK8uun/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.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 193s + cat 193s + jsondelim=' },' 193s + cat 193s + t-git-none 193s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 193s + set -e 193s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 193s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 193s + t-gdr-gbp-import-core-with-queue 193s + t-gdr-gbp-import-core 193s + p=example 193s + t-worktree 1.1 193s + rm -rf example 193s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1 193s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 193s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 193s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 193s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 193s + cd example 193s + : 'fake up some kind of upstream' 193s + git checkout -b upstream quilt-tip 193s Switched to a new branch 'upstream' 193s + rm -rf debian 193s + mkdir debian 193s + echo junk 193s + git add debian 193s + git commit -m 'an upstream retcon (tests/setup/baredebian)' 193s [upstream aa9b151] an upstream retcon (tests/setup/baredebian) 193s 6 files changed, 1 insertion(+), 36 deletions(-) 193s delete mode 100644 debian/changelog 193s delete mode 100644 debian/compat 193s delete mode 100644 debian/control 193s delete mode 100644 debian/example.install 193s mode change 100755 => 100644 debian/rules 193s delete mode 100644 debian/source/format 193s + git tag v1.0 193s + : 'fake up that our quilt-tip was descended from upstream' 193s + git checkout quilt-tip 193s Switched to branch 'quilt-tip' 193s + git merge --no-edit -s ours upstream 193s Merge made by the 'ours' strategy. 193s + : 'fake up that our quilt-tip had the patch queue in it' 193s + git checkout patch-queue/quilt-tip 193s Switched to branch 'patch-queue/quilt-tip' 193s + gbp pq export 193s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 193s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 193s + git add debian/patches 193s + git commit -m 'patch queue update (tests/setup/baredebian)' 193s [quilt-tip 474da4c] patch queue update (tests/setup/baredebian) 193s 4 files changed, 50 insertions(+) 193s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 193s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 193s create mode 100644 debian/patches/series 193s create mode 100644 debian/patches/subdir/addnewups 193s + : 'make branch names more conventional' 193s + git branch -D master 193s Deleted branch master (was 17d67db). 193s + git branch -m quilt-tip master 193s + git-deborig 193s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 193s + git branch -D patch-queue/quilt-tip 193s Deleted branch patch-queue/quilt-tip (was d843a68). 193s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 193s + git branch -D gitish-only 193s Deleted branch gitish-only (was 2b2ddc8). 193s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 193s + git branch -D quilt-tip-1.1 193s Deleted branch quilt-tip-1.1 (was 7fc34be). 193s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 193s + git branch -D quilt-tip-2 193s Deleted branch quilt-tip-2 (was 99fcab4). 193s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 193s + git branch -D indep-arch 193s Deleted branch indep-arch (was e215729). 193s + git rm -rf . 193s rm '.gitignore' 193s rm 'debian/changelog' 193s rm 'debian/compat' 193s rm 'debian/control' 193s rm 'debian/example.install' 193s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 193s rm 'debian/patches/0002-Edit-the-.c-file.patch' 193s rm 'debian/patches/series' 193s rm 'debian/patches/subdir/addnewups' 193s rm 'debian/rules' 193s rm 'debian/source/format' 193s rm 'docs/README' 193s rm 'example' 193s rm 'src.c' 193s + git checkout HEAD -- debian 193s ++ git write-tree 193s + t=1b876c7f2ff3a5f3e269aa710210897c32caee00 193s ++ git commit-tree -m 'Convert to bare debian' 1b876c7f2ff3a5f3e269aa710210897c32caee00 193s + t=5c410cc573946394fbd85950449595317108dca9 193s + git reset --hard 5c410cc573946394fbd85950449595317108dca9 193s HEAD is now at 5c410cc Convert to bare debian 193s ++ echo 'example*' 193s + t-setup-done '' 'example* git mirror aq' ' 193s t-select-package example 193s t-git-next-date 193s ' 193s + local savevars= 193s + local 'savedirs=example* git mirror aq' 193s + local 'importeval= 193s t-select-package example 193s t-git-next-date 193s ' 193s + local import=IMPORT.baredebian 193s + exec 193s + local vn 193s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 193s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 193s print STDERR "saving-exporting $vn\n"; 193s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 193s or die $!; 193s } 193s ' 193s saving-exporting DGIT_TEST_REAL_GPG_AGENT 193s saving-exporting DGIT_TEST_REAL_DEBCHANGE 193s saving-exporting DGIT_TEST_REAL_GPG 193s + set -e 193s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 193s + tar cf IMPORT.baredebian.tar example example_1.0.orig.tar.xz git mirror aq 193s + printf '\n%s\n' ' 193s t-select-package example 193s t-git-next-date 193s ' 193s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian 193s + rc=0 193s + set +x 193s + set +e 193s + pwd 193s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 193s + '[' x '!=' x ']' 193s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 193s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 193s + set -e 193s + test 0 = 0 193s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 193s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 193s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.baredebian 193s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 193s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 193s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 193s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 193s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 193s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 193s ++ t-select-package example 193s ++ p=example 193s ++ dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 193s ++ t-git-next-date 193s ++ GIT_COMMITTER_DATE='1530000001 +0100' 193s ++ GIT_AUTHOR_DATE='1530000001 +0100' 193s + t-tstunt-parsechangelog 193s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 193s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 193s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 193s + local var=PATH 193s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 193s + eval ' 193s case "$PATH" in 193s "$tstunt:"*) ;; 193s *":$tstunt:"*) ;; 193s "") PATH="$tstunt" ;; 193s *) PATH="$tstunt:$PATH" ;; 193s esac 193s export PATH 193s ' 193s ++ case "$PATH" in 193s ++ export PATH 193s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 193s + local var=PERLLIB 193s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 193s + eval ' 193s case "$PERLLIB" in 193s "$tstunt:"*) ;; 193s *":$tstunt:"*) ;; 193s "") PERLLIB="$tstunt" ;; 193s *) PERLLIB="$tstunt:$PERLLIB" ;; 193s esac 193s export PERLLIB 193s ' 193s ++ case "$PERLLIB" in 193s ++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 193s ++ export PERLLIB 193s + local f 193s + for f in "$@" 193s + t-tstunt--save-real dpkg-parsechangelog 193s + local f=dpkg-parsechangelog 193s + case "$f" in 193s + local rc 193s + local real 193s + set +e 193s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 193s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 193s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 193s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 193s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 193s ++ type -p dpkg-parsechangelog 193s + real=/usr/bin/dpkg-parsechangelog 193s + rc=0 193s + set -e 193s + case $rc in 193s + local varname=dpkg_parsechangelog 193s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 193s + eval ' 193s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 193s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 193s ' 193s ++ : /usr/bin/dpkg-parsechangelog 193s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 193s + f=./dpkg-parsechangelog 193s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 193s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 193s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 193s + for f in "$@" 193s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 193s + local f=Dpkg/Changelog/Parse.pm 193s + case "$f" in 193s + return 193s + f=./Dpkg/Changelog/Parse.pm 193s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 193s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 193s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 193s + cd example 193s + baredebian-test-vars 193s + quiltmode=baredebian 193s + v=1.0-1 193s + suite=sid 193s + uv=1.0 193s + uvtag=v1.0 193s + origbase=example_1.0.orig 193s + xorigcomps= 193s + baredebian-tarball-mode 193s + git tag -d v1.0 193s Deleted tag 'v1.0' (was aa9b151) 193s + uvtag= 193s + quiltmode=baredebian+tarball 193s + t-expect-fail 'Could not determine appropriate upstream commitish' t-dgit -wn --dgit-view-save=split.g --baredebian quilt-fixup 193s + local 'mpat=Could not determine appropriate upstream commitish' 193s + shift 193s + set +o pipefail 193s + LC_MESSAGES=C 193s + LANGUAGE=C 193s + t-dgit -wn --dgit-view-save=split.g --baredebian quilt-fixup 193s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 193s + local dgit=dgit 193s + pwd 193s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 193s + : ' 193s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 193s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 194s | git rev-parse --show-toplevel 194s => `/tmp/autopkgtest.XK8uun/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 3.0 (quilt), quilt mode baredebian 194s Format `3.0 (quilt)', need to check/update patch stack 194s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 194s => `' 194s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 194s => `' 194s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 194s => `' 194s 194s dgit: error: Could not determine appropriate upstream commitish. 194s dgit: (Tried these tags: 1.0 v1.0 upstream/1.0) 194s dgit: Check version, and specify upstream commitish explicitly. 194s + local 'ps=255 0' 194s + set -o pipefail 194s + case $ps in 194s + t-grep-mpat 'Could not determine appropriate upstream commitish' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 194s + local 'mpat=Could not determine appropriate upstream commitish' 194s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 194s + local grepper=fgrep 194s + case "$mpat" in 194s + fgrep -e 'Could not determine appropriate upstream commitish' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 194s dgit: error: Could not determine appropriate upstream commitish. 194s + baredebian-test-minimum 194s + t-expect-fail 'contradicts clean mode git-ff' t-dgit -wgf --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 194s + local 'mpat=contradicts clean mode git-ff' 194s + shift 194s + set +o pipefail 194s + LC_MESSAGES=C 194s + LANGUAGE=C 194s + t-dgit -wgf --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 194s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 194s + local dgit=dgit 194s + pwd 194s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 194s + : ' 194s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 194s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 194s | git rev-parse --show-toplevel 194s => `/tmp/autopkgtest.XK8uun/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 3.0 (quilt), quilt mode baredebian+tarball 194s Format `3.0 (quilt)', need to check/update patch stack 194s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 194s => `' 194s + git diff --quiet HEAD 194s 194s dgit: error: quilt mode baredebian+tarball (generally needs untracked upstream files) 194s dgit: contradicts clean mode git-ff (which would delete them) 194s + local 'ps=255 0' 194s + set -o pipefail 194s + case $ps in 194s + t-grep-mpat 'contradicts clean mode git-ff' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 194s + local 'mpat=contradicts clean mode git-ff' 194s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 194s + local grepper=fgrep 194s + case "$mpat" in 194s + fgrep -e 'contradicts clean mode git-ff' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 194s dgit: contradicts clean mode git-ff (which would delete them) 194s + t-dgit -wn --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 194s + local dgit=dgit 194s + pwd 194s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 194s + : ' 194s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 194s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 194s | git rev-parse --show-toplevel 194s => `/tmp/autopkgtest.XK8uun/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 3.0 (quilt), quilt mode baredebian+tarball 194s Format `3.0 (quilt)', need to check/update patch stack 194s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 194s => `' 194s + git diff --quiet HEAD 194s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 194s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 194s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 194s | git rev-parse 'HEAD~0' 194s => `5c410cc573946394fbd85950449595317108dca9' 194s | git symbolic-ref -q HEAD 194s => `refs/heads/master' 194s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 194s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 194s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 194s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 194s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 194s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball 5c410cc573946394fbd85950449595317108dca9 - e0ca739d1d62921a7d3879e7488e9a8b22d87a7acf783634d320b87122416af2 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 194s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 194s >(no reflog) 194s splitbrain cache miss 194s CD work 194s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 194s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 194s + git checkout -q -b dgit-view 194s examining quilt state (multiple patches, baredebian+tarball mode) 194s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 194s CD fake 194s | find -name .git -prune -print0 194s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 194s + git checkout -f 5c410cc573946394fbd85950449595317108dca9 -- debian 194s + git add -Af . 194s | git write-tree 194s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 194s fake orig tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 194s CD .. 194s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 194s CD ../fake 194s + git add -Af . 194s | git write-tree 194s => `763a72c3d91f517f4a54c0759ccf4876f1fbb304' 194s fake o+d/p tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 194s CD ../work 194s | git ls-tree --name-only -z 5c410cc573946394fbd85950449595317108dca9 194s => `debian\x00' 194s CD .. 194s import considering example_1.0.orig.tar.xz Y .xz orig 194s + chmod -R '+rwX' _unpack-tar 194s CD _unpack-tar 194s | find -name .git -prune -print0 194s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 195s + git add -Af . 195s | git write-tree 195s => `122a22a7a62ec58750ccbb592db476469e4a92df' 195s | git ls-tree -z 122a22a7a62ec58750ccbb592db476469e4a92df 195s => `040000 tree caf096e042e2ca6a83cf87bd23de17e65f6513e7\x09example-1.0\x00' 195s one subtree caf096e042e2ca6a83cf87bd23de17e65f6513e7 195s CD .. 195s CD work 195s import clog search... 195s | dpkg-parsechangelog --format rfc822 --all 195s import clog 1.0-1 package changelog, entry no.1... 195s import clog 1.0-1 vs 1.0... 195s import clog 1.0-1 becomes r1 195s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 195s => `1431548802 +0000' 195s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 195s => `1431548802 +0000' 195s import tartrees authline Ian Jackson 1431548802 +0000 195s import tartrees r1authline Ian Jackson 1431548802 +0000 195s import tartree example_1.0.orig.tar.xz caf096e042e2ca6a83cf87bd23de17e65f6513e7 195s | git hash-object -w -t commit --stdin 195s => b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 195s | git diff-tree -z --no-renames -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 195s => `: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' 195s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 => 0 195s | git diff-tree -z --no-renames --name-only -r b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 763a72c3d91f517f4a54c0759ccf4876f1fbb304 195s => `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' 195s quiltify_trees_differ b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 195s | git diff-tree -z --no-renames --name-only -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 195s => `lib.c\x00new-upstream-file\x00src.c\x00' 195s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 195s differences @dl == ## ## == == ==. 195s dgit: base trees orig=bf7987f1ad573f033a09 o+d/p=763a72c3d91f517f4a54 195s dgit: quilt differences: src: == orig ## gitignores: == orig == 195s dgit: quilt differences: tarball ## o+d/p tarball == o+d/p 195s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 195s => `1431548802 +0000' 195s + git read-tree b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 195s + git rm --quiet -rf --cached --ignore-unmatch debian 195s + git read-tree --prefix=debian/ 5c410cc573946394fbd85950449595317108dca9:debian 195s | git write-tree 195s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 195s | git commit-tree bf7987f1ad573f033a09951c00ab7bdaa7c98445 -p 5c410cc573946394fbd85950449595317108dca9 -p b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 -m 'Combine debian/ with upstream source for 1.0 195s ' -m '' -m '[dgit (9.15) baredebian-merge 1.0-1 *orig*] 195s ' 195s => `36798db17489df0fa2359ccd51ea80cbdf34c7ab' 195s + git reset -q --hard 36798db17489df0fa2359ccd51ea80cbdf34c7ab 195s dgit view: creating patches-applied version using gbp pq 195s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 195s + git update-ref refs/heads/dgit-view HEAD 195s + git checkout -q dgit-view 195s | git rev-parse 'HEAD~0' 195s => `660071e3c960767550c93733d62f96f36ec75cb6' 195s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 195s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 195s => `' 195s + git update-ref -m 'dgit 9.15 1.0 baredebian+tarball 5c410cc573946394fbd85950449595317108dca9 - e0ca739d1d62921a7d3879e7488e9a8b22d87a7acf783634d320b87122416af2 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 660071e3c960767550c93733d62f96f36ec75cb6 195s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 195s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=5c410cc573946394fbd85950449595317108dca9' refs/heads/split.f1 660071e3c960767550c93733d62f96f36ec75cb6 195s dgit view: created (and left in refs/heads/split.f1) 195s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 195s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 195s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 195s ' 195s + baredebian-test-core 195s + baredebian-test-core-prepush 195s + tar --strip-components=1 -axf ../example_1.0.orig.tar.xz 195s + cd debian 195s + git clean -xdff 195s + git checkout HEAD -- . 195s + cd .. 195s + export QUILT_PATCHES=debian/patches 195s + QUILT_PATCHES=debian/patches 195s + quilt push -a 195s Applying patch debian/patches/0001-Add-a-new-upstream-file.patch 195s patching file new-upstream-file 195s 195s Applying patch debian/patches/0002-Edit-the-.c-file.patch 195s patching file src.c 195s 195s Applying patch debian/patches/subdir/addnewups 195s patching file lib.c 195s 195s Now at patch debian/patches/subdir/addnewups 195s + git add -Af . 195s + git reset .pc 195s + git diff --cached --exit-code split.f1 -- :/ ':!/debian' 195s + git diff --exit-code HEAD..split.f1 -- :/debian 195s + git reset 195s + quilt new made-with-quilt 195s Patch debian/patches/made-with-quilt is now on top 195s + quilt add src.c 195s File src.c added to patch debian/patches/made-with-quilt 195s + echo //omg 195s + quilt refresh 195s Refreshed patch debian/patches/made-with-quilt 195s + git add debian/patches/. 195s + t-commit 'extra patch made with quilt' 1.0-2 195s + local 'msg=extra patch made with quilt' 195s + v=1.0-2 195s + t-debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 195s + DEBEMAIL=dgit-tests@example.org 195s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 195s + 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 195s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 195s libdistro-info-perl is not installed, Debian release names are not known. 195s libdistro-info-perl is not installed, Ubuntu release names are not known. 195s + git add debian/changelog 195s + debcommit 195s git commit -m 'extra patch made with quilt' 195s [master d0c1094] extra patch made with quilt 195s 3 files changed, 14 insertions(+) 195s create mode 100644 debian/patches/made-with-quilt 195s + revision=1 195s + t-refs-same-start 195s + unset t_ref_val 195s + t_ref_names=() 195s + t-ref-head 195s + local val 195s ++ git rev-parse HEAD 195s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 195s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 195s + local name=HEAD 195s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 195s + case "${t_ref_val-unset}" in 195s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 195s + t_ref_names+=("$name") 195s + t-dgit -wn --quilt=baredebian+tarball --dgit-view-save=split.b quilt-fixup 195s + local dgit=dgit 195s + pwd 195s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 195s + : ' 195s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 195s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 195s | git rev-parse --show-toplevel 195s => `/tmp/autopkgtest.XK8uun/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 3.0 (quilt), quilt mode baredebian+tarball 195s Format `3.0 (quilt)', need to check/update patch stack 195s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 195s => `' 195s + git diff --quiet HEAD 195s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 195s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 195s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 195s | git rev-parse 'HEAD~0' 195s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 195s | git symbolic-ref -q HEAD 195s => `refs/heads/master' 195s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 195s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 195s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 195s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 195s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 195s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - acdbcd50b40a825a5422a64a8ecde5d613247f189043918fa7ed1546a127b0e9 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 195s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 195s splitbrain cache miss 195s CD work 195s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 195s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 195s + git checkout -q -b dgit-view 195s examining quilt state (multiple patches, baredebian+tarball mode) 195s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 196s CD fake 196s | find -name .git -prune -print0 196s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 196s + git checkout -f d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -- debian 196s + git add -Af . 196s | git write-tree 196s => `13afe261a5f954761b36d126fa74b978765116a8' 196s fake orig tree object 13afe261a5f954761b36d126fa74b978765116a8 196s CD .. 196s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 196s CD ../fake 196s + git add -Af . 196s | git write-tree 196s => `09583ba28b17d629329903d2cfda3a22eceef550' 196s fake o+d/p tree object 13afe261a5f954761b36d126fa74b978765116a8 196s CD ../work 196s | git ls-tree --name-only -z d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 196s => `debian\x00' 196s CD .. 196s import considering example_1.0.orig.tar.xz Y .xz orig 196s + chmod -R '+rwX' _unpack-tar 196s CD _unpack-tar 196s | find -name .git -prune -print0 196s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 196s + git add -Af . 196s | git write-tree 196s => `122a22a7a62ec58750ccbb592db476469e4a92df' 196s | git ls-tree -z 122a22a7a62ec58750ccbb592db476469e4a92df 196s => `040000 tree caf096e042e2ca6a83cf87bd23de17e65f6513e7\x09example-1.0\x00' 196s one subtree caf096e042e2ca6a83cf87bd23de17e65f6513e7 196s CD .. 196s CD work 196s import clog search... 196s | dpkg-parsechangelog --format rfc822 --all 196s import clog 1.0-2 package changelog, entry no.1... 196s import clog 1.0-2 vs 1.0... 196s import clog 1.0-2 becomes r1 196s import clog 1.0-1 package changelog, entry no.2... 196s import clog 1.0-1 vs 1.0... 196s import clog 1.0-1 becomes r1 196s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 196s => `1530000001 +0000' 196s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 196s => `1431548802 +0000' 196s import tartrees authline dgit test git user 1530000001 +0000 196s import tartrees r1authline Ian Jackson 1431548802 +0000 196s import tartree example_1.0.orig.tar.xz caf096e042e2ca6a83cf87bd23de17e65f6513e7 196s | git hash-object -w -t commit --stdin 196s => b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 196s | git diff-tree -z --no-renames -r 13afe261a5f954761b36d126fa74b978765116a8 b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 196s => `: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' 196s quiltify_trees_differ 13afe261a5f954761b36d126fa74b978765116a8 b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 => 0 196s | git diff-tree -z --no-renames --name-only -r b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 09583ba28b17d629329903d2cfda3a22eceef550 196s => `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' 196s quiltify_trees_differ b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 09583ba28b17d629329903d2cfda3a22eceef550 => 1 196s | git diff-tree -z --no-renames --name-only -r 13afe261a5f954761b36d126fa74b978765116a8 09583ba28b17d629329903d2cfda3a22eceef550 196s => `lib.c\x00new-upstream-file\x00src.c\x00' 196s quiltify_trees_differ 13afe261a5f954761b36d126fa74b978765116a8 09583ba28b17d629329903d2cfda3a22eceef550 => 1 196s differences @dl == ## ## == == ==. 196s dgit: base trees orig=13afe261a5f954761b36 o+d/p=09583ba28b17d6293299 196s dgit: quilt differences: src: == orig ## gitignores: == orig == 196s dgit: quilt differences: tarball ## o+d/p tarball == o+d/p 196s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 196s => `1530000001 +0000' 196s + git read-tree b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 196s + git rm --quiet -rf --cached --ignore-unmatch debian 196s + git read-tree --prefix=debian/ d0c109478cdb46a6564ea8f5ee5c36484a39f9c7:debian 196s | git write-tree 196s => `13afe261a5f954761b36d126fa74b978765116a8' 196s | git commit-tree 13afe261a5f954761b36d126fa74b978765116a8 -p d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -p b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 -m 'Combine debian/ with upstream source for 1.0 196s ' -m '' -m '[dgit (9.15) baredebian-merge 1.0-2 *orig*] 196s ' 196s => `4cbe51cf84ff3488a47d021c2a8f929c1f4abb1e' 196s + git reset -q --hard 4cbe51cf84ff3488a47d021c2a8f929c1f4abb1e 196s dgit view: creating patches-applied version using gbp pq 196s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 196s gbp:warning: Patch 'made-with-quilt' has no authorship information, using 'Ian Jackson ' 196s + git update-ref refs/heads/dgit-view HEAD 196s + git checkout -q dgit-view 196s | git rev-parse 'HEAD~0' 196s => `92b92aa41ba7c3aeb7a810e546915034852783c4' 196s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 196s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 196s => `660071e3c960767550c93733d62f96f36ec75cb6' 196s + git update-ref -m 'dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - acdbcd50b40a825a5422a64a8ecde5d613247f189043918fa7ed1546a127b0e9 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 92b92aa41ba7c3aeb7a810e546915034852783c4 196s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 196s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.b 92b92aa41ba7c3aeb7a810e546915034852783c4 196s dgit view: created (and left in refs/heads/split.b) 196s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 196s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 196s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 196s ' 196s + t-ref-head 196s + local val 196s ++ git rev-parse HEAD 196s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 196s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 196s + local name=HEAD 196s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 196s + case "${t_ref_val-unset}" in 196s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 196s + t_ref_names+=("$name") 196s + baredebian-test-core-push 196s + dpkg-buildpackage -uc -us --build=source 196s dpkg-buildpackage: info: source package example 196s dpkg-buildpackage: info: source version 1.0-2 196s dpkg-buildpackage: info: source distribution unstable 196s dpkg-buildpackage: info: source changed by dgit test git user 196s dpkg-source --before-build . 196s fakeroot debian/rules clean 196s EXAMPLE RULES TARGET clean 196s dh_clean 196s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 196s dpkg-source -b . 197s dpkg-source: info: using source format '3.0 (quilt)' 197s dpkg-source: info: building example using existing ./example_1.0.orig.tar.xz 197s dpkg-source: info: using patch list from debian/patches/series 197s dpkg-source: info: building example in example_1.0-2.debian.tar.xz 197s dpkg-source: info: building example in example_1.0-2.dsc 197s dpkg-genbuildinfo --build=source -O../example_1.0-2_source.buildinfo 197s dpkg-genchanges --build=source -O../example_1.0-2_source.changes 197s dpkg-genchanges: info: not including original source code in upload 197s dpkg-source --after-build . 197s dpkg-buildpackage: info: source-only, diff-only upload (original source NOT included) 197s + t-dgit -wn --quilt=baredebian+tarball --dgit-view-save=split.p --new push 197s + local dgit=dgit 197s + pwd 197s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 197s + : ' 197s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 197s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 197s | git rev-parse --show-toplevel 197s => `/tmp/autopkgtest.XK8uun/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 3.0 (quilt), quilt mode baredebian+tarball 197s Format `3.0 (quilt)', need to check/update patch stack 197s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 197s => `' 197s + git diff --quiet HEAD 197s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 197s canonical suite name for unstable is sid 197s actually entering push 197s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 197s => `0' 197s + git config remote.dgit.skipdefaultupdate true 197s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 197s get_archive_dsc: nothing in archive, returning undef 197s no version available from the archive 197s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 197s => `' 197s previous reference hash= 197s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 197s => `' 197s fetch_from_archive: lastfetch= 197s nothing found! 197s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 197s + git check-ref-format archive/test-dummy/1.0-2 197s | git symbolic-ref -q HEAD 197s => `refs/heads/master' 197s | git rev-parse 'HEAD~0' 197s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 197s ffq_prev_branchinfo branch current refs/heads/master 197s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 197s => `' 197s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 197s => `' 197s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 197s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 197s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 197s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 197s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 197s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - acdbcd50b40a825a5422a64a8ecde5d613247f189043918fa7ed1546a127b0e9 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 197s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 197s CD work 197s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 197s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 197s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save cache-hit HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.p 92b92aa41ba7c3aeb7a810e546915034852783c4 197s dgit view: found cached (and left in refs/heads/split.p) 197s + git checkout -q -b dgit-view 92b92aa41ba7c3aeb7a810e546915034852783c4 197s splitbrain_pseudomerge... 197s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 197s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 197s => `' 197s + git diff --quiet HEAD 197s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.0-2' 197s => `' 197s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 197s checking that example_1.0-2.dsc corresponds to HEAD 197s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0-2.dsc 197s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0-2.dsc) 197s dpkg-source: info: extracting example in example-1.0 197s dpkg-source: info: unpacking example_1.0.orig.tar.xz 197s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 197s dpkg-source: info: using patch list from debian/patches/series 197s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 197s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 197s dpkg-source: info: applying subdir/addnewups 197s dpkg-source: info: applying made-with-quilt 197s CD example-1.0 197s | find -name .git -prune -print0 197s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 197s + git add -Af . 197s | git write-tree 197s => `09583ba28b17d629329903d2cfda3a22eceef550' 197s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 197s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 197s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 197s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 197s + git diff --quiet 09583ba28b17d629329903d2cfda3a22eceef550 92b92aa41ba7c3aeb7a810e546915034852783c4 197s files_compare_inputs example_1.0-2.dsc 197s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 197s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0.orig.tar.xz 197s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0-2.debian.tar.xz 197s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 197s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0.orig.tar.xz 197s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0-2.debian.tar.xz 197s files_compare_inputs example_1.0-2.dsc Files 197s files_compare_inputs example_1.0-2.dsc Files example_1.0.orig.tar.xz 197s files_compare_inputs example_1.0-2.dsc Files example_1.0-2.debian.tar.xz 197s files_compare_inputs example_1.0-2_source.changes 197s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 197s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.dsc 197s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.debian.tar.xz 197s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2_source.buildinfo 197s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 197s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.dsc 197s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.debian.tar.xz 197s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2_source.buildinfo 197s files_compare_inputs example_1.0-2_source.changes Files 197s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.dsc 197s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.debian.tar.xz 197s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2_source.buildinfo 197s checking origs needed (1.0)... 197s checking origs needed placement 'devel extra'... 197s origs example_1.0.orig.tar.xz | 9ff3b1cef499c0c890e9366b9da974c2 460 example_1.0.orig.tar.xz 197s origs example_1.0.orig.tar.xz is_orig 197s -| sh -ec 'cd "$1"; shift 197s 197s find -name "$1" -print0 | 197s xargs -0r sha256sum 197s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_1.0.orig.tar.xz 197s origs example_1.0.orig.tar.xz $#$have=-1 197s origs example_1.0.orig.tar.xz f.same=0 #f._differ=-1 197s origs example_1.0-2.debian.tar.xz | 33d973e7522208030e046b0e5a15006d 1336 example_1.0-2.debian.tar.xz 197s edited .changes for archive .orig contents: added example_1.0.orig.tar.xz 197s push_tagwants: $VAR1 = [ 197s '1.0-2', 197s '92b92aa41ba7c3aeb7a810e546915034852783c4', 197s 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 197s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 197s ]; 197s $VAR2 = [ 197s { 197s 'TagFn' => sub { "DUMMY" }, 197s 'View' => 'dgit', 197s 'Tag' => 'archive/test-dummy/1.0-2', 197s 'Tfn' => sub { "DUMMY" }, 197s 'Objid' => '92b92aa41ba7c3aeb7a810e546915034852783c4', 197s 'TfSuffix' => '' 197s }, 197s { 197s 'Objid' => 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 197s 'Tag' => 'test-dummy/1.0-2', 197s 'Tfn' => sub { "DUMMY" }, 197s 'TfSuffix' => '-maintview', 197s 'TagFn' => sub { "DUMMY" }, 197s 'View' => 'maint' 197s } 197s ]; 197s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 197s => `1530000001 +0000' 197s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 197s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 198s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 198s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 198s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 198s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 198s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 198s => `8d2f8d647d928d66ed605803032902a6d5a4ac1a' 198s + git verify-tag 8d2f8d647d928d66ed605803032902a6d5a4ac1a 198s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 198s gpg: Signature made Mon Mar 31 22:50:27 2025 UTC 198s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 198s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 198s gpg: WARNING: This key is not certified with a trusted signature! 198s gpg: There is no indication that the signature belongs to the owner. 198s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 198s + git update-ref refs/tags/archive/test-dummy/1.0-2 8d2f8d647d928d66ed605803032902a6d5a4ac1a 198s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 198s => `f014a261130d2de89ab80a674980cd496afb81a7' 198s + git verify-tag f014a261130d2de89ab80a674980cd496afb81a7 198s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 198s gpg: Signature made Mon Mar 31 22:50:28 2025 UTC 198s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 198s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 198s gpg: WARNING: This key is not certified with a trusted signature! 198s gpg: There is no indication that the signature belongs to the owner. 198s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 198s + git update-ref refs/tags/test-dummy/1.0-2 f014a261130d2de89ab80a674980cd496afb81a7 198s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 198s => `0' 198s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 198s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 92b92aa41ba7c3aeb7a810e546915034852783c4:refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 refs/tags/test-dummy/1.0-2 198s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 198s * [new reference] 92b92aa41ba7c3aeb7a810e546915034852783c4 -> refs/dgit/sid 198s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 198s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 198s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 92b92aa41ba7c3aeb7a810e546915034852783c4 198s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.0-2_source.changes 198s signfile dsc ../example_1.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 198s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 198s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 198s 198s fixup_buildinfo ../example_1.0-2.dsc ../example_1.0-2_source.buildinfo 198s signfile buildinfo ../example_1.0-2_source.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 198s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 198s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 198s 198s fixup_changes dsc ../example_1.0-2.dsc ../example_1.0-2_source.changes 198s fixup_changes buildinfo ../example_1.0-2_source.buildinfo ../example_1.0-2_source.changes 198s signfile changes ../example_1.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 198s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 198s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 198s 198s Successfully signed dsc, buildinfo, changes files 198s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_1.0-2_source.changes 199s gpg: ../example_1.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 199s gpg: ../example_1.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 199s D: Setting host argument. 199s Checking signature on .changes 199s Checking signature on .dsc 199s Uploading to test-dummy (via local to localhost): 199s Successfully uploaded packages. 199s dgit ok: pushed and uploaded 1.0-2 199s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 199s del_lrfetchrefs... 199s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 199s ' 199s + baredebian-test-core-postpush 199s + git merge-base --is-ancestor HEAD split.p 199s + '[' '' ']' 199s + git clean -xdff 199s Removing .gitignore 199s Removing .pc/ 199s Removing debian/files 199s Removing docs/ 199s Removing example 199s Removing lib.c 199s Removing new-upstream-file 199s Removing src.c 199s + t-splitbrain-pushed-good-start 199s + dep14tag=refs/tags/test-dummy/1.0-2 199s ++ t-v-tag 199s ++ echo refs/tags/archive/test-dummy/1.0-2 199s + dgittag=refs/tags/archive/test-dummy/1.0-2 199s + t-output '' git status --porcelain 199s + printf %s '' 199s + shift 199s + git status --porcelain 199s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 199s + t-ref-head 199s + local val 199s ++ git rev-parse HEAD 199s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + local name=HEAD 199s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + case "${t_ref_val-unset}" in 199s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + t_ref_names+=("$name") 199s + t-refs-same refs/tags/test-dummy/1.0-2 199s + local g 199s + for g in $* 199s + t-ref-same refs/tags/test-dummy/1.0-2 199s + local name=refs/tags/test-dummy/1.0-2 199s + local val 199s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 199s ++ local ref=refs/tags/test-dummy/1.0-2 199s ++ case "$ref" in 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ' 199s ++ git show-ref -d refs/tags/test-dummy/1.0-2 199s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + local name=refs/tags/test-dummy/1.0-2 199s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + case "${t_ref_val-unset}" in 199s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + t_ref_names+=("$name") 199s + set -e 199s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 199s + t-refs-same refs/tags/test-dummy/1.0-2 199s + local g 199s + for g in $* 199s + t-ref-same refs/tags/test-dummy/1.0-2 199s + local name=refs/tags/test-dummy/1.0-2 199s + local val 199s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 199s ++ local ref=refs/tags/test-dummy/1.0-2 199s ++ case "$ref" in 199s ++ git show-ref -d refs/tags/test-dummy/1.0-2 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ' 199s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + local name=refs/tags/test-dummy/1.0-2 199s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + case "${t_ref_val-unset}" in 199s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 199s + t_ref_names+=("$name") 199s + git merge-base --is-ancestor refs/tags/test-dummy/1.0-2 refs/tags/archive/test-dummy/1.0-2 199s + t-refs-same-start 199s + unset t_ref_val 199s + t_ref_names=() 199s + t-ref-same refs/heads/split.p 199s + local name=refs/heads/split.p 199s + local val 199s ++ t-git-get-ref refs/heads/split.p 199s ++ local ref=refs/heads/split.p 199s ++ case "$ref" in 199s ++ git show-ref -d refs/heads/split.p 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/heads/split.p\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ' 199s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t-ref-same-val refs/heads/split.p 92b92aa41ba7c3aeb7a810e546915034852783c4 199s + local name=refs/heads/split.p 199s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + case "${t_ref_val-unset}" in 199s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t_ref_names+=("$name") 199s ++ t-git-get-ref refs/heads/split.b 199s ++ local ref=refs/heads/split.b 199s ++ case "$ref" in 199s ++ git show-ref -d refs/heads/split.b 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/heads/split.b\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ' 199s + local split_b=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + case "$split_b" in 199s + t-pushed-good-core 199s + t-ref-dsc-dgit 199s + t-incoming-dsc 199s + local dsc=example_1.0-2.dsc 199s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 199s + local val 199s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit 199s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 199s ++ local field=Dgit 199s ++ perl -e ' 199s use Dpkg::Control::Hash; 199s my $h = new Dpkg::Control::Hash allow_pgp=>1; 199s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc"); 199s my $val = $h->{"Dgit"},"\n"; 199s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit" unless defined $val; 199s print $val,"\n"; 199s ' 199s + val='92b92aa41ba7c3aeb7a810e546915034852783c4 test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 199s ++ perl -e ' 199s $_=shift @ARGV; 199s die "Dgit $_ ?" unless m/^\w+\b/; 199s print $&,"\n" or die $!; 199s ' '92b92aa41ba7c3aeb7a810e546915034852783c4 test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 199s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 92b92aa41ba7c3aeb7a810e546915034852783c4 199s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 199s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + case "${t_ref_val-unset}" in 199s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t_ref_names+=("$name") 199s ++ t-v-tag 199s ++ echo refs/tags/archive/test-dummy/1.0-2 199s + t-refs-same refs/tags/archive/test-dummy/1.0-2 refs/remotes/dgit/dgit/sid 199s + local g 199s + for g in $* 199s + t-ref-same refs/tags/archive/test-dummy/1.0-2 199s + local name=refs/tags/archive/test-dummy/1.0-2 199s + local val 199s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 199s ++ local ref=refs/tags/archive/test-dummy/1.0-2 199s ++ case "$ref" in 199s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ' 199s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 92b92aa41ba7c3aeb7a810e546915034852783c4 199s + local name=refs/tags/archive/test-dummy/1.0-2 199s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + case "${t_ref_val-unset}" in 199s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t_ref_names+=("$name") 199s + for g in $* 199s + t-ref-same refs/remotes/dgit/dgit/sid 199s + local name=refs/remotes/dgit/dgit/sid 199s + local val 199s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 199s ++ local ref=refs/remotes/dgit/dgit/sid 199s ++ case "$ref" in 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ++ git show-ref -d refs/remotes/dgit/dgit/sid 199s ' 199s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t-ref-same-val refs/remotes/dgit/dgit/sid 92b92aa41ba7c3aeb7a810e546915034852783c4 199s + local name=refs/remotes/dgit/dgit/sid 199s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + case "${t_ref_val-unset}" in 199s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t_ref_names+=("$name") 199s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 199s + local val 199s + for g in $* 199s ++ t-git-get-ref refs/heads/dgit/unstable 199s ++ local ref=refs/heads/dgit/unstable 199s ++ case "$ref" in 199s ++ git show-ref -d refs/heads/dgit/unstable 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ' 199s ++ test 1 = 1 199s + val= 199s + '[' x '!=' x ']' 199s + for g in $* 199s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 199s ++ local ref=refs/remotes/dgit/dgit/unstable 199s ++ case "$ref" in 199s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ' 199s ++ test 1 = 1 199s + val= 199s + '[' x '!=' x ']' 199s + set -e 199s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 199s ++ t-v-tag 199s ++ echo refs/tags/archive/test-dummy/1.0-2 199s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 199s + local g 199s + for g in $* 199s + t-ref-same refs/dgit/sid 199s + local name=refs/dgit/sid 199s + local val 199s ++ t-git-get-ref refs/dgit/sid 199s ++ local ref=refs/dgit/sid 199s ++ case "$ref" in 199s ++ git show-ref -d refs/dgit/sid 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ' 199s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t-ref-same-val refs/dgit/sid 92b92aa41ba7c3aeb7a810e546915034852783c4 199s + local name=refs/dgit/sid 199s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + case "${t_ref_val-unset}" in 199s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t_ref_names+=("$name") 199s + for g in $* 199s + t-ref-same refs/tags/archive/test-dummy/1.0-2 199s + local name=refs/tags/archive/test-dummy/1.0-2 199s + local val 199s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 199s ++ local ref=refs/tags/archive/test-dummy/1.0-2 199s ++ case "$ref" in 199s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ' 199s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 92b92aa41ba7c3aeb7a810e546915034852783c4 199s + local name=refs/tags/archive/test-dummy/1.0-2 199s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + case "${t_ref_val-unset}" in 199s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 199s + t_ref_names+=("$name") 199s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 199s + t-refs-notexist refs/dgit/unstable 199s + local val 199s + for g in $* 199s ++ t-git-get-ref refs/dgit/unstable 199s ++ local ref=refs/dgit/unstable 199s ++ case "$ref" in 199s ++ git show-ref -d refs/dgit/unstable 199s ++ perl -ne ' 199s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 199s END { print "$x\n" if length $x; } 199s ' 199s ++ test 1 = 1 199s + val= 199s + '[' x '!=' x ']' 199s ++ t-v-tag 199s ++ echo refs/tags/archive/test-dummy/1.0-2 199s + git verify-tag refs/tags/archive/test-dummy/1.0-2 199s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 199s gpg: Signature made Mon Mar 31 22:50:27 2025 UTC 199s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 199s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 199s gpg: WARNING: This key is not certified with a trusted signature! 199s gpg: There is no indication that the signature belongs to the owner. 199s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 199s + t-incoming-dsc 199s + local dsc=example_1.0-2.dsc 199s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc 199s + t-splitbrain-pushed-good--unpack 199s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 199s + rm -rf t-unpack 199s + mkdir t-unpack 199s + cd t-unpack 199s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 199s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0.orig.tar.xz . 199s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc . 199s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 199s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 199s + dpkg-source -x example_1.0-2.dsc 199s gpgv: Signature made Mon Mar 31 22:50:28 2025 UTC 199s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 199s gpgv: Can't check signature: No public key 199s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 199s dpkg-source: info: extracting example in example-1.0 199s dpkg-source: info: unpacking example_1.0.orig.tar.xz 199s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 199s dpkg-source: info: using patch list from debian/patches/series 199s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 199s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 199s dpkg-source: info: applying subdir/addnewups 199s dpkg-source: info: applying made-with-quilt 199s + cd example-1.0/. 199s + git init 199s hint: Using 'master' as the name for the initial branch. This default branch name 199s hint: is subject to change. To configure the initial branch name to use in all 199s hint: of your new repositories, which will suppress this warning, call: 199s hint: 199s hint: git config --global init.defaultBranch 199s hint: 199s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 199s hint: 'development'. The just-created branch can be renamed via this command: 199s hint: 199s hint: git branch -m 199s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t-unpack/example-1.0/.git/ 199s + git fetch ../../example 'refs/tags/*:refs/tags/*' 199s From ../../example 199s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 199s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 199s + t-splitbrain-pushed-good--checkdiff refs/tags/archive/test-dummy/1.0-2 199s + local tag=refs/tags/archive/test-dummy/1.0-2 199s + t-splitbrain-pushed-good--checkprep 199s + git add -Af . 199s + git rm --cached -r --ignore-unmatch .pc 199s rm '.pc/.quilt_patches' 199s rm '.pc/.quilt_series' 199s rm '.pc/.version' 199s rm '.pc/0001-Add-a-new-upstream-file.patch/new-upstream-file' 199s rm '.pc/0002-Edit-the-.c-file.patch/src.c' 199s rm '.pc/applied-patches' 199s rm '.pc/made-with-quilt/src.c' 199s rm '.pc/subdir/addnewups/lib.c' 199s + t-output '' git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 199s + printf %s '' 199s + shift 199s + git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 199s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 199s + t-splitbrain-pushed-good--unpack 199s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 199s + rm -rf t-unpack 199s + mkdir t-unpack 199s + cd t-unpack 199s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 199s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0.orig.tar.xz . 199s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.dsc . 199s + ln -s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 199s + ln -s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 199s + dpkg-source -x example_1.0-2.dsc 199s gpgv: Signature made Mon Mar 31 22:50:28 2025 UTC 199s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 199s gpgv: Can't check signature: No public key 199s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 199s dpkg-source: info: extracting example in example-1.0 199s dpkg-source: info: unpacking example_1.0.orig.tar.xz 199s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 199s dpkg-source: info: using patch list from debian/patches/series 199s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 199s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 199s dpkg-source: info: applying subdir/addnewups 199s dpkg-source: info: applying made-with-quilt 199s + cd example-1.0/. 199s + git init 199s hint: Using 'master' as the name for the initial branch. This default branch name 199s hint: is subject to change. To configure the initial branch name to use in all 199s hint: of your new repositories, which will suppress this warning, call: 199s hint: 199s hint: git config --global init.defaultBranch 199s hint: 199s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 199s hint: 'development'. The just-created branch can be renamed via this command: 199s hint: 199s hint: git branch -m 199s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t-unpack/example-1.0/.git/ 199s + git fetch ../../example 'refs/tags/*:refs/tags/*' 199s From ../../example 199s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 199s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 199s + find . -mindepth 1 -maxdepth 1 '!' -path ./debian '!' -path ./.git -print0 199s + xargs -0r rm -rf -- 199s + t-splitbrain-pushed-good-end-made-dep14 199s + t-splitbrain-pushed-good--checkdiff refs/tags/test-dummy/1.0-2 199s + local tag=refs/tags/test-dummy/1.0-2 199s + t-splitbrain-pushed-good--checkprep 199s + git add -Af . 199s + git rm --cached -r --ignore-unmatch .pc 199s + t-output '' git diff --stat --cached refs/tags/test-dummy/1.0-2 199s + printf %s '' 199s + shift 199s + git diff --stat --cached refs/tags/test-dummy/1.0-2 199s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 199s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 199s + t-ok 199s + : ======================================== 199s + t-check-only-bpd 199s + '[' .. = .. ']' 199s + return 199s + t-fscks 199s + shopt -s nullglob 199s + for d in $tmp/*/.git $tmp/git/*.git 199s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 199s + t-git-fsck 199s ++ git rev-parse --git-dir 199s + local fsckerrs=.git/dgit-test-fsck.errs 199s + set +e 199s + LC_MESSAGES=C 199s + git fsck --no-dangling --strict 199s + tee .git/dgit-test-fsck.errs 199s + ps='0 0' 199s + set -e 199s + local pats 199s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 199s + test '0 0' = '0 0' 199s + pats+=(-e 'notice: HEAD points to an unborn branch') 199s + pats+=(-e 'notice: No default references') 199s + set +e 199s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 199s + rc=1 199s + set -e 199s + case $rc in 199s + for d in $tmp/*/.git $tmp/git/*.git 199s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 199s + t-git-fsck 199s ++ git rev-parse --git-dir 199s + local fsckerrs=./dgit-test-fsck.errs 199s + set +e 199s + LC_MESSAGES=C 199s + git fsck --no-dangling --strict 199s + tee ./dgit-test-fsck.errs 199s notice: HEAD points to an unborn branch (master) 199s + ps='0 0' 199s + set -e 199s + local pats 199s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 199s + test '0 0' = '0 0' 199s + pats+=(-e 'notice: HEAD points to an unborn branch') 199s + pats+=(-e 'notice: No default references') 199s + set +e 199s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 199s + rc=1 199s + set -e 199s + case $rc in 199s + t-save-artifacts 199s + artifacts=/tmp/autopkgtest.XK8uun/baredebian-tarball-artifacts 199s + '[' x/tmp/autopkgtest.XK8uun/baredebian-tarball-artifacts = x ']' 199s + '[' xtmp = x ']' 199s + GZIP=-1v 199s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/baredebian-tarball-artifacts/baredebian-tarball.tar.gz '--exclude=*.tar' . 199s gzip: warning: GZIP environment variable is deprecated; use an alias or script 199s 79.5% 199s + echo ok. 199s ok. 199s + rc=0 199s + set +x 199s + set +e 199s + pwd 199s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 199s + '[' x '!=' x ']' 199s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 199s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 199s + set -e 199s + test 0 = 0 200s autopkgtest [22:50:30]: test baredebian-tarball: -----------------------] 200s autopkgtest [22:50:30]: test baredebian-tarball: - - - - - - - - - - results - - - - - - - - - - 200s baredebian-tarball PASS 200s autopkgtest [22:50:30]: test build-modes-gbp: preparing testbed 276s autopkgtest [22:51:46]: testbed dpkg architecture: ppc64el 276s autopkgtest [22:51:46]: testbed apt version: 2.4.13 277s autopkgtest [22:51:47]: @@@@@@@@@@@@@@@@@@@@ test bed setup 277s autopkgtest [22:51:47]: testbed release detected to be: jammy 278s autopkgtest [22:51:48]: updating testbed package index (apt update) 278s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 278s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 278s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 278s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 279s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 279s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 279s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.2 kB] 279s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el Packages [170 kB] 279s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el c-n-f Metadata [2476 B] 279s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el Packages [1704 B] 279s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el c-n-f Metadata [116 B] 279s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el Packages [85.0 kB] 279s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el c-n-f Metadata [2064 B] 279s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse ppc64el c-n-f Metadata [116 B] 281s Fetched 715 kB in 1s (770 kB/s) 282s Reading package lists... 282s autopkgtest [22:51:52]: upgrading testbed (apt dist-upgrade and autopurge) 283s Reading package lists... 283s Building dependency tree... 283s Reading state information... 283s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 283s Starting 2 pkgProblemResolver with broken count: 0 283s Done 283s Entering ResolveByKeep 283s 283s The following NEW packages will be installed: 283s linux-headers-5.15.0-136 linux-headers-5.15.0-136-generic 283s linux-image-5.15.0-136-generic linux-modules-5.15.0-136-generic 283s linux-modules-extra-5.15.0-136-generic 283s The following packages will be upgraded: 283s apt apt-utils libapt-pkg6.0 linux-generic linux-headers-generic 283s linux-headers-virtual linux-image-generic linux-image-virtual linux-virtual 284s 9 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. 284s Need to get 112 MB of archives. 284s After this operation, 613 MB of additional disk space will be used. 284s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el libapt-pkg6.0 ppc64el 2.4.14 [1030 kB] 284s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt ppc64el 2.4.14 [1407 kB] 284s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt-utils ppc64el 2.4.14 [236 kB] 284s Get:4 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-5.15.0-136-generic ppc64el 5.15.0-136.147 [22.0 MB] 285s Get:5 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-5.15.0-136-generic ppc64el 5.15.0-136.147 [11.5 MB] 285s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-extra-5.15.0-136-generic ppc64el 5.15.0-136.147 [60.3 MB] 286s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-generic ppc64el 5.15.0.136.134 [1700 B] 286s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-generic ppc64el 5.15.0.136.134 [2466 B] 286s Get:9 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-virtual ppc64el 5.15.0.136.134 [1676 B] 286s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-virtual ppc64el 5.15.0.136.134 [2464 B] 286s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-virtual ppc64el 5.15.0.136.134 [1634 B] 286s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136 all 5.15.0-136.147 [12.3 MB] 287s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136-generic ppc64el 5.15.0-136.147 [3208 kB] 287s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-generic ppc64el 5.15.0.136.134 [2364 B] 287s Fetched 112 MB in 3s (32.3 MB/s) 288s (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 ... 66539 files and directories currently installed.) 288s Preparing to unpack .../libapt-pkg6.0_2.4.14_ppc64el.deb ... 288s Unpacking libapt-pkg6.0:ppc64el (2.4.14) over (2.4.13) ... 288s Setting up libapt-pkg6.0:ppc64el (2.4.14) ... 288s (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 ... 66539 files and directories currently installed.) 288s Preparing to unpack .../apt_2.4.14_ppc64el.deb ... 288s Unpacking apt (2.4.14) over (2.4.13) ... 288s Setting up apt (2.4.14) ... 288s (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 ... 66539 files and directories currently installed.) 288s Preparing to unpack .../00-apt-utils_2.4.14_ppc64el.deb ... 288s Unpacking apt-utils (2.4.14) over (2.4.13) ... 288s Selecting previously unselected package linux-modules-5.15.0-136-generic. 288s Preparing to unpack .../01-linux-modules-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 288s Unpacking linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 289s Selecting previously unselected package linux-image-5.15.0-136-generic. 289s Preparing to unpack .../02-linux-image-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 289s Unpacking linux-image-5.15.0-136-generic (5.15.0-136.147) ... 289s Selecting previously unselected package linux-modules-extra-5.15.0-136-generic. 289s Preparing to unpack .../03-linux-modules-extra-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 289s Unpacking linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 291s Preparing to unpack .../04-linux-generic_5.15.0.136.134_ppc64el.deb ... 291s Unpacking linux-generic (5.15.0.136.134) over (5.15.0.135.133) ... 291s Preparing to unpack .../05-linux-image-generic_5.15.0.136.134_ppc64el.deb ... 291s Unpacking linux-image-generic (5.15.0.136.134) over (5.15.0.135.133) ... 291s Preparing to unpack .../06-linux-virtual_5.15.0.136.134_ppc64el.deb ... 291s Unpacking linux-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 291s Preparing to unpack .../07-linux-image-virtual_5.15.0.136.134_ppc64el.deb ... 291s Unpacking linux-image-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 291s Preparing to unpack .../08-linux-headers-virtual_5.15.0.136.134_ppc64el.deb ... 291s Unpacking linux-headers-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 291s Selecting previously unselected package linux-headers-5.15.0-136. 291s Preparing to unpack .../09-linux-headers-5.15.0-136_5.15.0-136.147_all.deb ... 291s Unpacking linux-headers-5.15.0-136 (5.15.0-136.147) ... 293s Selecting previously unselected package linux-headers-5.15.0-136-generic. 293s Preparing to unpack .../10-linux-headers-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 293s Unpacking linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 294s Preparing to unpack .../11-linux-headers-generic_5.15.0.136.134_ppc64el.deb ... 294s Unpacking linux-headers-generic (5.15.0.136.134) over (5.15.0.135.133) ... 294s Setting up apt-utils (2.4.14) ... 294s Setting up linux-headers-5.15.0-136 (5.15.0-136.147) ... 294s Setting up linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 294s Setting up linux-headers-generic (5.15.0.136.134) ... 294s Setting up linux-headers-virtual (5.15.0.136.134) ... 294s Setting up linux-image-5.15.0-136-generic (5.15.0-136.147) ... 295s I: /boot/vmlinux is now a symlink to vmlinux-5.15.0-136-generic 295s I: /boot/initrd.img is now a symlink to initrd.img-5.15.0-136-generic 295s Setting up linux-image-virtual (5.15.0.136.134) ... 295s Setting up linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 296s Setting up linux-virtual (5.15.0.136.134) ... 296s Setting up linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 298s Setting up linux-image-generic (5.15.0.136.134) ... 298s Setting up linux-generic (5.15.0.136.134) ... 298s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 298s Processing triggers for man-db (2.10.2-1) ... 298s Processing triggers for linux-image-5.15.0-136-generic (5.15.0-136.147) ... 298s /etc/kernel/postinst.d/initramfs-tools: 298s update-initramfs: Generating /boot/initrd.img-5.15.0-136-generic 298s No lz4 in /usr/bin:/sbin:/bin, using gzip 318s /etc/kernel/postinst.d/zz-update-grub: 318s Sourcing file `/etc/default/grub' 319s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 319s Sourcing file `/etc/default/grub.d/init-select.cfg' 319s Generating grub configuration file ... 319s Found linux image: /boot/vmlinux-5.15.0-136-generic 319s Found initrd image: /boot/initrd.img-5.15.0-136-generic 319s Found linux image: /boot/vmlinux-5.15.0-135-generic 319s Found initrd image: /boot/initrd.img-5.15.0-135-generic 319s Warning: os-prober will not be executed to detect other bootable partitions. 319s Systems on them will not be added to the GRUB boot configuration. 319s Check GRUB_DISABLE_OS_PROBER documentation entry. 319s done 320s Reading package lists... 320s Building dependency tree... 320s Reading state information... 321s Starting pkgProblemResolver with broken count: 0 321s Starting 2 pkgProblemResolver with broken count: 0 321s Done 321s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 321s autopkgtest [22:52:31]: rebooting testbed after setup commands that affected boot 354s Reading package lists... 354s Building dependency tree... 354s Reading state information... 354s Starting pkgProblemResolver with broken count: 0 354s Starting 2 pkgProblemResolver with broken count: 0 354s Done 354s The following NEW packages will be installed: 354s autoconf automake autopoint autotools-dev build-essential chiark-utils-bin 354s cpp cpp-11 debhelper debugedit devscripts dgit dgit-infrastructure 354s dh-autoreconf dh-strip-nondeterminism dput dwz fakeroot faketime g++ g++-11 354s gcc gcc-11 gcc-11-base gettext git git-buildpackage git-man intltool-debian 354s libarchive-zip-perl libasan6 libatomic1 libb-hooks-op-check-perl 354s libc-dev-bin libc6-dev libcc1-0 libclass-method-modifiers-perl 354s libclass-xsaccessor-perl libcrypt-dev libdbd-sqlite3-perl libdbi-perl 354s libdebhelper-perl libdevel-callchecker-perl libdynaloader-functions-perl 354s libencode-locale-perl liberror-perl libexporter-tiny-perl libfakeroot 354s libfaketime libfile-dirlist-perl libfile-homedir-perl libfile-listing-perl 354s libfile-stripnondeterminism-perl libfile-touch-perl libfile-which-perl 354s libgcc-11-dev libgomp1 libhtml-parser-perl libhtml-tagset-perl 354s libhtml-tree-perl libhttp-cookies-perl libhttp-date-perl 354s libhttp-message-perl libhttp-negotiate-perl libimport-into-perl 354s libio-html-perl libio-pty-perl libio-socket-ssl-perl libipc-run-perl 354s libisl23 libitm1 libjson-perl liblist-moreutils-perl 354s liblist-moreutils-xs-perl liblsan0 liblwp-mediatypes-perl 354s liblwp-protocol-https-perl libmodule-runtime-perl libmoo-perl libmpc3 354s libnet-http-perl libnet-ssleay-perl libnsl-dev libparams-classify-perl 354s libquadmath0 librole-tiny-perl libstdc++-11-dev libsub-override-perl 354s libsub-quote-perl libtext-csv-perl libtext-glob-perl libtimedate-perl 354s libtirpc-dev libtool libtry-tiny-perl libtsan0 libubsan1 liburi-perl 354s libwww-curl-perl libwww-perl libwww-robotrules-perl linux-libc-dev m4 354s patchutils perl-openssl-defaults po-debconf python3-dateutil python3-debian 354s python3-gpg rpcsvc-proto sqlite3 wdiff 355s 0 upgraded, 112 newly installed, 0 to remove and 0 not upgraded. 355s Need to get 68.4 MB of archives. 355s After this operation, 262 MB of additional disk space will be used. 355s Get:1 http://ftpmaster.internal/ubuntu jammy/main ppc64el m4 ppc64el 1.4.18-5ubuntu2 [214 kB] 355s Get:2 http://ftpmaster.internal/ubuntu jammy/main ppc64el autoconf all 2.71-2 [338 kB] 355s Get:3 http://ftpmaster.internal/ubuntu jammy/main ppc64el autotools-dev all 20220109.1 [44.9 kB] 355s Get:4 http://ftpmaster.internal/ubuntu jammy/main ppc64el automake all 1:1.16.5-1.3 [558 kB] 355s Get:5 http://ftpmaster.internal/ubuntu jammy/main ppc64el autopoint all 0.21-4ubuntu4 [422 kB] 355s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc-dev-bin ppc64el 2.35-0ubuntu3.9 [21.4 kB] 355s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-libc-dev ppc64el 5.15.0-136.147 [1313 kB] 355s Get:8 http://ftpmaster.internal/ubuntu jammy/main ppc64el libcrypt-dev ppc64el 1:4.4.27-1 [142 kB] 355s Get:9 http://ftpmaster.internal/ubuntu jammy/main ppc64el rpcsvc-proto ppc64el 1.4.2-0ubuntu6 [82.3 kB] 355s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtirpc-dev ppc64el 1.3.2-2ubuntu0.1 [223 kB] 355s Get:11 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnsl-dev ppc64el 1.3.0-2build2 [80.0 kB] 355s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc6-dev ppc64el 2.35-0ubuntu3.9 [2053 kB] 355s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11-base ppc64el 11.4.0-1ubuntu1~22.04 [20.3 kB] 355s Get:14 http://ftpmaster.internal/ubuntu jammy/main ppc64el libisl23 ppc64el 0.24-2build1 [833 kB] 355s Get:15 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmpc3 ppc64el 1.2.1-2build1 [52.2 kB] 355s Get:16 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el cpp-11 ppc64el 11.4.0-1ubuntu1~22.04 [8800 kB] 355s Get:17 http://ftpmaster.internal/ubuntu jammy/main ppc64el cpp ppc64el 4:11.2.0-1ubuntu1 [27.7 kB] 355s Get:18 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libcc1-0 ppc64el 12.3.0-1ubuntu1~22.04 [49.5 kB] 355s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgomp1 ppc64el 12.3.0-1ubuntu1~22.04 [140 kB] 355s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libitm1 ppc64el 12.3.0-1ubuntu1~22.04 [32.9 kB] 355s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libatomic1 ppc64el 12.3.0-1ubuntu1~22.04 [10.6 kB] 355s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libasan6 ppc64el 11.4.0-1ubuntu1~22.04 [2303 kB] 355s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el liblsan0 ppc64el 12.3.0-1ubuntu1~22.04 [1090 kB] 356s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtsan0 ppc64el 11.4.0-1ubuntu1~22.04 [2278 kB] 356s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libubsan1 ppc64el 12.3.0-1ubuntu1~22.04 [1001 kB] 356s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libquadmath0 ppc64el 12.3.0-1ubuntu1~22.04 [156 kB] 356s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgcc-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [1477 kB] 356s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11 ppc64el 11.4.0-1ubuntu1~22.04 [17.7 MB] 356s Get:29 http://ftpmaster.internal/ubuntu jammy/main ppc64el gcc ppc64el 4:11.2.0-1ubuntu1 [5152 B] 356s Get:30 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libstdc++-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [2197 kB] 356s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el g++-11 ppc64el 11.4.0-1ubuntu1~22.04 [10.2 MB] 357s Get:32 http://ftpmaster.internal/ubuntu jammy/main ppc64el g++ ppc64el 4:11.2.0-1ubuntu1 [1408 B] 357s Get:33 http://ftpmaster.internal/ubuntu jammy/main ppc64el build-essential ppc64el 12.9ubuntu3 [4752 B] 357s Get:34 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 357s Get:35 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtool all 2.4.6-15build2 [164 kB] 357s Get:36 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-autoreconf all 20 [16.1 kB] 357s Get:37 http://ftpmaster.internal/ubuntu jammy/main ppc64el libarchive-zip-perl all 1.68-1 [90.2 kB] 357s Get:38 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-override-perl all 0.09-2 [9532 B] 357s Get:39 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 357s Get:40 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-strip-nondeterminism all 1.13.0-1 [5344 B] 357s Get:41 http://ftpmaster.internal/ubuntu jammy/main ppc64el debugedit ppc64el 1:5.0-4build1 [51.6 kB] 357s Get:42 http://ftpmaster.internal/ubuntu jammy/main ppc64el dwz ppc64el 0.14-1build2 [124 kB] 357s Get:43 http://ftpmaster.internal/ubuntu jammy/main ppc64el gettext ppc64el 0.21-4ubuntu4 [976 kB] 357s Get:44 http://ftpmaster.internal/ubuntu jammy/main ppc64el intltool-debian all 0.35.0+20060710.5 [24.9 kB] 357s Get:45 http://ftpmaster.internal/ubuntu jammy/main ppc64el po-debconf all 1.0.21+nmu1 [233 kB] 357s Get:46 http://ftpmaster.internal/ubuntu jammy/main ppc64el debhelper all 13.6ubuntu1 [923 kB] 357s Get:47 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfakeroot ppc64el 1.28-1ubuntu1 [33.8 kB] 357s Get:48 http://ftpmaster.internal/ubuntu jammy/main ppc64el fakeroot ppc64el 1.28-1ubuntu1 [62.8 kB] 357s Get:49 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-dirlist-perl all 0.05-2 [7100 B] 357s Get:50 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-which-perl all 1.23-1 [13.8 kB] 357s Get:51 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-homedir-perl all 1.006-1 [38.3 kB] 357s Get:52 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-touch-perl all 0.12-1 [9024 B] 357s Get:53 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-pty-perl ppc64el 1:1.15-2build2 [35.3 kB] 357s Get:54 http://ftpmaster.internal/ubuntu jammy/main ppc64el libipc-run-perl all 20200505.0-1 [89.8 kB] 357s Get:55 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 357s Get:56 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-xsaccessor-perl ppc64el 1.19-3build9 [36.6 kB] 357s Get:57 http://ftpmaster.internal/ubuntu jammy/main ppc64el libb-hooks-op-check-perl ppc64el 0.22-1build5 [10.4 kB] 357s Get:58 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 357s Get:59 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdevel-callchecker-perl ppc64el 0.008-1ubuntu4 [14.7 kB] 357s Get:60 http://ftpmaster.internal/ubuntu jammy/main ppc64el libparams-classify-perl ppc64el 0.015-1build5 [23.9 kB] 357s Get:61 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmodule-runtime-perl all 0.016-1 [16.2 kB] 357s Get:62 http://ftpmaster.internal/ubuntu jammy/main ppc64el libimport-into-perl all 1.002005-1 [11.0 kB] 357s Get:63 http://ftpmaster.internal/ubuntu jammy/main ppc64el librole-tiny-perl all 2.002004-1 [16.3 kB] 357s Get:64 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-quote-perl all 2.006006-1 [19.5 kB] 357s Get:65 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmoo-perl all 2.005004-3 [48.0 kB] 357s Get:66 http://ftpmaster.internal/ubuntu jammy/main ppc64el libencode-locale-perl all 1.05-1.1 [11.8 kB] 357s Get:67 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtimedate-perl all 2.3300-2 [34.0 kB] 357s Get:68 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-date-perl all 6.05-1 [9920 B] 357s Get:69 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-listing-perl all 6.14-1 [11.2 kB] 357s Get:70 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tagset-perl all 3.20-4 [12.5 kB] 357s Get:71 http://ftpmaster.internal/ubuntu jammy/main ppc64el liburi-perl all 5.10-1 [78.8 kB] 357s Get:72 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-parser-perl ppc64el 3.76-1build2 [93.6 kB] 357s Get:73 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tree-perl all 5.07-2 [200 kB] 357s Get:74 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-html-perl all 1.004-2 [15.4 kB] 357s Get:75 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 357s Get:76 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-message-perl all 6.36-1 [76.8 kB] 357s Get:77 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-cookies-perl all 6.10-1 [18.4 kB] 357s Get:78 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-negotiate-perl all 6.01-1 [12.5 kB] 357s Get:79 http://ftpmaster.internal/ubuntu jammy/main ppc64el perl-openssl-defaults ppc64el 5build2 [7540 B] 357s Get:80 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-ssleay-perl ppc64el 1.92-1build2 [332 kB] 357s Get:81 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-socket-ssl-perl all 2.074-2 [192 kB] 357s Get:82 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-http-perl all 6.22-1 [23.2 kB] 357s Get:83 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 357s Get:84 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtry-tiny-perl all 0.31-1 [21.8 kB] 357s Get:85 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-robotrules-perl all 6.02-1 [12.6 kB] 357s Get:86 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-perl all 6.61-1 [141 kB] 357s Get:87 http://ftpmaster.internal/ubuntu jammy/main ppc64el patchutils ppc64el 0.4.2-1build2 [86.6 kB] 357s Get:88 http://ftpmaster.internal/ubuntu jammy/main ppc64el wdiff ppc64el 1.2.2-2build3 [29.5 kB] 357s Get:89 http://ftpmaster.internal/ubuntu jammy/main ppc64el devscripts ppc64el 2.22.1ubuntu1 [1058 kB] 357s Get:90 http://ftpmaster.internal/ubuntu jammy/main ppc64el liberror-perl all 0.17029-1 [26.5 kB] 357s Get:91 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 357s Get:92 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git ppc64el 1:2.34.1-1ubuntu1.12 [4143 kB] 357s Get:93 http://ftpmaster.internal/ubuntu jammy/main ppc64el python3-dateutil all 2.8.1-6 [78.4 kB] 357s Get:94 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-buildpackage all 0.9.25 [799 kB] 357s Get:95 http://ftpmaster.internal/ubuntu jammy/main ppc64el libexporter-tiny-perl all 1.002002-1 [36.2 kB] 357s Get:96 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-xs-perl ppc64el 0.430-2build2 [42.5 kB] 357s Get:97 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-perl all 0.430-2 [38.2 kB] 357s Get:98 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-debian all 0.1.43ubuntu1.1 [107 kB] 357s Get:99 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-gpg ppc64el 1.16.0-1.2ubuntu4.2 [227 kB] 357s Get:100 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el dput all 1.1.0ubuntu2.1 [44.7 kB] 357s Get:101 http://ftpmaster.internal/ubuntu jammy/main ppc64el libjson-perl all 4.04000-1 [81.8 kB] 358s Get:102 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtext-glob-perl all 0.11-2 [8042 B] 358s Get:103 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libwww-curl-perl ppc64el 4.17-7build2 [72.5 kB] 358s Get:104 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libtext-csv-perl all 2.01-1 [108 kB] 358s Get:105 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit all 9.15 [194 kB] 358s Get:106 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdbi-perl ppc64el 1.643-3build3 [748 kB] 358s Get:107 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libdbd-sqlite3-perl ppc64el 1.70-3build1 [172 kB] 358s Get:108 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el sqlite3 ppc64el 3.37.2-2ubuntu0.3 [880 kB] 358s Get:109 http://ftpmaster.internal/ubuntu jammy/universe ppc64el chiark-utils-bin ppc64el 6.1.2+nmu1 [55.7 kB] 358s Get:110 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit-infrastructure all 9.15 [40.8 kB] 358s Get:111 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfaketime ppc64el 0.9.8-9 [35.9 kB] 358s Get:112 http://ftpmaster.internal/ubuntu jammy/universe ppc64el faketime ppc64el 0.9.8-9 [10.3 kB] 359s Fetched 68.4 MB in 4s (18.1 MB/s) 359s Selecting previously unselected package m4. 359s (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 ... 101007 files and directories currently installed.) 359s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_ppc64el.deb ... 359s Unpacking m4 (1.4.18-5ubuntu2) ... 359s Selecting previously unselected package autoconf. 359s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 359s Unpacking autoconf (2.71-2) ... 359s Selecting previously unselected package autotools-dev. 359s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 359s Unpacking autotools-dev (20220109.1) ... 359s Selecting previously unselected package automake. 359s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 359s Unpacking automake (1:1.16.5-1.3) ... 359s Selecting previously unselected package autopoint. 359s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 359s Unpacking autopoint (0.21-4ubuntu4) ... 359s Selecting previously unselected package libc-dev-bin. 359s Preparing to unpack .../005-libc-dev-bin_2.35-0ubuntu3.9_ppc64el.deb ... 359s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 359s Selecting previously unselected package linux-libc-dev:ppc64el. 359s Preparing to unpack .../006-linux-libc-dev_5.15.0-136.147_ppc64el.deb ... 359s Unpacking linux-libc-dev:ppc64el (5.15.0-136.147) ... 359s Selecting previously unselected package libcrypt-dev:ppc64el. 359s Preparing to unpack .../007-libcrypt-dev_1%3a4.4.27-1_ppc64el.deb ... 359s Unpacking libcrypt-dev:ppc64el (1:4.4.27-1) ... 359s Selecting previously unselected package rpcsvc-proto. 359s Preparing to unpack .../008-rpcsvc-proto_1.4.2-0ubuntu6_ppc64el.deb ... 359s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 359s Selecting previously unselected package libtirpc-dev:ppc64el. 359s Preparing to unpack .../009-libtirpc-dev_1.3.2-2ubuntu0.1_ppc64el.deb ... 359s Unpacking libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 359s Selecting previously unselected package libnsl-dev:ppc64el. 359s Preparing to unpack .../010-libnsl-dev_1.3.0-2build2_ppc64el.deb ... 359s Unpacking libnsl-dev:ppc64el (1.3.0-2build2) ... 359s Selecting previously unselected package libc6-dev:ppc64el. 359s Preparing to unpack .../011-libc6-dev_2.35-0ubuntu3.9_ppc64el.deb ... 359s Unpacking libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 360s Selecting previously unselected package gcc-11-base:ppc64el. 360s Preparing to unpack .../012-gcc-11-base_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package libisl23:ppc64el. 360s Preparing to unpack .../013-libisl23_0.24-2build1_ppc64el.deb ... 360s Unpacking libisl23:ppc64el (0.24-2build1) ... 360s Selecting previously unselected package libmpc3:ppc64el. 360s Preparing to unpack .../014-libmpc3_1.2.1-2build1_ppc64el.deb ... 360s Unpacking libmpc3:ppc64el (1.2.1-2build1) ... 360s Selecting previously unselected package cpp-11. 360s Preparing to unpack .../015-cpp-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package cpp. 360s Preparing to unpack .../016-cpp_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 360s Unpacking cpp (4:11.2.0-1ubuntu1) ... 360s Selecting previously unselected package libcc1-0:ppc64el. 360s Preparing to unpack .../017-libcc1-0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package libgomp1:ppc64el. 360s Preparing to unpack .../018-libgomp1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package libitm1:ppc64el. 360s Preparing to unpack .../019-libitm1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package libatomic1:ppc64el. 360s Preparing to unpack .../020-libatomic1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package libasan6:ppc64el. 360s Preparing to unpack .../021-libasan6_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package liblsan0:ppc64el. 360s Preparing to unpack .../022-liblsan0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package libtsan0:ppc64el. 360s Preparing to unpack .../023-libtsan0_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package libubsan1:ppc64el. 360s Preparing to unpack .../024-libubsan1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package libquadmath0:ppc64el. 360s Preparing to unpack .../025-libquadmath0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package libgcc-11-dev:ppc64el. 360s Preparing to unpack .../026-libgcc-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package gcc-11. 360s Preparing to unpack .../027-gcc-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package gcc. 360s Preparing to unpack .../028-gcc_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 360s Unpacking gcc (4:11.2.0-1ubuntu1) ... 360s Selecting previously unselected package libstdc++-11-dev:ppc64el. 360s Preparing to unpack .../029-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 360s Selecting previously unselected package g++-11. 360s Preparing to unpack .../030-g++-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 360s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 361s Selecting previously unselected package g++. 361s Preparing to unpack .../031-g++_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 361s Unpacking g++ (4:11.2.0-1ubuntu1) ... 361s Selecting previously unselected package build-essential. 361s Preparing to unpack .../032-build-essential_12.9ubuntu3_ppc64el.deb ... 361s Unpacking build-essential (12.9ubuntu3) ... 361s Selecting previously unselected package libdebhelper-perl. 361s Preparing to unpack .../033-libdebhelper-perl_13.6ubuntu1_all.deb ... 361s Unpacking libdebhelper-perl (13.6ubuntu1) ... 361s Selecting previously unselected package libtool. 361s Preparing to unpack .../034-libtool_2.4.6-15build2_all.deb ... 361s Unpacking libtool (2.4.6-15build2) ... 361s Selecting previously unselected package dh-autoreconf. 361s Preparing to unpack .../035-dh-autoreconf_20_all.deb ... 361s Unpacking dh-autoreconf (20) ... 361s Selecting previously unselected package libarchive-zip-perl. 361s Preparing to unpack .../036-libarchive-zip-perl_1.68-1_all.deb ... 361s Unpacking libarchive-zip-perl (1.68-1) ... 361s Selecting previously unselected package libsub-override-perl. 361s Preparing to unpack .../037-libsub-override-perl_0.09-2_all.deb ... 361s Unpacking libsub-override-perl (0.09-2) ... 361s Selecting previously unselected package libfile-stripnondeterminism-perl. 361s Preparing to unpack .../038-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 361s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 361s Selecting previously unselected package dh-strip-nondeterminism. 361s Preparing to unpack .../039-dh-strip-nondeterminism_1.13.0-1_all.deb ... 361s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 361s Selecting previously unselected package debugedit. 361s Preparing to unpack .../040-debugedit_1%3a5.0-4build1_ppc64el.deb ... 361s Unpacking debugedit (1:5.0-4build1) ... 361s Selecting previously unselected package dwz. 361s Preparing to unpack .../041-dwz_0.14-1build2_ppc64el.deb ... 361s Unpacking dwz (0.14-1build2) ... 361s Selecting previously unselected package gettext. 361s Preparing to unpack .../042-gettext_0.21-4ubuntu4_ppc64el.deb ... 361s Unpacking gettext (0.21-4ubuntu4) ... 361s Selecting previously unselected package intltool-debian. 361s Preparing to unpack .../043-intltool-debian_0.35.0+20060710.5_all.deb ... 361s Unpacking intltool-debian (0.35.0+20060710.5) ... 361s Selecting previously unselected package po-debconf. 361s Preparing to unpack .../044-po-debconf_1.0.21+nmu1_all.deb ... 361s Unpacking po-debconf (1.0.21+nmu1) ... 361s Selecting previously unselected package debhelper. 361s Preparing to unpack .../045-debhelper_13.6ubuntu1_all.deb ... 361s Unpacking debhelper (13.6ubuntu1) ... 361s Selecting previously unselected package libfakeroot:ppc64el. 361s Preparing to unpack .../046-libfakeroot_1.28-1ubuntu1_ppc64el.deb ... 361s Unpacking libfakeroot:ppc64el (1.28-1ubuntu1) ... 361s Selecting previously unselected package fakeroot. 361s Preparing to unpack .../047-fakeroot_1.28-1ubuntu1_ppc64el.deb ... 361s Unpacking fakeroot (1.28-1ubuntu1) ... 361s Selecting previously unselected package libfile-dirlist-perl. 361s Preparing to unpack .../048-libfile-dirlist-perl_0.05-2_all.deb ... 361s Unpacking libfile-dirlist-perl (0.05-2) ... 361s Selecting previously unselected package libfile-which-perl. 361s Preparing to unpack .../049-libfile-which-perl_1.23-1_all.deb ... 361s Unpacking libfile-which-perl (1.23-1) ... 361s Selecting previously unselected package libfile-homedir-perl. 361s Preparing to unpack .../050-libfile-homedir-perl_1.006-1_all.deb ... 361s Unpacking libfile-homedir-perl (1.006-1) ... 361s Selecting previously unselected package libfile-touch-perl. 361s Preparing to unpack .../051-libfile-touch-perl_0.12-1_all.deb ... 361s Unpacking libfile-touch-perl (0.12-1) ... 361s Selecting previously unselected package libio-pty-perl. 361s Preparing to unpack .../052-libio-pty-perl_1%3a1.15-2build2_ppc64el.deb ... 361s Unpacking libio-pty-perl (1:1.15-2build2) ... 361s Selecting previously unselected package libipc-run-perl. 361s Preparing to unpack .../053-libipc-run-perl_20200505.0-1_all.deb ... 361s Unpacking libipc-run-perl (20200505.0-1) ... 361s Selecting previously unselected package libclass-method-modifiers-perl. 361s Preparing to unpack .../054-libclass-method-modifiers-perl_2.13-1_all.deb ... 361s Unpacking libclass-method-modifiers-perl (2.13-1) ... 361s Selecting previously unselected package libclass-xsaccessor-perl. 361s Preparing to unpack .../055-libclass-xsaccessor-perl_1.19-3build9_ppc64el.deb ... 361s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 361s Selecting previously unselected package libb-hooks-op-check-perl. 361s Preparing to unpack .../056-libb-hooks-op-check-perl_0.22-1build5_ppc64el.deb ... 361s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 361s Selecting previously unselected package libdynaloader-functions-perl. 361s Preparing to unpack .../057-libdynaloader-functions-perl_0.003-1.1_all.deb ... 361s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 361s Selecting previously unselected package libdevel-callchecker-perl. 361s Preparing to unpack .../058-libdevel-callchecker-perl_0.008-1ubuntu4_ppc64el.deb ... 361s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 361s Selecting previously unselected package libparams-classify-perl. 361s Preparing to unpack .../059-libparams-classify-perl_0.015-1build5_ppc64el.deb ... 361s Unpacking libparams-classify-perl (0.015-1build5) ... 361s Selecting previously unselected package libmodule-runtime-perl. 361s Preparing to unpack .../060-libmodule-runtime-perl_0.016-1_all.deb ... 361s Unpacking libmodule-runtime-perl (0.016-1) ... 361s Selecting previously unselected package libimport-into-perl. 361s Preparing to unpack .../061-libimport-into-perl_1.002005-1_all.deb ... 361s Unpacking libimport-into-perl (1.002005-1) ... 361s Selecting previously unselected package librole-tiny-perl. 361s Preparing to unpack .../062-librole-tiny-perl_2.002004-1_all.deb ... 361s Unpacking librole-tiny-perl (2.002004-1) ... 361s Selecting previously unselected package libsub-quote-perl. 361s Preparing to unpack .../063-libsub-quote-perl_2.006006-1_all.deb ... 361s Unpacking libsub-quote-perl (2.006006-1) ... 361s Selecting previously unselected package libmoo-perl. 361s Preparing to unpack .../064-libmoo-perl_2.005004-3_all.deb ... 361s Unpacking libmoo-perl (2.005004-3) ... 361s Selecting previously unselected package libencode-locale-perl. 361s Preparing to unpack .../065-libencode-locale-perl_1.05-1.1_all.deb ... 361s Unpacking libencode-locale-perl (1.05-1.1) ... 361s Selecting previously unselected package libtimedate-perl. 361s Preparing to unpack .../066-libtimedate-perl_2.3300-2_all.deb ... 361s Unpacking libtimedate-perl (2.3300-2) ... 361s Selecting previously unselected package libhttp-date-perl. 361s Preparing to unpack .../067-libhttp-date-perl_6.05-1_all.deb ... 361s Unpacking libhttp-date-perl (6.05-1) ... 361s Selecting previously unselected package libfile-listing-perl. 361s Preparing to unpack .../068-libfile-listing-perl_6.14-1_all.deb ... 361s Unpacking libfile-listing-perl (6.14-1) ... 361s Selecting previously unselected package libhtml-tagset-perl. 361s Preparing to unpack .../069-libhtml-tagset-perl_3.20-4_all.deb ... 361s Unpacking libhtml-tagset-perl (3.20-4) ... 361s Selecting previously unselected package liburi-perl. 361s Preparing to unpack .../070-liburi-perl_5.10-1_all.deb ... 361s Unpacking liburi-perl (5.10-1) ... 361s Selecting previously unselected package libhtml-parser-perl:ppc64el. 361s Preparing to unpack .../071-libhtml-parser-perl_3.76-1build2_ppc64el.deb ... 361s Unpacking libhtml-parser-perl:ppc64el (3.76-1build2) ... 361s Selecting previously unselected package libhtml-tree-perl. 361s Preparing to unpack .../072-libhtml-tree-perl_5.07-2_all.deb ... 361s Unpacking libhtml-tree-perl (5.07-2) ... 361s Selecting previously unselected package libio-html-perl. 361s Preparing to unpack .../073-libio-html-perl_1.004-2_all.deb ... 361s Unpacking libio-html-perl (1.004-2) ... 361s Selecting previously unselected package liblwp-mediatypes-perl. 361s Preparing to unpack .../074-liblwp-mediatypes-perl_6.04-1_all.deb ... 361s Unpacking liblwp-mediatypes-perl (6.04-1) ... 361s Selecting previously unselected package libhttp-message-perl. 361s Preparing to unpack .../075-libhttp-message-perl_6.36-1_all.deb ... 361s Unpacking libhttp-message-perl (6.36-1) ... 361s Selecting previously unselected package libhttp-cookies-perl. 361s Preparing to unpack .../076-libhttp-cookies-perl_6.10-1_all.deb ... 361s Unpacking libhttp-cookies-perl (6.10-1) ... 361s Selecting previously unselected package libhttp-negotiate-perl. 361s Preparing to unpack .../077-libhttp-negotiate-perl_6.01-1_all.deb ... 361s Unpacking libhttp-negotiate-perl (6.01-1) ... 361s Selecting previously unselected package perl-openssl-defaults:ppc64el. 361s Preparing to unpack .../078-perl-openssl-defaults_5build2_ppc64el.deb ... 361s Unpacking perl-openssl-defaults:ppc64el (5build2) ... 361s Selecting previously unselected package libnet-ssleay-perl:ppc64el. 361s Preparing to unpack .../079-libnet-ssleay-perl_1.92-1build2_ppc64el.deb ... 361s Unpacking libnet-ssleay-perl:ppc64el (1.92-1build2) ... 362s Selecting previously unselected package libio-socket-ssl-perl. 362s Preparing to unpack .../080-libio-socket-ssl-perl_2.074-2_all.deb ... 362s Unpacking libio-socket-ssl-perl (2.074-2) ... 362s Selecting previously unselected package libnet-http-perl. 362s Preparing to unpack .../081-libnet-http-perl_6.22-1_all.deb ... 362s Unpacking libnet-http-perl (6.22-1) ... 362s Selecting previously unselected package liblwp-protocol-https-perl. 362s Preparing to unpack .../082-liblwp-protocol-https-perl_6.10-1_all.deb ... 362s Unpacking liblwp-protocol-https-perl (6.10-1) ... 362s Selecting previously unselected package libtry-tiny-perl. 362s Preparing to unpack .../083-libtry-tiny-perl_0.31-1_all.deb ... 362s Unpacking libtry-tiny-perl (0.31-1) ... 362s Selecting previously unselected package libwww-robotrules-perl. 362s Preparing to unpack .../084-libwww-robotrules-perl_6.02-1_all.deb ... 362s Unpacking libwww-robotrules-perl (6.02-1) ... 362s Selecting previously unselected package libwww-perl. 362s Preparing to unpack .../085-libwww-perl_6.61-1_all.deb ... 362s Unpacking libwww-perl (6.61-1) ... 362s Selecting previously unselected package patchutils. 362s Preparing to unpack .../086-patchutils_0.4.2-1build2_ppc64el.deb ... 362s Unpacking patchutils (0.4.2-1build2) ... 362s Selecting previously unselected package wdiff. 362s Preparing to unpack .../087-wdiff_1.2.2-2build3_ppc64el.deb ... 362s Unpacking wdiff (1.2.2-2build3) ... 362s Selecting previously unselected package devscripts. 362s Preparing to unpack .../088-devscripts_2.22.1ubuntu1_ppc64el.deb ... 362s Unpacking devscripts (2.22.1ubuntu1) ... 362s Selecting previously unselected package liberror-perl. 362s Preparing to unpack .../089-liberror-perl_0.17029-1_all.deb ... 362s Unpacking liberror-perl (0.17029-1) ... 362s Selecting previously unselected package git-man. 362s Preparing to unpack .../090-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 362s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 362s Selecting previously unselected package git. 362s Preparing to unpack .../091-git_1%3a2.34.1-1ubuntu1.12_ppc64el.deb ... 362s Unpacking git (1:2.34.1-1ubuntu1.12) ... 362s Selecting previously unselected package python3-dateutil. 362s Preparing to unpack .../092-python3-dateutil_2.8.1-6_all.deb ... 362s Unpacking python3-dateutil (2.8.1-6) ... 362s Selecting previously unselected package git-buildpackage. 362s Preparing to unpack .../093-git-buildpackage_0.9.25_all.deb ... 362s Unpacking git-buildpackage (0.9.25) ... 362s Selecting previously unselected package libexporter-tiny-perl. 362s Preparing to unpack .../094-libexporter-tiny-perl_1.002002-1_all.deb ... 362s Unpacking libexporter-tiny-perl (1.002002-1) ... 362s Selecting previously unselected package liblist-moreutils-xs-perl. 362s Preparing to unpack .../095-liblist-moreutils-xs-perl_0.430-2build2_ppc64el.deb ... 362s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 362s Selecting previously unselected package liblist-moreutils-perl. 362s Preparing to unpack .../096-liblist-moreutils-perl_0.430-2_all.deb ... 362s Unpacking liblist-moreutils-perl (0.430-2) ... 362s Selecting previously unselected package python3-debian. 362s Preparing to unpack .../097-python3-debian_0.1.43ubuntu1.1_all.deb ... 362s Unpacking python3-debian (0.1.43ubuntu1.1) ... 362s Selecting previously unselected package python3-gpg. 362s Preparing to unpack .../098-python3-gpg_1.16.0-1.2ubuntu4.2_ppc64el.deb ... 362s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 362s Selecting previously unselected package dput. 362s Preparing to unpack .../099-dput_1.1.0ubuntu2.1_all.deb ... 362s Unpacking dput (1.1.0ubuntu2.1) ... 362s Selecting previously unselected package libjson-perl. 362s Preparing to unpack .../100-libjson-perl_4.04000-1_all.deb ... 362s Unpacking libjson-perl (4.04000-1) ... 362s Selecting previously unselected package libtext-glob-perl. 362s Preparing to unpack .../101-libtext-glob-perl_0.11-2_all.deb ... 362s Unpacking libtext-glob-perl (0.11-2) ... 362s Selecting previously unselected package libwww-curl-perl. 362s Preparing to unpack .../102-libwww-curl-perl_4.17-7build2_ppc64el.deb ... 362s Unpacking libwww-curl-perl (4.17-7build2) ... 362s Selecting previously unselected package libtext-csv-perl. 362s Preparing to unpack .../103-libtext-csv-perl_2.01-1_all.deb ... 362s Unpacking libtext-csv-perl (2.01-1) ... 362s Selecting previously unselected package dgit. 362s Preparing to unpack .../104-dgit_9.15_all.deb ... 362s Unpacking dgit (9.15) ... 362s Selecting previously unselected package libdbi-perl:ppc64el. 362s Preparing to unpack .../105-libdbi-perl_1.643-3build3_ppc64el.deb ... 362s Unpacking libdbi-perl:ppc64el (1.643-3build3) ... 362s Selecting previously unselected package libdbd-sqlite3-perl:ppc64el. 362s Preparing to unpack .../106-libdbd-sqlite3-perl_1.70-3build1_ppc64el.deb ... 362s Unpacking libdbd-sqlite3-perl:ppc64el (1.70-3build1) ... 362s Selecting previously unselected package sqlite3. 362s Preparing to unpack .../107-sqlite3_3.37.2-2ubuntu0.3_ppc64el.deb ... 362s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 362s Selecting previously unselected package chiark-utils-bin. 362s Preparing to unpack .../108-chiark-utils-bin_6.1.2+nmu1_ppc64el.deb ... 362s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 362s Selecting previously unselected package dgit-infrastructure. 362s Preparing to unpack .../109-dgit-infrastructure_9.15_all.deb ... 362s Unpacking dgit-infrastructure (9.15) ... 362s Selecting previously unselected package libfaketime:ppc64el. 362s Preparing to unpack .../110-libfaketime_0.9.8-9_ppc64el.deb ... 362s Unpacking libfaketime:ppc64el (0.9.8-9) ... 362s Selecting previously unselected package faketime. 362s Preparing to unpack .../111-faketime_0.9.8-9_ppc64el.deb ... 362s Unpacking faketime (0.9.8-9) ... 362s Setting up wdiff (1.2.2-2build3) ... 362s Setting up gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 362s Setting up libfile-which-perl (1.23-1) ... 362s Setting up libdynaloader-functions-perl (0.003-1.1) ... 362s Setting up libtext-glob-perl (0.11-2) ... 362s Setting up libclass-method-modifiers-perl (2.13-1) ... 362s Setting up libio-pty-perl (1:1.15-2build2) ... 362s Setting up libarchive-zip-perl (1.68-1) ... 362s Setting up libhtml-tagset-perl (3.20-4) ... 362s Setting up libdebhelper-perl (13.6ubuntu1) ... 362s Setting up liblwp-mediatypes-perl (6.04-1) ... 362s Setting up libtry-tiny-perl (0.31-1) ... 362s Setting up perl-openssl-defaults:ppc64el (5build2) ... 362s Setting up linux-libc-dev:ppc64el (5.15.0-136.147) ... 362s Setting up m4 (1.4.18-5ubuntu2) ... 362s Setting up libwww-curl-perl (4.17-7build2) ... 362s Setting up libencode-locale-perl (1.05-1.1) ... 362s Setting up libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 362s Setting up libfakeroot:ppc64el (1.28-1ubuntu1) ... 362s Setting up libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 362s Setting up chiark-utils-bin (6.1.2+nmu1) ... 362s Setting up fakeroot (1.28-1ubuntu1) ... 362s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 362s Setting up liberror-perl (0.17029-1) ... 362s Setting up patchutils (0.4.2-1build2) ... 362s Setting up autotools-dev (20220109.1) ... 362s Setting up libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 362s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 362s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 363s Setting up python3-debian (0.1.43ubuntu1.1) ... 363s Setting up libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 363s Setting up libmpc3:ppc64el (1.2.1-2build1) ... 363s Setting up libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 363s Setting up libio-html-perl (1.004-2) ... 363s Setting up autopoint (0.21-4ubuntu4) ... 363s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 363s Setting up libipc-run-perl (20200505.0-1) ... 363s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 363s Setting up autoconf (2.71-2) ... 363s Setting up libtimedate-perl (2.3300-2) ... 363s Setting up libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 363s Setting up dwz (0.14-1build2) ... 363s Setting up libnsl-dev:ppc64el (1.3.0-2build2) ... 363s Setting up libcrypt-dev:ppc64el (1:4.4.27-1) ... 363s Setting up libjson-perl (4.04000-1) ... 363s Setting up librole-tiny-perl (2.002004-1) ... 363s Setting up debugedit (1:5.0-4build1) ... 363s Setting up libsub-override-perl (0.09-2) ... 363s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 363s Setting up python3-dateutil (2.8.1-6) ... 363s Setting up libsub-quote-perl (2.006006-1) ... 363s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 363s Setting up libexporter-tiny-perl (1.002002-1) ... 363s Setting up libfile-dirlist-perl (0.05-2) ... 363s Setting up libisl23:ppc64el (0.24-2build1) ... 363s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 363s Setting up libfile-homedir-perl (1.006-1) ... 363s Setting up libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 363s Setting up liburi-perl (5.10-1) ... 363s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 363s Setting up libfile-touch-perl (0.12-1) ... 363s Setting up libdbi-perl:ppc64el (1.643-3build3) ... 363s Setting up liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 363s Setting up libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 363s Setting up libfaketime:ppc64el (0.9.8-9) ... 363s Setting up libtext-csv-perl (2.01-1) ... 363s Setting up libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 363s Setting up libnet-ssleay-perl:ppc64el (1.92-1build2) ... 363s Setting up automake (1:1.16.5-1.3) ... 363s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 363s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 363s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 363s Setting up faketime (0.9.8-9) ... 363s Setting up libhttp-date-perl (6.05-1) ... 363s Setting up gettext (0.21-4ubuntu4) ... 363s Setting up libfile-listing-perl (6.14-1) ... 363s Setting up liblist-moreutils-perl (0.430-2) ... 363s Setting up libnet-http-perl (6.22-1) ... 363s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 363s Setting up dput (1.1.0ubuntu2.1) ... 363s Setting up intltool-debian (0.35.0+20060710.5) ... 363s Setting up git (1:2.34.1-1ubuntu1.12) ... 363s Setting up dh-strip-nondeterminism (1.13.0-1) ... 363s Setting up libwww-robotrules-perl (6.02-1) ... 363s Setting up libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 363s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 363s Setting up cpp (4:11.2.0-1ubuntu1) ... 363s Setting up libhtml-parser-perl:ppc64el (3.76-1build2) ... 363s Setting up libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 363s Setting up libdbd-sqlite3-perl:ppc64el (1.70-3build1) ... 363s Setting up libio-socket-ssl-perl (2.074-2) ... 363s Setting up libhttp-message-perl (6.36-1) ... 363s Setting up libhttp-negotiate-perl (6.01-1) ... 363s Setting up libhttp-cookies-perl (6.10-1) ... 363s Setting up libtool (2.4.6-15build2) ... 363s Setting up po-debconf (1.0.21+nmu1) ... 363s Setting up libhtml-tree-perl (5.07-2) ... 363s Setting up libparams-classify-perl (0.015-1build5) ... 363s Setting up gcc (4:11.2.0-1ubuntu1) ... 363s Setting up dh-autoreconf (20) ... 363s Setting up libmodule-runtime-perl (0.016-1) ... 363s Setting up libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 363s Setting up dgit-infrastructure (9.15) ... 363s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 363s Setting up libimport-into-perl (1.002005-1) ... 363s Setting up libmoo-perl (2.005004-3) ... 363s Setting up debhelper (13.6ubuntu1) ... 363s Setting up g++ (4:11.2.0-1ubuntu1) ... 363s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 363s Setting up build-essential (12.9ubuntu3) ... 363s Setting up liblwp-protocol-https-perl (6.10-1) ... 363s Setting up libwww-perl (6.61-1) ... 363s Setting up devscripts (2.22.1ubuntu1) ... 363s Setting up git-buildpackage (0.9.25) ... 363s Setting up dgit (9.15) ... 363s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 363s Processing triggers for man-db (2.10.2-1) ... 364s Processing triggers for install-info (6.8-4build1) ... 367s autopkgtest [22:53:17]: test build-modes-gbp: [----------------------- 367s ++ set -o pipefail 367s ++ . tests/lib-core 367s ++ . tests/lib-restricts 367s ++ trap ' 367s rc=$? 367s set +x 367s test $rc = 0 || echo " 367s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 367s 367s Most relevant logs are just before assignment rc=$rc 367s Will now do cleanup etc. 367s " 367s set -x 367s set +e 367s pwd 367s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 367s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 367s set -e 367s test $rc = 0 || t-report-failure 367s ' EXIT 367s ++ t-filter-out-git-hyphen-dir 367s ++ local pathent 367s +++ type -p git-rev-parse 367s +++ : 367s ++ pathent= 367s ++ case "$pathent" in 367s ++ return 367s ++ t-set-intree 367s ++ '[' x = x ']' 367s ++ return 367s ++ : -D 367s ++ export DGIT_TEST_DEBUG 367s ++ : x 367s ++ export DGIT_TEST_DEBPUSH_DEBUG 367s ++ : 367s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 367s ++ GIT_COMMITTER_DATE='1530000000 +0100' 367s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 367s ++ GIT_AUTHOR_DATE='1530000000 +0100' 367s ++ export LC_CTYPE=C.UTF-8 367s ++ LC_CTYPE=C.UTF-8 367s ++ unset CDPATH 367s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 367s ++ FILTER_BRANCH_SQUELCH_WARNING=1 367s +++ pwd 367s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 367s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 367s ++ testname=build-modes-gbp 367s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 367s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 367s ++ bpd=.. 367s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 367s ++ '[' x '!=' x ']' 367s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s +++ pwd 367s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ t-set-using-tmp 367s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 367s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 367s ++ export 'DEBFULLNAME=dgit test git user' 367s ++ DEBFULLNAME='dgit test git user' 367s ++ git config --global user.email dgit-test@debian.example.net 367s ++ git config --global user.name 'dgit test git user' 367s ++ git config --global protocol.ext.allow always 367s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 367s ++ env -0 367s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 367s ++ export DEBCHANGE_VENDOR=dpkg 367s ++ DEBCHANGE_VENDOR=dpkg 367s ++ unset VISUAL 367s ++ unset GIT_EDITOR 367s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 367s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 367s ++ cat 367s ++ schroot=build 367s ++ : aq 367s ++ : archive/test-dummy 367s ++ : sid:unstable 367s ++ t-git-config dgit.default.old-dsc-distro test-dummy 367s ++ git config --global dgit.default.old-dsc-distro test-dummy 367s ++ for import in ${autoimport-gnupg} 367s ++ case "$0" in 367s ++ t-setup-import gnupg 367s ++ local setupname=gnupg 367s ++ local setupsrc 367s ++ local lock 367s ++ '[' x = x ']' 367s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 367s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 367s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 367s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 367s cd "$1"; shift 367s setupname="$1"; shift 367s simport="$1"; shift 367s if [ -e "$simport" ]; then exit 0; fi 367s env - "$@" \ 367s "tests/setup/$setupname" 367s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 367s + cd /tmp/autopkgtest.XK8uun/build.980/src 367s + shift 367s + setupname=gnupg 367s + shift 367s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 367s + shift 367s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 367s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/build-modes-gbp-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/build-modes-gbp-stderr --stdout=/tmp/autopkgtest.XK8uun/build-modes-gbp-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/build-modes-gbp -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/build-modes-gbp' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/build-modes-gbp-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 367s ++ set -o pipefail 367s ++ . tests/lib-core 367s ++ . tests/lib-restricts 367s ++ trap ' 367s rc=$? 367s set +x 367s test $rc = 0 || echo " 367s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 367s 367s Most relevant logs are just before assignment rc=$rc 367s Will now do cleanup etc. 367s " 367s set -x 367s set +e 367s pwd 367s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 367s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 367s set -e 367s test $rc = 0 || t-report-failure 367s ' EXIT 367s ++ t-filter-out-git-hyphen-dir 367s ++ local pathent 367s +++ type -p git-rev-parse 367s +++ : 367s ++ pathent= 367s ++ case "$pathent" in 367s ++ return 367s ++ t-set-intree 367s ++ '[' x = x ']' 367s ++ return 367s ++ : -D 367s ++ export DGIT_TEST_DEBUG 367s ++ : x 367s ++ export DGIT_TEST_DEBPUSH_DEBUG 367s ++ : 367s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 367s ++ GIT_COMMITTER_DATE='1530000000 +0100' 367s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 367s ++ GIT_AUTHOR_DATE='1530000000 +0100' 367s ++ export LC_CTYPE=C.UTF-8 367s ++ LC_CTYPE=C.UTF-8 367s ++ unset CDPATH 367s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 367s ++ FILTER_BRANCH_SQUELCH_WARNING=1 367s +++ pwd 367s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 367s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 367s ++ testname=gnupg 367s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 367s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 367s ++ bpd=.. 367s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 367s ++ '[' x '!=' x ']' 367s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s +++ pwd 367s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ t-set-using-tmp 367s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 367s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 367s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 367s ++ export 'DEBFULLNAME=dgit test git user' 367s ++ DEBFULLNAME='dgit test git user' 367s ++ git config --global user.email dgit-test@debian.example.net 367s ++ git config --global user.name 'dgit test git user' 367s ++ git config --global protocol.ext.allow always 367s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 367s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 367s ++ export DEBCHANGE_VENDOR=dpkg 367s ++ DEBCHANGE_VENDOR=dpkg 367s ++ unset VISUAL 367s ++ unset GIT_EDITOR 367s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 367s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 367s ++ cat 367s ++ schroot=build 367s ++ : aq 367s ++ : archive/test-dummy 367s ++ : sid:unstable 367s ++ t-git-config dgit.default.old-dsc-distro test-dummy 367s ++ git config --global dgit.default.old-dsc-distro test-dummy 367s ++ for import in ${autoimport-gnupg} 367s ++ case "$0" in 367s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 367s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 367s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 367s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 367s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 367s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 367s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 367s + setup=' 367s export GNUPGHOME=$tmp/gnupg 367s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 367s 367s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 367s ssb rsa2048 2013-11-17 [E] 367s 367s sec rsa2048 2014-01-26 [SC] 367s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 367s uid [ultimate] Populus Romanus (test key) 367s ssb rsa2048 2014-01-26 [E] 367s 367s sec rsa2048 2014-01-26 [SC] 367s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 367s uid [ unknown] Hannibal (test key) 367s ssb rsa2048 2014-01-26 [E] 367s 367s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 367s export GNUPGHOME=$tmp/gnupg 367s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 367s 367s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 367s "sha256sum" => "$2", 367s "component" => "$3", 367s "filename" => "$4", 367s }; 367s END { 367s my $json = JSON->new->canonical(); 367s print $json->encode(\@v) or die $!; 367s } 367s ' 367s + t-aq-archive-updated new example 367s + local suite=new 367s + local p=example 367s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 367s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 367s + perl -wne ' 367s use JSON; 367s use strict; 367s our @v; 367s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 367s push @v, { 367s "version" => "$1", 367s "sha256sum" => "$2", 367s "component" => "$3", 367s "filename" => "$4", 367s }; 367s END { 367s my $json = JSON->new->canonical(); 367s print $json->encode(\@v) or die $!; 367s } 367s ' 367s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 367s + cat 367s + jsondelim=' },' 367s + cat 367s + t-git-none 367s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 367s + set -e 367s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 367s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 367s + t-worktree 1.0 367s + rm -rf example 367s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0 367s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.tar 367s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.edit 367s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.edit 367s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.tar 367s + cd example 367s + git show-ref --verify --quiet refs/heads/master 367s + cd .. 367s + cd example 367s + git checkout -b bad-build-deps indep-arch 367s Switched to a new branch 'bad-build-deps' 367s + perl -pe 's/Build-Depends.*/$&, x-dgit-no-such-package/' -i debian/control 367s + git commit -a -m bad-build-deps 367s [bad-build-deps d09bc55] bad-build-deps 367s 1 file changed, 1 insertion(+), 1 deletion(-) 367s + bm-prep-ownpackage-branches 'indep-arch bad-build-deps' 367s + cat 367s + chmod +x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git 367s + bm_branches='indep-arch bad-build-deps' 367s + zgrep 'dpkg-buildpackage: Make dependency checks fatal for -S' /usr/share/doc/dpkg-dev/changelog.gz 367s gzip: /usr/share/doc/dpkg-dev/changelog.gz: No such file or directory 367s + dpkgbuildpackage_deps_for_clean=false 367s + cleanmodes_default='git none' 367s + cleanmodes_default+=' dpkg-source,no-check' 367s + cleanmodes_default+=' dpkg-source-d,no-check' 367s + cleanmodes_all='git none dpkg-source,no-check dpkg-source-d,no-check git-ff check' 367s + cleanmodes_all+=' git,always git,always' 367s + cleanmodes='git none dpkg-source,no-check dpkg-source-d,no-check' 367s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 367s + bm-guess-e-source-e-targets 'gbp-build -S' 367s + local 'some_act=gbp-build -S' 367s + case "$some_act" in 367s + e_source=true 367s + e_targets=' ' 367s + real_act='gbp-build -S --git-ignore-branch' 367s + bm-act-iterate 367s + for cleanmode in $cleanmodes 367s + for branch in $bm_branches 367s + bm-run-one 367s + local 'args= --clean=git gbp-build -S --git-ignore-branch' 367s + bmid='gbp-build -S,git,indep-arch' 367s + bmid=gbp-build_-S,git,indep-arch 367s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 367s + heading='===== [gbp-build_-S,git,indep-arch] dgit --clean=git gbp-build -S --git-ignore-branch =====' 367s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.output 367s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.expected 367s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.results 367s + bm-compute-expected 367s + require_fail=unexpect 367s + tolerate_fail=unexpect 367s + exec 367s + echo '===== [gbp-build_-S,git,indep-arch] dgit --clean=git gbp-build -S --git-ignore-branch =====' 367s + local eff_cleanmode=git 367s + case "$e_targets" in 367s + eff_cleanmode=Cgit 367s + case "$act" in 367s + case $eff_cleanmode in 367s + echo 'BUILD-MODES PROGRAM git clean -dn' 367s + case $eff_cleanmode in 367s + '[' 'x ' '!=' x ']' 367s + bm-build-deps-ok 367s + case "$branch" in 367s + return 0 367s + bm-report-test 'SOURCE FILE' true 367s + local 'desc=SOURCE FILE' 367s + shift 367s + true 367s + echo 'SOURCE FILE EXISTS' 367s + bm-report-test 'SOURCE IN CHANGES' true 367s + local 'desc=SOURCE IN CHANGES' 367s + shift 367s + true 367s + echo 'SOURCE IN CHANGES EXISTS' 367s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 367s + local 'desc=DEBS IN CHANGES' 367s + shift 367s + expr ' ' : '.*binary.*' 367s 0 367s + echo 'DEBS IN CHANGES MISSING' 367s + exec 367s + git checkout indep-arch 367s Switched to branch 'indep-arch' 367s + git clean -xdf 367s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 367s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 367s + set +o pipefail 367s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -S --git-ignore-branch 367s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.output 367s + local dgit=dgit 367s + pwd 367s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 367s + : ' 367s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 367s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -S --git-ignore-branch 368s | git rev-parse --show-toplevel 368s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 368s | git config -z --get-regexp --local '.*' 368s | git config -z --get-regexp --local '.*' 368s | git config -z --get-regexp --global '.*' 368s | git config -z --get-regexp --system '.*' 368s format , quilt mode gbp 368s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 368s warning: could not open directory 'debian/source/': No such file or directory 368s => `' 368s + git diff --quiet HEAD 368s massage split -S. 368s massage done 1 -S. 368s format , quilt mode gbp 368s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 368s warning: could not open directory 'debian/source/': No such file or directory 368s => `' 368s + git diff --quiet HEAD 368s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -dn 368s BUILD-MODES PROGRAM git clean -dn 368s => `' 368s | git rev-parse 'HEAD~0' 368s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 368s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 368s CD work 368s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 368s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 368s CD .. 368s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 368s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 368s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 368s dpkg-source: info: using source format '1.0' 368s dpkg-source: info: building example in example_1.0.tar.gz 368s dpkg-source: info: building example in example_1.0.dsc 368s CD work 368s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 368s package seems new, not specifying -v 368s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 368s dpkg-genchanges: info: including full source code in upload 368s CD .. 368s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 368s renaming (Files) example_1.0.tar.gz 368s renaming (dsc) example_1.0.dsc 368s renaming (changes) example_1.0_source.changes 368s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 368s dgit ok: build successful 368s 368s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 368s ' 368s + local 'ps=0 0' 368s + set -o pipefail 368s + exec 368s + echo '===== [gbp-build_-S,git,indep-arch] dgit --clean=git gbp-build -S --git-ignore-branch =====' 368s + case $ps in 368s + actual_status=success 368s + case "$require_fail-$tolerate_fail-$actual_status" in 368s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.output 368s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 368s + local 'desc=SOURCE FILE' 368s + shift 368s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 368s + echo 'SOURCE FILE EXISTS' 368s + '[' success = success ']' 368s + local changes 368s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 368s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 368s + case "$changes" in 368s + perl -ne 'print if m/^files:/i ... m/^\S/' 368s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 368s + local 'desc=SOURCE IN CHANGES' 368s + shift 368s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 368s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 368s + echo 'SOURCE IN CHANGES EXISTS' 368s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 368s + local 'desc=DEBS IN CHANGES' 368s + shift 368s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 368s + echo 'DEBS IN CHANGES MISSING' 368s + exec 368s + quirk-clean-fixup 368s + case $cleanmode in 368s + '[' success = failure ']' 368s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.results 368s + for branch in $bm_branches 368s + bm-run-one 368s + local 'args= --clean=git gbp-build -S --git-ignore-branch' 368s + bmid='gbp-build -S,git,bad-build-deps' 368s + bmid=gbp-build_-S,git,bad-build-deps 368s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 368s + heading='===== [gbp-build_-S,git,bad-build-deps] dgit --clean=git gbp-build -S --git-ignore-branch =====' 368s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.output 368s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.expected 368s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.results 368s + bm-compute-expected 368s + require_fail=unexpect 368s + tolerate_fail=unexpect 368s + exec 368s + echo '===== [gbp-build_-S,git,bad-build-deps] dgit --clean=git gbp-build -S --git-ignore-branch =====' 368s + local eff_cleanmode=git 368s + case "$e_targets" in 368s + eff_cleanmode=Cgit 368s + case "$act" in 368s + case $eff_cleanmode in 368s + echo 'BUILD-MODES PROGRAM git clean -dn' 368s + case $eff_cleanmode in 368s + '[' 'x ' '!=' x ']' 368s + bm-build-deps-ok 368s + case "$branch" in 368s + return 1 368s + tolerate_fail=tolerate 368s + bm-report-test 'SOURCE FILE' true 368s + local 'desc=SOURCE FILE' 368s + shift 368s + true 368s + echo 'SOURCE FILE EXISTS' 368s + bm-report-test 'SOURCE IN CHANGES' true 368s + local 'desc=SOURCE IN CHANGES' 368s + shift 368s + true 368s + echo 'SOURCE IN CHANGES EXISTS' 368s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 368s + local 'desc=DEBS IN CHANGES' 368s + shift 368s + expr ' ' : '.*binary.*' 368s 0 368s + echo 'DEBS IN CHANGES MISSING' 368s + exec 368s + git checkout bad-build-deps 368s Switched to branch 'bad-build-deps' 368s + git clean -xdf 368s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 368s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 368s + set +o pipefail 368s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -S --git-ignore-branch 368s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.output 368s + local dgit=dgit 368s + pwd 368s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 368s + : ' 368s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 368s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -S --git-ignore-branch 368s | git rev-parse --show-toplevel 368s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 368s | git config -z --get-regexp --local '.*' 368s | git config -z --get-regexp --local '.*' 368s | git config -z --get-regexp --global '.*' 368s | git config -z --get-regexp --system '.*' 368s format , quilt mode gbp 368s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 368s warning: could not open directory 'debian/source/': No such file or directory 368s => `' 368s + git diff --quiet HEAD 368s massage split -S. 368s massage done 1 -S. 368s format , quilt mode gbp 368s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 368s warning: could not open directory 'debian/source/': No such file or directory 368s => `' 368s + git diff --quiet HEAD 368s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -dn 368s BUILD-MODES PROGRAM git clean -dn 368s => `' 368s | git rev-parse 'HEAD~0' 368s => `d09bc55f43bc5586103335d232c16bd041247bd1' 368s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 368s CD work 368s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 368s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 368s CD .. 368s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 368s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 368s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 368s dpkg-source: info: using source format '1.0' 368s dpkg-source: info: building example in example_1.0.tar.gz 368s dpkg-source: info: building example in example_1.0.dsc 368s CD work 368s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 368s package seems new, not specifying -v 368s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 368s dpkg-genchanges: info: including full source code in upload 368s CD .. 368s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 368s renaming (Files) example_1.0.tar.gz 368s renaming (dsc) example_1.0.dsc 368s renaming (changes) example_1.0_source.changes 368s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 368s dgit ok: build successful 368s 368s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 368s ' 368s + local 'ps=0 0' 368s + set -o pipefail 368s + exec 368s + echo '===== [gbp-build_-S,git,bad-build-deps] dgit --clean=git gbp-build -S --git-ignore-branch =====' 368s + case $ps in 368s + actual_status=success 368s + case "$require_fail-$tolerate_fail-$actual_status" in 368s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.output 368s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 368s + local 'desc=SOURCE FILE' 368s + shift 368s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 368s + echo 'SOURCE FILE EXISTS' 368s + '[' success = success ']' 368s + local changes 368s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 368s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 368s + case "$changes" in 368s + perl -ne 'print if m/^files:/i ... m/^\S/' 368s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 368s + local 'desc=SOURCE IN CHANGES' 368s + shift 368s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 368s dfa974eaf4bfa9d67cc18cee1b69b830 585 devel extra example_1.0.dsc 368s + echo 'SOURCE IN CHANGES EXISTS' 368s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 368s + local 'desc=DEBS IN CHANGES' 368s + shift 368s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 368s + echo 'DEBS IN CHANGES MISSING' 368s + exec 368s + quirk-clean-fixup 368s + case $cleanmode in 368s + '[' success = failure ']' 368s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.results 368s + for cleanmode in $cleanmodes 368s + for branch in $bm_branches 368s + bm-run-one 368s + local 'args= --clean=none gbp-build -S --git-ignore-branch' 368s + bmid='gbp-build -S,none,indep-arch' 368s + bmid=gbp-build_-S,none,indep-arch 368s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 368s + heading='===== [gbp-build_-S,none,indep-arch] dgit --clean=none gbp-build -S --git-ignore-branch =====' 368s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.output 368s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.expected 368s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.results 368s + bm-compute-expected 368s + require_fail=unexpect 368s + tolerate_fail=unexpect 368s + exec 368s + echo '===== [gbp-build_-S,none,indep-arch] dgit --clean=none gbp-build -S --git-ignore-branch =====' 368s + local eff_cleanmode=none 368s + case "$e_targets" in 368s + eff_cleanmode=Cnone 368s + case "$act" in 368s + case $eff_cleanmode in 368s + case $eff_cleanmode in 368s + '[' 'x ' '!=' x ']' 368s + bm-build-deps-ok 368s + case "$branch" in 368s + return 0 368s + bm-report-test 'SOURCE FILE' true 368s + local 'desc=SOURCE FILE' 368s + shift 368s + true 368s + echo 'SOURCE FILE EXISTS' 368s + bm-report-test 'SOURCE IN CHANGES' true 368s + local 'desc=SOURCE IN CHANGES' 368s + shift 368s + true 368s + echo 'SOURCE IN CHANGES EXISTS' 368s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 368s + local 'desc=DEBS IN CHANGES' 368s + shift 368s + expr ' ' : '.*binary.*' 368s 0 368s + echo 'DEBS IN CHANGES MISSING' 368s + exec 368s + git checkout indep-arch 368s Switched to branch 'indep-arch' 368s + git clean -xdf 368s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 368s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 368s + set +o pipefail 368s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.output 368s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -S --git-ignore-branch 368s + local dgit=dgit 368s + pwd 368s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 368s + : ' 368s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 368s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -S --git-ignore-branch 368s | git rev-parse --show-toplevel 368s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 368s | git config -z --get-regexp --local '.*' 368s | git config -z --get-regexp --local '.*' 368s | git config -z --get-regexp --global '.*' 368s | git config -z --get-regexp --system '.*' 369s format , quilt mode gbp 369s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 369s warning: could not open directory 'debian/source/': No such file or directory 369s => `' 369s + git diff --quiet HEAD 369s massage split -S. 369s massage done 1 -S. 369s format , quilt mode gbp 369s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 369s warning: could not open directory 'debian/source/': No such file or directory 369s => `' 369s + git diff --quiet HEAD 369s | git rev-parse 'HEAD~0' 369s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 369s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 369s CD work 369s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 369s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 369s CD .. 369s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 369s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 369s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 369s dpkg-source: info: using source format '1.0' 369s dpkg-source: info: building example in example_1.0.tar.gz 369s dpkg-source: info: building example in example_1.0.dsc 369s CD work 369s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 369s package seems new, not specifying -v 369s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 369s dpkg-genchanges: info: including full source code in upload 369s CD .. 369s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 369s renaming (Files) example_1.0.tar.gz 369s renaming (dsc) example_1.0.dsc 369s renaming (changes) example_1.0_source.changes 369s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 369s dgit ok: build successful 369s 369s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 369s ' 369s + local 'ps=0 0' 369s + set -o pipefail 369s + exec 369s + echo '===== [gbp-build_-S,none,indep-arch] dgit --clean=none gbp-build -S --git-ignore-branch =====' 369s + case $ps in 369s + actual_status=success 369s + case "$require_fail-$tolerate_fail-$actual_status" in 369s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.output 369s + '[' 1 = 1 ']' 369s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 369s + local 'desc=SOURCE FILE' 369s + shift 369s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 369s + echo 'SOURCE FILE EXISTS' 369s + '[' success = success ']' 369s + local changes 369s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 369s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 369s + case "$changes" in 369s + perl -ne 'print if m/^files:/i ... m/^\S/' 369s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 369s + local 'desc=SOURCE IN CHANGES' 369s + shift 369s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 369s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 369s + echo 'SOURCE IN CHANGES EXISTS' 369s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 369s + local 'desc=DEBS IN CHANGES' 369s + shift 369s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 369s + echo 'DEBS IN CHANGES MISSING' 369s + exec 369s + quirk-clean-fixup 369s + case $cleanmode in 369s + '[' success = failure ']' 369s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.results 369s + for branch in $bm_branches 369s + bm-run-one 369s + local 'args= --clean=none gbp-build -S --git-ignore-branch' 369s + bmid='gbp-build -S,none,bad-build-deps' 369s + bmid=gbp-build_-S,none,bad-build-deps 369s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 369s + heading='===== [gbp-build_-S,none,bad-build-deps] dgit --clean=none gbp-build -S --git-ignore-branch =====' 369s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.output 369s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.expected 369s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.results 369s + bm-compute-expected 369s + require_fail=unexpect 369s + tolerate_fail=unexpect 369s + exec 369s + echo '===== [gbp-build_-S,none,bad-build-deps] dgit --clean=none gbp-build -S --git-ignore-branch =====' 369s + local eff_cleanmode=none 369s + case "$e_targets" in 369s + eff_cleanmode=Cnone 369s + case "$act" in 369s + case $eff_cleanmode in 369s + case $eff_cleanmode in 369s + '[' 'x ' '!=' x ']' 369s + bm-build-deps-ok 369s + case "$branch" in 369s + return 1 369s + tolerate_fail=tolerate 369s + bm-report-test 'SOURCE FILE' true 369s + local 'desc=SOURCE FILE' 369s + shift 369s + true 369s + echo 'SOURCE FILE EXISTS' 369s + bm-report-test 'SOURCE IN CHANGES' true 369s + local 'desc=SOURCE IN CHANGES' 369s + shift 369s + true 369s + echo 'SOURCE IN CHANGES EXISTS' 369s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 369s + local 'desc=DEBS IN CHANGES' 369s + shift 369s + expr ' ' : '.*binary.*' 369s 0 369s + echo 'DEBS IN CHANGES MISSING' 369s + exec 369s + git checkout bad-build-deps 369s Switched to branch 'bad-build-deps' 369s + git clean -xdf 369s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 369s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 369s + set +o pipefail 369s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -S --git-ignore-branch 369s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.output 369s + local dgit=dgit 369s + pwd 369s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 369s + : ' 369s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 369s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -S --git-ignore-branch 369s | git rev-parse --show-toplevel 369s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 369s | git config -z --get-regexp --local '.*' 369s | git config -z --get-regexp --local '.*' 369s | git config -z --get-regexp --global '.*' 369s | git config -z --get-regexp --system '.*' 369s format , quilt mode gbp 369s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 369s warning: could not open directory 'debian/source/': No such file or directory 369s => `' 369s + git diff --quiet HEAD 369s massage split -S. 369s massage done 1 -S. 369s format , quilt mode gbp 369s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 369s warning: could not open directory 'debian/source/': No such file or directory 369s => `' 369s + git diff --quiet HEAD 369s | git rev-parse 'HEAD~0' 369s => `d09bc55f43bc5586103335d232c16bd041247bd1' 369s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 369s CD work 369s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 369s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 369s CD .. 369s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 369s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 369s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 369s dpkg-source: info: using source format '1.0' 369s dpkg-source: info: building example in example_1.0.tar.gz 369s dpkg-source: info: building example in example_1.0.dsc 369s CD work 369s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 369s package seems new, not specifying -v 369s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 369s dpkg-genchanges: info: including full source code in upload 369s CD .. 369s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 369s renaming (Files) example_1.0.tar.gz 369s renaming (dsc) example_1.0.dsc 369s renaming (changes) example_1.0_source.changes 369s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 369s dgit ok: build successful 369s 369s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 369s ' 369s + local 'ps=0 0' 369s + set -o pipefail 369s + exec 369s + echo '===== [gbp-build_-S,none,bad-build-deps] dgit --clean=none gbp-build -S --git-ignore-branch =====' 369s + case $ps in 369s + actual_status=success 369s + case "$require_fail-$tolerate_fail-$actual_status" in 369s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.output 369s + '[' 1 = 1 ']' 369s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 369s + local 'desc=SOURCE FILE' 369s + shift 369s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 369s + echo 'SOURCE FILE EXISTS' 369s + '[' success = success ']' 369s + local changes 369s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 369s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 369s + case "$changes" in 369s + perl -ne 'print if m/^files:/i ... m/^\S/' 369s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 369s + local 'desc=SOURCE IN CHANGES' 369s + shift 369s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 369s dfa974eaf4bfa9d67cc18cee1b69b830 585 devel extra example_1.0.dsc 369s + echo 'SOURCE IN CHANGES EXISTS' 369s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 369s + local 'desc=DEBS IN CHANGES' 369s + shift 369s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 369s + echo 'DEBS IN CHANGES MISSING' 369s + exec 369s + quirk-clean-fixup 369s + case $cleanmode in 369s + '[' success = failure ']' 369s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.results 369s + for cleanmode in $cleanmodes 369s + for branch in $bm_branches 369s + bm-run-one 369s + local 'args= --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch' 369s + bmid='gbp-build -S,dpkg-source,no-check,indep-arch' 369s + bmid=gbp-build_-S,dpkg-source,no-check,indep-arch 369s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 369s + heading='===== [gbp-build_-S,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 369s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.output 369s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.expected 369s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.results 369s + bm-compute-expected 369s + require_fail=unexpect 369s + tolerate_fail=unexpect 369s + exec 369s + echo '===== [gbp-build_-S,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 369s + local eff_cleanmode=dpkg-source,no-check 369s + case "$e_targets" in 369s + eff_cleanmode=Cdpkg-source,no-check 369s + case "$act" in 369s + case $eff_cleanmode in 369s + case $eff_cleanmode in 369s + '[' 'x ' '!=' x ']' 369s + bm-build-deps-ok 369s + case "$branch" in 369s + return 0 369s + bm-report-test 'SOURCE FILE' true 369s + local 'desc=SOURCE FILE' 369s + shift 369s + true 369s + echo 'SOURCE FILE EXISTS' 369s + bm-report-test 'SOURCE IN CHANGES' true 369s + local 'desc=SOURCE IN CHANGES' 369s + shift 369s + true 369s + echo 'SOURCE IN CHANGES EXISTS' 369s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 369s + local 'desc=DEBS IN CHANGES' 369s + shift 369s + expr ' ' : '.*binary.*' 369s 0 369s + echo 'DEBS IN CHANGES MISSING' 369s + exec 369s + git checkout indep-arch 369s Switched to branch 'indep-arch' 369s + git clean -xdf 369s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 369s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 369s + set +o pipefail 369s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch 369s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.output 369s + local dgit=dgit 369s + pwd 369s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 369s + : ' 369s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 369s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch 369s | git rev-parse --show-toplevel 369s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 369s | git config -z --get-regexp --local '.*' 369s | git config -z --get-regexp --local '.*' 369s | git config -z --get-regexp --global '.*' 369s | git config -z --get-regexp --system '.*' 369s format , quilt mode gbp 369s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 369s warning: could not open directory 'debian/source/': No such file or directory 369s => `' 369s + git diff --quiet HEAD 369s massage split -S. 369s massage done 1 -S. 369s format , quilt mode gbp 369s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 369s warning: could not open directory 'debian/source/': No such file or directory 369s => `' 369s + git diff --quiet HEAD 369s | git rev-parse 'HEAD~0' 369s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 369s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 369s CD work 369s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 369s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 369s CD .. 369s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 370s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 370s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 370s dpkg-source: info: using source format '1.0' 370s dpkg-source: info: building example in example_1.0.tar.gz 370s dpkg-source: info: building example in example_1.0.dsc 370s CD work 370s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 370s package seems new, not specifying -v 370s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 370s dpkg-genchanges: info: including full source code in upload 370s CD .. 370s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 370s renaming (Files) example_1.0.tar.gz 370s renaming (dsc) example_1.0.dsc 370s renaming (changes) example_1.0_source.changes 370s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 370s dgit ok: build successful 370s 370s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 370s ' 370s + local 'ps=0 0' 370s + set -o pipefail 370s + exec 370s + echo '===== [gbp-build_-S,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 370s + case $ps in 370s + actual_status=success 370s + case "$require_fail-$tolerate_fail-$actual_status" in 370s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.output 370s + '[' 1 = 1 ']' 370s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 370s + local 'desc=SOURCE FILE' 370s + shift 370s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 370s + echo 'SOURCE FILE EXISTS' 370s + '[' success = success ']' 370s + local changes 370s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 370s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 370s + case "$changes" in 370s + perl -ne 'print if m/^files:/i ... m/^\S/' 370s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 370s + local 'desc=SOURCE IN CHANGES' 370s + shift 370s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 370s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 370s + echo 'SOURCE IN CHANGES EXISTS' 370s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 370s + local 'desc=DEBS IN CHANGES' 370s + shift 370s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 370s + echo 'DEBS IN CHANGES MISSING' 370s + exec 370s + quirk-clean-fixup 370s + case $cleanmode in 370s + perl -i.unfixed -ne ' 370s print unless 370s $_ eq $last && 370s $_ eq "EXAMPLE RULES TARGET clean\n"; 370s $last = $_; 370s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.results 370s + '[' success = failure ']' 370s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.results 370s + for branch in $bm_branches 370s + bm-run-one 370s + local 'args= --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch' 370s + bmid='gbp-build -S,dpkg-source,no-check,bad-build-deps' 370s + bmid=gbp-build_-S,dpkg-source,no-check,bad-build-deps 370s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 370s + heading='===== [gbp-build_-S,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 370s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.output 370s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.expected 370s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.results 370s + bm-compute-expected 370s + require_fail=unexpect 370s + tolerate_fail=unexpect 370s + exec 370s + echo '===== [gbp-build_-S,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 370s + local eff_cleanmode=dpkg-source,no-check 370s + case "$e_targets" in 370s + eff_cleanmode=Cdpkg-source,no-check 370s + case "$act" in 370s + case $eff_cleanmode in 370s + case $eff_cleanmode in 370s + '[' 'x ' '!=' x ']' 370s + bm-build-deps-ok 370s + case "$branch" in 370s + return 1 370s + tolerate_fail=tolerate 370s + bm-report-test 'SOURCE FILE' true 370s + local 'desc=SOURCE FILE' 370s + shift 370s + true 370s + echo 'SOURCE FILE EXISTS' 370s + bm-report-test 'SOURCE IN CHANGES' true 370s + local 'desc=SOURCE IN CHANGES' 370s + shift 370s + true 370s + echo 'SOURCE IN CHANGES EXISTS' 370s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 370s + local 'desc=DEBS IN CHANGES' 370s + shift 370s + expr ' ' : '.*binary.*' 370s 0 370s + echo 'DEBS IN CHANGES MISSING' 370s + exec 370s + git checkout bad-build-deps 370s Switched to branch 'bad-build-deps' 370s + git clean -xdf 370s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 370s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 370s + set +o pipefail 370s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.output 370s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch 370s + local dgit=dgit 370s + pwd 370s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 370s + : ' 370s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 370s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch 370s | git rev-parse --show-toplevel 370s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 370s | git config -z --get-regexp --local '.*' 370s | git config -z --get-regexp --local '.*' 370s | git config -z --get-regexp --global '.*' 370s | git config -z --get-regexp --system '.*' 370s format , quilt mode gbp 370s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 370s warning: could not open directory 'debian/source/': No such file or directory 370s => `' 370s + git diff --quiet HEAD 370s massage split -S. 370s massage done 1 -S. 370s format , quilt mode gbp 370s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 370s warning: could not open directory 'debian/source/': No such file or directory 370s => `' 370s + git diff --quiet HEAD 370s | git rev-parse 'HEAD~0' 370s => `d09bc55f43bc5586103335d232c16bd041247bd1' 370s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 370s CD work 370s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 370s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 370s CD .. 370s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 370s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 370s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 370s dpkg-source: info: using source format '1.0' 370s dpkg-source: info: building example in example_1.0.tar.gz 370s dpkg-source: info: building example in example_1.0.dsc 370s CD work 370s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 370s package seems new, not specifying -v 370s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 370s dpkg-genchanges: info: including full source code in upload 370s CD .. 370s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 370s renaming (Files) example_1.0.tar.gz 370s renaming (dsc) example_1.0.dsc 370s renaming (changes) example_1.0_source.changes 370s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 370s dgit ok: build successful 370s 370s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 370s ' 370s + local 'ps=0 0' 370s + set -o pipefail 370s + exec 370s + echo '===== [gbp-build_-S,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 370s + case $ps in 370s + actual_status=success 370s + case "$require_fail-$tolerate_fail-$actual_status" in 370s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.output 370s + '[' 1 = 1 ']' 370s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 370s + local 'desc=SOURCE FILE' 370s + shift 370s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 370s + echo 'SOURCE FILE EXISTS' 370s + '[' success = success ']' 370s + local changes 370s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 370s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 370s + case "$changes" in 370s + perl -ne 'print if m/^files:/i ... m/^\S/' 370s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 370s + local 'desc=SOURCE IN CHANGES' 370s + shift 370s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 370s dfa974eaf4bfa9d67cc18cee1b69b830 585 devel extra example_1.0.dsc 370s + echo 'SOURCE IN CHANGES EXISTS' 370s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 370s + local 'desc=DEBS IN CHANGES' 370s + shift 370s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 370s + echo 'DEBS IN CHANGES MISSING' 370s + exec 370s + quirk-clean-fixup 370s + case $cleanmode in 370s + perl -i.unfixed -ne ' 370s print unless 370s $_ eq $last && 370s $_ eq "EXAMPLE RULES TARGET clean\n"; 370s $last = $_; 370s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.results 370s + '[' success = failure ']' 370s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.results 370s + for cleanmode in $cleanmodes 370s + for branch in $bm_branches 370s + bm-run-one 370s + local 'args= --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch' 370s + bmid='gbp-build -S,dpkg-source-d,no-check,indep-arch' 370s + bmid=gbp-build_-S,dpkg-source-d,no-check,indep-arch 370s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 370s + heading='===== [gbp-build_-S,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch =====' 370s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.output 370s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.expected 370s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.results 370s + bm-compute-expected 370s + require_fail=unexpect 370s + tolerate_fail=unexpect 370s + exec 370s + echo '===== [gbp-build_-S,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch =====' 370s + local eff_cleanmode=dpkg-source-d,no-check 370s + case "$e_targets" in 370s + eff_cleanmode=Cdpkg-source-d,no-check 370s + case "$act" in 370s + case $eff_cleanmode in 370s + case $eff_cleanmode in 370s + '[' 'x ' '!=' x ']' 370s + bm-build-deps-ok 370s + case "$branch" in 370s + return 0 370s + bm-report-test 'SOURCE FILE' true 370s + local 'desc=SOURCE FILE' 370s + shift 370s + true 370s + echo 'SOURCE FILE EXISTS' 370s + bm-report-test 'SOURCE IN CHANGES' true 370s + local 'desc=SOURCE IN CHANGES' 370s + shift 370s + true 370s + echo 'SOURCE IN CHANGES EXISTS' 370s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 370s + local 'desc=DEBS IN CHANGES' 370s + shift 370s + expr ' ' : '.*binary.*' 370s 0 370s + echo 'DEBS IN CHANGES MISSING' 370s + exec 370s + git checkout indep-arch 370s Switched to branch 'indep-arch' 370s + git clean -xdf 370s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 370s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 370s + set +o pipefail 370s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.output 370s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch 370s + local dgit=dgit 370s + pwd 370s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 370s + : ' 370s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 370s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch 370s | git rev-parse --show-toplevel 370s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 370s | git config -z --get-regexp --local '.*' 370s | git config -z --get-regexp --local '.*' 370s | git config -z --get-regexp --global '.*' 370s | git config -z --get-regexp --system '.*' 370s format , quilt mode gbp 370s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 370s warning: could not open directory 'debian/source/': No such file or directory 370s => `' 370s + git diff --quiet HEAD 370s massage split -S. 370s massage done 1 -S. 370s format , quilt mode gbp 370s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 370s warning: could not open directory 'debian/source/': No such file or directory 370s => `' 370s + git diff --quiet HEAD 370s | git rev-parse 'HEAD~0' 370s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 370s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 370s CD work 370s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 370s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 370s CD .. 370s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 370s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 370s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 370s dpkg-source: info: using source format '1.0' 370s dpkg-source: info: building example in example_1.0.tar.gz 370s dpkg-source: info: building example in example_1.0.dsc 370s CD work 370s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 370s package seems new, not specifying -v 370s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 371s dpkg-genchanges: info: including full source code in upload 371s CD .. 371s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 371s renaming (Files) example_1.0.tar.gz 371s renaming (dsc) example_1.0.dsc 371s renaming (changes) example_1.0_source.changes 371s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 371s dgit ok: build successful 371s 371s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 371s ' 371s + local 'ps=0 0' 371s + set -o pipefail 371s + exec 371s + echo '===== [gbp-build_-S,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch =====' 371s + case $ps in 371s + actual_status=success 371s + case "$require_fail-$tolerate_fail-$actual_status" in 371s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.output 371s + '[' 1 = 1 ']' 371s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 371s + local 'desc=SOURCE FILE' 371s + shift 371s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 371s + echo 'SOURCE FILE EXISTS' 371s + '[' success = success ']' 371s + local changes 371s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 371s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 371s + case "$changes" in 371s + perl -ne 'print if m/^files:/i ... m/^\S/' 371s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 371s + local 'desc=SOURCE IN CHANGES' 371s + shift 371s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 371s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 371s + echo 'SOURCE IN CHANGES EXISTS' 371s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 371s + local 'desc=DEBS IN CHANGES' 371s + shift 371s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 371s + echo 'DEBS IN CHANGES MISSING' 371s + exec 371s + quirk-clean-fixup 371s + case $cleanmode in 371s + perl -i.unfixed -ne ' 371s print unless 371s $_ eq $last && 371s $_ eq "EXAMPLE RULES TARGET clean\n"; 371s $last = $_; 371s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.results 371s + '[' success = failure ']' 371s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.results 371s + for branch in $bm_branches 371s + bm-run-one 371s + local 'args= --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch' 371s + bmid='gbp-build -S,dpkg-source-d,no-check,bad-build-deps' 371s + bmid=gbp-build_-S,dpkg-source-d,no-check,bad-build-deps 371s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 371s + 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 =====' 371s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.output 371s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.expected 371s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.results 371s + bm-compute-expected 371s + require_fail=unexpect 371s + tolerate_fail=unexpect 371s + exec 371s + 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 =====' 371s + local eff_cleanmode=dpkg-source-d,no-check 371s + case "$e_targets" in 371s + eff_cleanmode=Cdpkg-source-d,no-check 371s + case "$act" in 371s + case $eff_cleanmode in 371s + case $eff_cleanmode in 371s + '[' 'x ' '!=' x ']' 371s + bm-build-deps-ok 371s + case "$branch" in 371s + return 1 371s + tolerate_fail=tolerate 371s + bm-report-test 'SOURCE FILE' true 371s + local 'desc=SOURCE FILE' 371s + shift 371s + true 371s + echo 'SOURCE FILE EXISTS' 371s + bm-report-test 'SOURCE IN CHANGES' true 371s + local 'desc=SOURCE IN CHANGES' 371s + shift 371s + true 371s + echo 'SOURCE IN CHANGES EXISTS' 371s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 371s + local 'desc=DEBS IN CHANGES' 371s + shift 371s + expr ' ' : '.*binary.*' 371s 0 371s + echo 'DEBS IN CHANGES MISSING' 371s + exec 371s + git checkout bad-build-deps 371s Switched to branch 'bad-build-deps' 371s + git clean -xdf 371s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 371s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 371s + set +o pipefail 371s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch 371s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.output 371s + local dgit=dgit 371s + pwd 371s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 371s + : ' 371s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 371s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch 371s | git rev-parse --show-toplevel 371s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 371s | git config -z --get-regexp --local '.*' 371s | git config -z --get-regexp --local '.*' 371s | git config -z --get-regexp --global '.*' 371s | git config -z --get-regexp --system '.*' 371s format , quilt mode gbp 371s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 371s warning: could not open directory 'debian/source/': No such file or directory 371s => `' 371s + git diff --quiet HEAD 371s massage split -S. 371s massage done 1 -S. 371s format , quilt mode gbp 371s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 371s warning: could not open directory 'debian/source/': No such file or directory 371s => `' 371s + git diff --quiet HEAD 371s | git rev-parse 'HEAD~0' 371s => `d09bc55f43bc5586103335d232c16bd041247bd1' 371s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 371s CD work 371s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 371s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 371s CD .. 371s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 371s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 371s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 371s dpkg-source: info: using source format '1.0' 371s dpkg-source: info: building example in example_1.0.tar.gz 371s dpkg-source: info: building example in example_1.0.dsc 371s CD work 371s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 371s package seems new, not specifying -v 371s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 371s dpkg-genchanges: info: including full source code in upload 371s CD .. 371s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 371s renaming (Files) example_1.0.tar.gz 371s renaming (dsc) example_1.0.dsc 371s renaming (changes) example_1.0_source.changes 371s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 371s dgit ok: build successful 371s 371s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 371s ' 371s + local 'ps=0 0' 371s + set -o pipefail 371s + exec 371s + 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 =====' 371s + case $ps in 371s + actual_status=success 371s + case "$require_fail-$tolerate_fail-$actual_status" in 371s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.output 371s + '[' 1 = 1 ']' 371s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 371s + local 'desc=SOURCE FILE' 371s + shift 371s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 371s + echo 'SOURCE FILE EXISTS' 371s + '[' success = success ']' 371s + local changes 371s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 371s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes 371s + case "$changes" in 371s + perl -ne 'print if m/^files:/i ... m/^\S/' 371s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 371s + local 'desc=SOURCE IN CHANGES' 371s + shift 371s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 371s dfa974eaf4bfa9d67cc18cee1b69b830 585 devel extra example_1.0.dsc 371s + echo 'SOURCE IN CHANGES EXISTS' 371s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 371s + local 'desc=DEBS IN CHANGES' 371s + shift 371s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_source.changes.files 371s + echo 'DEBS IN CHANGES MISSING' 371s + exec 371s + quirk-clean-fixup 371s + case $cleanmode in 371s + perl -i.unfixed -ne ' 371s print unless 371s $_ eq $last && 371s $_ eq "EXAMPLE RULES TARGET clean\n"; 371s $last = $_; 371s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.results 371s + '[' success = failure ']' 371s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.results 371s + : bm-act-iterate done. 371s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 371s + bm-guess-e-source-e-targets 'gbp-build -b' 371s + local 'some_act=gbp-build -b' 371s + case "$some_act" in 371s + e_source=false 371s + e_targets='build binary' 371s + real_act='gbp-build -b --git-ignore-branch' 371s + bm-act-iterate 371s + for cleanmode in $cleanmodes 371s + for branch in $bm_branches 371s + bm-run-one 371s + local 'args= --clean=git gbp-build -b --git-ignore-branch' 371s + bmid='gbp-build -b,git,indep-arch' 371s + bmid=gbp-build_-b,git,indep-arch 371s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 371s + heading='===== [gbp-build_-b,git,indep-arch] dgit --clean=git gbp-build -b --git-ignore-branch =====' 371s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.output 371s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.expected 371s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.results 371s + bm-compute-expected 371s + require_fail=unexpect 371s + tolerate_fail=unexpect 371s + exec 371s + echo '===== [gbp-build_-b,git,indep-arch] dgit --clean=git gbp-build -b --git-ignore-branch =====' 371s + local eff_cleanmode=git 371s + case "$e_targets" in 371s + case "$act" in 371s + case $eff_cleanmode in 371s + echo 'BUILD-MODES PROGRAM git clean -xdf' 371s + case $eff_cleanmode in 371s + '[' 'xbuild binary' '!=' x ']' 371s + bm-build-deps-ok 371s + case "$branch" in 371s + return 0 371s + for t in $e_targets 371s + bm-build-deps-ok 371s + case "$branch" in 371s + return 0 371s + echo 'EXAMPLE RULES TARGET build' 371s + for t in $e_targets 371s + bm-build-deps-ok 371s + case "$branch" in 371s + return 0 371s + echo 'EXAMPLE RULES TARGET binary' 371s + bm-report-test 'SOURCE FILE' false 371s + local 'desc=SOURCE FILE' 371s + shift 371s + false 371s + echo 'SOURCE FILE MISSING' 371s + bm-report-test 'SOURCE IN CHANGES' false 371s + local 'desc=SOURCE IN CHANGES' 371s + shift 371s + false 371s + echo 'SOURCE IN CHANGES MISSING' 371s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 371s + local 'desc=DEBS IN CHANGES' 371s + shift 371s + expr 'build binary' : '.*binary.*' 371s 12 371s + echo 'DEBS IN CHANGES EXISTS' 371s + exec 371s + git checkout indep-arch 371s Switched to branch 'indep-arch' 371s + git clean -xdf 371s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 371s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 371s + set +o pipefail 371s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.output 371s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -b --git-ignore-branch 371s + local dgit=dgit 371s + pwd 371s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 371s + : ' 371s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 371s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -b --git-ignore-branch 371s | git rev-parse --show-toplevel 371s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 371s | git config -z --get-regexp --local '.*' 371s | git config -z --get-regexp --local '.*' 371s | git config -z --get-regexp --global '.*' 371s | git config -z --get-regexp --system '.*' 371s format , quilt mode gbp 371s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 371s warning: could not open directory 'debian/source/': No such file or directory 371s => `' 371s + git diff --quiet HEAD 371s massage split -b. 371s massage done 2 -b. 371s format , quilt mode gbp 371s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 371s warning: could not open directory 'debian/source/': No such file or directory 371s => `' 371s + git diff --quiet HEAD 371s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 371s BUILD-MODES PROGRAM git clean -xdf 371s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 371s package seems new, not specifying -v 371s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 371s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 371s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 371s gbp:info: Performing the build 371s dpkg-buildpackage: info: source package example 371s dpkg-buildpackage: info: source version 1.0 371s dpkg-buildpackage: info: source distribution unstable 371s dpkg-buildpackage: info: source changed by Ian Jackson 371s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 371s dpkg-buildpackage: info: host architecture ppc64el 372s debian/rules build 372s EXAMPLE RULES TARGET build 372s fakeroot debian/rules binary 372s EXAMPLE RULES TARGET binary 372s dh_install 372s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 372s dh_gencontrol 372s dh_builddeb 372s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 372s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 372s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 372s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 372s dpkg-genbuildinfo --build=binary -O../example_1.0_ppc64el.buildinfo 372s dpkg-genchanges --build=binary -O../example_1.0_ppc64el.changes 372s dpkg-genchanges: info: binary-only upload (no source code included) 372s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 372s dpkg-buildpackage: info: binary-only upload (no source included) 372s dgit ok: build successful 372s 372s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 372s ' 372s + local 'ps=0 0' 372s + set -o pipefail 372s + exec 372s + echo '===== [gbp-build_-b,git,indep-arch] dgit --clean=git gbp-build -b --git-ignore-branch =====' 372s + case $ps in 372s + actual_status=success 372s + case "$require_fail-$tolerate_fail-$actual_status" in 372s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.output 372s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 372s + local 'desc=SOURCE FILE' 372s + shift 372s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 372s + echo 'SOURCE FILE MISSING' 372s + '[' success = success ']' 372s + local changes 372s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 372s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 372s + case "$changes" in 372s + perl -ne 'print if m/^files:/i ... m/^\S/' 372s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 372s + local 'desc=SOURCE IN CHANGES' 372s + shift 372s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 372s + echo 'SOURCE IN CHANGES MISSING' 372s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 372s + local 'desc=DEBS IN CHANGES' 372s + shift 372s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 372s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 372s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 372s + echo 'DEBS IN CHANGES EXISTS' 372s + exec 372s + quirk-clean-fixup 372s + case $cleanmode in 372s + '[' success = failure ']' 372s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.results 372s + for branch in $bm_branches 372s + bm-run-one 372s + local 'args= --clean=git gbp-build -b --git-ignore-branch' 372s + bmid='gbp-build -b,git,bad-build-deps' 372s + bmid=gbp-build_-b,git,bad-build-deps 372s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 372s + heading='===== [gbp-build_-b,git,bad-build-deps] dgit --clean=git gbp-build -b --git-ignore-branch =====' 372s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,bad-build-deps.output 372s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,bad-build-deps.expected 372s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,bad-build-deps.results 372s + bm-compute-expected 372s + require_fail=unexpect 372s + tolerate_fail=unexpect 372s + exec 372s + echo '===== [gbp-build_-b,git,bad-build-deps] dgit --clean=git gbp-build -b --git-ignore-branch =====' 372s + local eff_cleanmode=git 372s + case "$e_targets" in 372s + case "$act" in 372s + case $eff_cleanmode in 372s + echo 'BUILD-MODES PROGRAM git clean -xdf' 372s + case $eff_cleanmode in 372s + '[' 'xbuild binary' '!=' x ']' 372s + bm-build-deps-ok 372s + case "$branch" in 372s + return 1 372s + tolerate_fail=tolerate 372s + for t in $e_targets 372s + bm-build-deps-ok 372s + case "$branch" in 372s + return 1 372s + require_fail=required 372s + echo 'EXAMPLE RULES TARGET build' 372s + for t in $e_targets 372s + bm-build-deps-ok 372s + case "$branch" in 372s + return 1 372s + require_fail=required 372s + echo 'EXAMPLE RULES TARGET binary' 372s + bm-report-test 'SOURCE FILE' false 372s + local 'desc=SOURCE FILE' 372s + shift 372s + false 372s + echo 'SOURCE FILE MISSING' 372s + bm-report-test 'SOURCE IN CHANGES' false 372s + local 'desc=SOURCE IN CHANGES' 372s + shift 372s + false 372s + echo 'SOURCE IN CHANGES MISSING' 372s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 372s + local 'desc=DEBS IN CHANGES' 372s + shift 372s + expr 'build binary' : '.*binary.*' 372s 12 372s + echo 'DEBS IN CHANGES EXISTS' 372s + exec 372s + git checkout bad-build-deps 372s Switched to branch 'bad-build-deps' 372s + git clean -xdf 372s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 372s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 372s + set +o pipefail 372s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -b --git-ignore-branch 372s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,bad-build-deps.output 372s + local dgit=dgit 372s + pwd 372s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 372s + : ' 372s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 372s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -b --git-ignore-branch 372s | git rev-parse --show-toplevel 372s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 372s | git config -z --get-regexp --local '.*' 372s | git config -z --get-regexp --local '.*' 372s | git config -z --get-regexp --global '.*' 372s | git config -z --get-regexp --system '.*' 373s format , quilt mode gbp 373s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 373s warning: could not open directory 'debian/source/': No such file or directory 373s => `' 373s + git diff --quiet HEAD 373s massage split -b. 373s massage done 2 -b. 373s format , quilt mode gbp 373s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 373s warning: could not open directory 'debian/source/': No such file or directory 373s => `' 373s + git diff --quiet HEAD 373s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 373s BUILD-MODES PROGRAM git clean -xdf 373s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 373s package seems new, not specifying -v 373s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 373s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 373s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 373s gbp:info: Performing the build 373s dpkg-buildpackage: info: source package example 373s dpkg-buildpackage: info: source version 1.0 373s dpkg-buildpackage: info: source distribution unstable 373s dpkg-buildpackage: info: source changed by Ian Jackson 373s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 373s dpkg-buildpackage: info: host architecture ppc64el 373s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 373s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 373s dpkg-buildpackage: warning: (Use -d flag to override.) 373s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 373s 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 373s 373s dgit: error: subprocess failed with error exit status 1 373s + local 'ps=255 0' 373s + set -o pipefail 373s + exec 373s + echo '===== [gbp-build_-b,git,bad-build-deps] dgit --clean=git gbp-build -b --git-ignore-branch =====' 373s + case $ps in 373s + actual_status=failure 373s + echo 'OPERATION FAILED' 373s + case "$require_fail-$tolerate_fail-$actual_status" in 373s + echo 'REQUIRED FAILURE' 373s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,git,bad-build-deps.output 373s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 373s + local 'desc=SOURCE FILE' 373s + shift 373s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 373s + echo 'SOURCE FILE MISSING' 373s + '[' failure = success ']' 373s + exec 373s + quirk-clean-fixup 373s + case $cleanmode in 373s + '[' failure = failure ']' 373s + for cleanmode in $cleanmodes 373s + for branch in $bm_branches 373s + bm-run-one 373s + local 'args= --clean=none gbp-build -b --git-ignore-branch' 373s + bmid='gbp-build -b,none,indep-arch' 373s + bmid=gbp-build_-b,none,indep-arch 373s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 373s + heading='===== [gbp-build_-b,none,indep-arch] dgit --clean=none gbp-build -b --git-ignore-branch =====' 373s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.output 373s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.expected 373s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.results 373s + bm-compute-expected 373s + require_fail=unexpect 373s + tolerate_fail=unexpect 373s + exec 373s + echo '===== [gbp-build_-b,none,indep-arch] dgit --clean=none gbp-build -b --git-ignore-branch =====' 373s + local eff_cleanmode=none 373s + case "$e_targets" in 373s + case "$act" in 373s + case $eff_cleanmode in 373s + case $eff_cleanmode in 373s + '[' 'xbuild binary' '!=' x ']' 373s + bm-build-deps-ok 373s + case "$branch" in 373s + return 0 373s + for t in $e_targets 373s + bm-build-deps-ok 373s + case "$branch" in 373s + return 0 373s + echo 'EXAMPLE RULES TARGET build' 373s + for t in $e_targets 373s + bm-build-deps-ok 373s + case "$branch" in 373s + return 0 373s + echo 'EXAMPLE RULES TARGET binary' 373s + bm-report-test 'SOURCE FILE' false 373s + local 'desc=SOURCE FILE' 373s + shift 373s + false 373s + echo 'SOURCE FILE MISSING' 373s + bm-report-test 'SOURCE IN CHANGES' false 373s + local 'desc=SOURCE IN CHANGES' 373s + shift 373s + false 373s + echo 'SOURCE IN CHANGES MISSING' 373s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 373s + local 'desc=DEBS IN CHANGES' 373s + shift 373s + expr 'build binary' : '.*binary.*' 373s 12 373s + echo 'DEBS IN CHANGES EXISTS' 373s + exec 373s + git checkout indep-arch 373s Switched to branch 'indep-arch' 373s + git clean -xdf 373s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 373s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 373s + set +o pipefail 373s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -b --git-ignore-branch 373s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.output 373s + local dgit=dgit 373s + pwd 373s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 373s + : ' 373s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 373s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -b --git-ignore-branch 373s | git rev-parse --show-toplevel 373s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 373s | git config -z --get-regexp --local '.*' 373s | git config -z --get-regexp --local '.*' 373s | git config -z --get-regexp --global '.*' 373s | git config -z --get-regexp --system '.*' 373s format , quilt mode gbp 373s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 373s warning: could not open directory 'debian/source/': No such file or directory 373s => `' 373s + git diff --quiet HEAD 373s massage split -b. 373s massage done 2 -b. 373s format , quilt mode gbp 373s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 373s warning: could not open directory 'debian/source/': No such file or directory 373s => `' 373s + git diff --quiet HEAD 373s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 373s package seems new, not specifying -v 373s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 373s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 373s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 373s gbp:info: Performing the build 373s dpkg-buildpackage: info: source package example 373s dpkg-buildpackage: info: source version 1.0 373s dpkg-buildpackage: info: source distribution unstable 373s dpkg-buildpackage: info: source changed by Ian Jackson 373s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 373s dpkg-buildpackage: info: host architecture ppc64el 374s debian/rules build 374s EXAMPLE RULES TARGET build 374s fakeroot debian/rules binary 374s EXAMPLE RULES TARGET binary 374s dh_install 374s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 374s dh_gencontrol 374s dh_builddeb 374s + exec /usr/bin/dpkg-deb -Znone --build+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 374s debian/example-indep .. 374s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 374s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 374s dpkg-genbuildinfo --build=binary -O../example_1.0_ppc64el.buildinfo 374s dpkg-genchanges --build=binary -O../example_1.0_ppc64el.changes 374s dpkg-genchanges: info: binary-only upload (no source code included) 374s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 374s dpkg-buildpackage: info: binary-only upload (no source included) 374s dgit ok: build successful 374s 374s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 374s ' 374s + local 'ps=0 0' 374s + set -o pipefail 374s + exec 374s + echo '===== [gbp-build_-b,none,indep-arch] dgit --clean=none gbp-build -b --git-ignore-branch =====' 374s + case $ps in 374s + actual_status=success 374s + case "$require_fail-$tolerate_fail-$actual_status" in 374s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.output 374s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 374s + local 'desc=SOURCE FILE' 374s + shift 374s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 374s + echo 'SOURCE FILE MISSING' 374s + '[' success = success ']' 374s + local changes 374s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 374s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 374s + case "$changes" in 374s + perl -ne 'print if m/^files:/i ... m/^\S/' 374s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 374s + local 'desc=SOURCE IN CHANGES' 374s + shift 374s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 374s + echo 'SOURCE IN CHANGES MISSING' 374s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 374s + local 'desc=DEBS IN CHANGES' 374s + shift 374s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 374s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 374s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 374s + echo 'DEBS IN CHANGES EXISTS' 374s + exec 374s + quirk-clean-fixup 374s + case $cleanmode in 374s + '[' success = failure ']' 374s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.results 374s + for branch in $bm_branches 374s + bm-run-one 374s + local 'args= --clean=none gbp-build -b --git-ignore-branch' 374s + bmid='gbp-build -b,none,bad-build-deps' 374s + bmid=gbp-build_-b,none,bad-build-deps 374s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 374s + heading='===== [gbp-build_-b,none,bad-build-deps] dgit --clean=none gbp-build -b --git-ignore-branch =====' 374s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,bad-build-deps.output 374s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,bad-build-deps.expected 374s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,bad-build-deps.results 374s + bm-compute-expected 374s + require_fail=unexpect 374s + tolerate_fail=unexpect 374s + exec 374s + echo '===== [gbp-build_-b,none,bad-build-deps] dgit --clean=none gbp-build -b --git-ignore-branch =====' 374s + local eff_cleanmode=none 374s + case "$e_targets" in 374s + case "$act" in 374s + case $eff_cleanmode in 374s + case $eff_cleanmode in 374s + '[' 'xbuild binary' '!=' x ']' 374s + bm-build-deps-ok 374s + case "$branch" in 374s + return 1 374s + tolerate_fail=tolerate 374s + for t in $e_targets 374s + bm-build-deps-ok 374s + case "$branch" in 374s + return 1 374s + require_fail=required 374s + echo 'EXAMPLE RULES TARGET build' 374s + for t in $e_targets 374s + bm-build-deps-ok 374s + case "$branch" in 374s + return 1 374s + require_fail=required 374s + echo 'EXAMPLE RULES TARGET binary' 374s + bm-report-test 'SOURCE FILE' false 374s + local 'desc=SOURCE FILE' 374s + shift 374s + false 374s + echo 'SOURCE FILE MISSING' 374s + bm-report-test 'SOURCE IN CHANGES' false 374s + local 'desc=SOURCE IN CHANGES' 374s + shift 374s + false 374s + echo 'SOURCE IN CHANGES MISSING' 374s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 374s + local 'desc=DEBS IN CHANGES' 374s + shift 374s + expr 'build binary' : '.*binary.*' 374s 12 374s + echo 'DEBS IN CHANGES EXISTS' 374s + exec 374s + git checkout bad-build-deps 374s Switched to branch 'bad-build-deps' 374s + git clean -xdf 374s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 374s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 374s + set +o pipefail 374s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -b --git-ignore-branch 374s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,bad-build-deps.output 374s + local dgit=dgit 374s + pwd 374s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 374s + : ' 374s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 374s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -b --git-ignore-branch 374s | git rev-parse --show-toplevel 374s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 374s | git config -z --get-regexp --local '.*' 374s | git config -z --get-regexp --local '.*' 374s | git config -z --get-regexp --global '.*' 374s | git config -z --get-regexp --system '.*' 374s format , quilt mode gbp 374s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 374s warning: could not open directory 'debian/source/': No such file or directory 374s => `' 374s + git diff --quiet HEAD 374s massage split -b. 374s massage done 2 -b. 374s format , quilt mode gbp 374s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 374s warning: could not open directory 'debian/source/': No such file or directory 374s => `' 374s + git diff --quiet HEAD 374s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 374s package seems new, not specifying -v 374s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 376s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 376s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 376s gbp:info: Performing the build 376s dpkg-buildpackage: info: source package example 376s dpkg-buildpackage: info: source version 1.0 376s dpkg-buildpackage: info: source distribution unstable 376s dpkg-buildpackage: info: source changed by Ian Jackson 376s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 376s dpkg-buildpackage: info: host architecture ppc64el 376s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 376s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 376s dpkg-buildpackage: warning: (Use -d flag to override.) 376s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 376s 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 376s 376s dgit: error: subprocess failed with error exit status 1 376s + local 'ps=255 0' 376s + set -o pipefail 376s + exec 376s + echo '===== [gbp-build_-b,none,bad-build-deps] dgit --clean=none gbp-build -b --git-ignore-branch =====' 376s + case $ps in 376s + actual_status=failure 376s + echo 'OPERATION FAILED' 376s + case "$require_fail-$tolerate_fail-$actual_status" in 376s + echo 'REQUIRED FAILURE' 376s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,none,bad-build-deps.output 376s + '[' 1 = 1 ']' 376s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 376s + local 'desc=SOURCE FILE' 376s + shift 376s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 376s + echo 'SOURCE FILE MISSING' 376s + '[' failure = success ']' 376s + exec 376s + quirk-clean-fixup 376s + case $cleanmode in 376s + '[' failure = failure ']' 376s + for cleanmode in $cleanmodes 376s + for branch in $bm_branches 376s + bm-run-one 376s + local 'args= --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch' 376s + bmid='gbp-build -b,dpkg-source,no-check,indep-arch' 376s + bmid=gbp-build_-b,dpkg-source,no-check,indep-arch 376s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 376s + heading='===== [gbp-build_-b,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 376s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.output 376s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.expected 376s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.results 376s + bm-compute-expected 376s + require_fail=unexpect 376s + tolerate_fail=unexpect 376s + exec 376s + echo '===== [gbp-build_-b,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 376s + local eff_cleanmode=dpkg-source,no-check 376s + case "$e_targets" in 376s + case "$act" in 376s + case $eff_cleanmode in 376s + bm-build-deps-ok 376s + case "$branch" in 376s + return 0 376s + echo 'EXAMPLE RULES TARGET clean' 376s + case $eff_cleanmode in 376s + '[' 'xbuild binary' '!=' x ']' 376s + bm-build-deps-ok 376s + case "$branch" in 376s + return 0 376s + for t in $e_targets 376s + bm-build-deps-ok 376s + case "$branch" in 376s + return 0 376s + echo 'EXAMPLE RULES TARGET build' 376s + for t in $e_targets 376s + bm-build-deps-ok 376s + case "$branch" in 376s + return 0 376s + echo 'EXAMPLE RULES TARGET binary' 376s + bm-report-test 'SOURCE FILE' false 376s + local 'desc=SOURCE FILE' 376s + shift 376s + false 376s + echo 'SOURCE FILE MISSING' 376s + bm-report-test 'SOURCE IN CHANGES' false 376s + local 'desc=SOURCE IN CHANGES' 376s + shift 376s + false 376s + echo 'SOURCE IN CHANGES MISSING' 376s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 376s + local 'desc=DEBS IN CHANGES' 376s + shift 376s + expr 'build binary' : '.*binary.*' 376s 12 376s + echo 'DEBS IN CHANGES EXISTS' 376s + exec 376s + git checkout indep-arch 376s Switched to branch 'indep-arch' 376s + git clean -xdf 376s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 376s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 376s + set +o pipefail 376s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch 376s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.output 376s + local dgit=dgit 376s + pwd 376s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 376s + : ' 376s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 376s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch 376s | git rev-parse --show-toplevel 376s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 376s | git config -z --get-regexp --local '.*' 376s | git config -z --get-regexp --local '.*' 376s | git config -z --get-regexp --global '.*' 376s | git config -z --get-regexp --system '.*' 376s format , quilt mode gbp 376s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 376s warning: could not open directory 'debian/source/': No such file or directory 376s => `' 376s + git diff --quiet HEAD 376s massage split -b. 376s massage done 2 -b. 376s format , quilt mode gbp 376s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 376s warning: could not open directory 'debian/source/': No such file or directory 376s => `' 376s + git diff --quiet HEAD 376s 376s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 376s dgit: Have to apply the patches - making the tree dirty. 376s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 376s 376s + dpkg-source --before-build . 376s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 376s dpkg-buildpackage: info: source package example 376s dpkg-buildpackage: info: source version 1.0 376s dpkg-buildpackage: info: source distribution unstable 376s dpkg-buildpackage: info: source changed by Ian Jackson 376s fakeroot debian/rules clean 376s EXAMPLE RULES TARGET clean 376s dh_clean 376s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 376s dgit: Unapplying patches again to tidy up the tree. 376s + dpkg-source --after-build . 376s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 376s package seems new, not specifying -v 376s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 376s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 376s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 376s gbp:info: Performing the build 376s dpkg-buildpackage: info: source package example 376s dpkg-buildpackage: info: source version 1.0 376s dpkg-buildpackage: info: source distribution unstable 376s dpkg-buildpackage: info: source changed by Ian Jackson 376s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 376s dpkg-buildpackage: info: host architecture ppc64el 376s debian/rules build 376s EXAMPLE RULES TARGET build 376s fakeroot debian/rules binary 376s EXAMPLE RULES TARGET binary 376s dh_install 376s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 376s dh_gencontrol 376s dh_builddeb 376s + exec /usr/bin/dpkg-deb -Znone --build+ debian/example-indep .. 376s exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 376s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 376s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 376s dpkg-genbuildinfo --build=binary -O../example_1.0_ppc64el.buildinfo 376s dpkg-genchanges --build=binary -O../example_1.0_ppc64el.changes 376s dpkg-genchanges: info: binary-only upload (no source code included) 376s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 376s dpkg-buildpackage: info: binary-only upload (no source included) 376s dgit ok: build successful 376s 376s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 376s ' 376s + local 'ps=0 0' 376s + set -o pipefail 376s + exec 376s + echo '===== [gbp-build_-b,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 376s + case $ps in 376s + actual_status=success 376s + case "$require_fail-$tolerate_fail-$actual_status" in 376s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.output 376s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 376s + local 'desc=SOURCE FILE' 376s + shift 376s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 376s + echo 'SOURCE FILE MISSING' 376s + '[' success = success ']' 376s + local changes 376s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 376s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 376s + case "$changes" in 376s + perl -ne 'print if m/^files:/i ... m/^\S/' 376s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 376s + local 'desc=SOURCE IN CHANGES' 376s + shift 376s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 376s + echo 'SOURCE IN CHANGES MISSING' 376s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 376s + local 'desc=DEBS IN CHANGES' 376s + shift 376s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 376s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 376s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 376s + echo 'DEBS IN CHANGES EXISTS' 376s + exec 376s + quirk-clean-fixup 376s + case $cleanmode in 376s + perl -i.unfixed -ne ' 376s print unless 376s $_ eq $last && 376s $_ eq "EXAMPLE RULES TARGET clean\n"; 376s $last = $_; 376s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.results 376s + '[' success = failure ']' 376s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.results 376s + for branch in $bm_branches 376s + bm-run-one 376s + local 'args= --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch' 376s + bmid='gbp-build -b,dpkg-source,no-check,bad-build-deps' 376s + bmid=gbp-build_-b,dpkg-source,no-check,bad-build-deps 376s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 376s + heading='===== [gbp-build_-b,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 376s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.output 376s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.expected 376s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.results 376s + bm-compute-expected 376s + require_fail=unexpect 376s + tolerate_fail=unexpect 376s + exec 376s + echo '===== [gbp-build_-b,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 376s + local eff_cleanmode=dpkg-source,no-check 376s + case "$e_targets" in 376s + case "$act" in 376s + case $eff_cleanmode in 376s + bm-build-deps-ok 376s + case "$branch" in 376s + return 1 376s + tolerate_fail=tolerate 376s + echo 'EXAMPLE RULES TARGET clean' 376s + case $eff_cleanmode in 376s + '[' 'xbuild binary' '!=' x ']' 376s + bm-build-deps-ok 376s + case "$branch" in 376s + return 1 376s + tolerate_fail=tolerate 376s + for t in $e_targets 376s + bm-build-deps-ok 376s + case "$branch" in 376s + return 1 376s + require_fail=required 376s + echo 'EXAMPLE RULES TARGET build' 376s + for t in $e_targets 376s + bm-build-deps-ok 376s + case "$branch" in 376s + return 1 376s + require_fail=required 376s + echo 'EXAMPLE RULES TARGET binary' 376s + bm-report-test 'SOURCE FILE' false 376s + local 'desc=SOURCE FILE' 376s + shift 376s + false 376s + echo 'SOURCE FILE MISSING' 376s + bm-report-test 'SOURCE IN CHANGES' false 376s + local 'desc=SOURCE IN CHANGES' 376s + shift 376s + false 376s + echo 'SOURCE IN CHANGES MISSING' 376s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 376s + local 'desc=DEBS IN CHANGES' 376s + shift 376s + expr 'build binary' : '.*binary.*' 376s 12 376s + echo 'DEBS IN CHANGES EXISTS' 376s + exec 376s + git checkout bad-build-deps 376s Switched to branch 'bad-build-deps' 376s + git clean -xdf 376s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 376s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 376s + set +o pipefail 376s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch 376s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.output 376s + local dgit=dgit 376s + pwd 376s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 376s + : ' 376s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 376s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch 377s | git rev-parse --show-toplevel 377s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 377s | git config -z --get-regexp --local '.*' 377s | git config -z --get-regexp --local '.*' 377s | git config -z --get-regexp --global '.*' 377s | git config -z --get-regexp --system '.*' 377s format , quilt mode gbp 377s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 377s warning: could not open directory 'debian/source/': No such file or directory 377s => `' 377s + git diff --quiet HEAD 377s massage split -b. 377s massage done 2 -b. 377s format , quilt mode gbp 377s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 377s warning: could not open directory 'debian/source/': No such file or directory 377s => `' 377s + git diff --quiet HEAD 377s 377s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 377s dgit: Have to apply the patches - making the tree dirty. 377s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 377s 377s + dpkg-source --before-build . 377s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 377s dpkg-buildpackage: info: source package example 377s dpkg-buildpackage: info: source version 1.0 377s dpkg-buildpackage: info: source distribution unstable 377s dpkg-buildpackage: info: source changed by Ian Jackson 377s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 377s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 377s dpkg-buildpackage: warning: (Use -d flag to override.) 377s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 377s 377s dgit: error: subprocess failed with error exit status 3 377s + local 'ps=255 0' 377s + set -o pipefail 377s + exec 377s + echo '===== [gbp-build_-b,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 377s + case $ps in 377s + actual_status=failure 377s + echo 'OPERATION FAILED' 377s + case "$require_fail-$tolerate_fail-$actual_status" in 377s + echo 'REQUIRED FAILURE' 377s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.output 377s + '[' 1 = 1 ']' 377s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 377s + local 'desc=SOURCE FILE' 377s + shift 377s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 377s + echo 'SOURCE FILE MISSING' 377s + '[' failure = success ']' 377s + exec 377s + quirk-clean-fixup 377s + case $cleanmode in 377s + perl -i.unfixed -ne ' 377s print unless 377s $_ eq $last && 377s $_ eq "EXAMPLE RULES TARGET clean\n"; 377s $last = $_; 377s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.results 377s + '[' failure = failure ']' 377s + for cleanmode in $cleanmodes 377s + for branch in $bm_branches 377s + bm-run-one 377s + local 'args= --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch' 377s + bmid='gbp-build -b,dpkg-source-d,no-check,indep-arch' 377s + bmid=gbp-build_-b,dpkg-source-d,no-check,indep-arch 377s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 377s + heading='===== [gbp-build_-b,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch =====' 377s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.output 377s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.expected 377s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.results 377s + bm-compute-expected 377s + require_fail=unexpect 377s + tolerate_fail=unexpect 377s + exec 377s + echo '===== [gbp-build_-b,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch =====' 377s + local eff_cleanmode=dpkg-source-d,no-check 377s + case "$e_targets" in 377s + case "$act" in 377s + case $eff_cleanmode in 377s + echo 'EXAMPLE RULES TARGET clean' 377s + case $eff_cleanmode in 377s + '[' 'xbuild binary' '!=' x ']' 377s + bm-build-deps-ok 377s + case "$branch" in 377s + return 0 377s + for t in $e_targets 377s + bm-build-deps-ok 377s + case "$branch" in 377s + return 0 377s + echo 'EXAMPLE RULES TARGET build' 377s + for t in $e_targets 377s + bm-build-deps-ok 377s + case "$branch" in 377s + return 0 377s + echo 'EXAMPLE RULES TARGET binary' 377s + bm-report-test 'SOURCE FILE' false 377s + local 'desc=SOURCE FILE' 377s + shift 377s + false 377s + echo 'SOURCE FILE MISSING' 377s + bm-report-test 'SOURCE IN CHANGES' false 377s + local 'desc=SOURCE IN CHANGES' 377s + shift 377s + false 377s + echo 'SOURCE IN CHANGES MISSING' 377s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 377s + local 'desc=DEBS IN CHANGES' 377s + shift 377s + expr 'build binary' : '.*binary.*' 377s 12 377s + echo 'DEBS IN CHANGES EXISTS' 377s + exec 377s + git checkout indep-arch 377s Switched to branch 'indep-arch' 377s + git clean -xdf 377s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 377s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 377s + set +o pipefail 377s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch 377s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.output 377s + local dgit=dgit 377s + pwd 377s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 377s + : ' 377s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 377s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch 377s | git rev-parse --show-toplevel 377s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 377s | git config -z --get-regexp --local '.*' 377s | git config -z --get-regexp --local '.*' 377s | git config -z --get-regexp --global '.*' 377s | git config -z --get-regexp --system '.*' 377s format , quilt mode gbp 377s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 377s warning: could not open directory 'debian/source/': No such file or directory 377s => `' 377s + git diff --quiet HEAD 377s massage split -b. 377s massage done 2 -b. 377s format , quilt mode gbp 377s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 377s warning: could not open directory 'debian/source/': No such file or directory 377s => `' 377s + git diff --quiet HEAD 377s 377s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 377s dgit: Have to apply the patches - making the tree dirty. 377s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 377s 377s + dpkg-source --before-build . 377s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 377s dpkg-buildpackage: info: source package example 377s dpkg-buildpackage: info: source version 1.0 377s dpkg-buildpackage: info: source distribution unstable 377s dpkg-buildpackage: info: source changed by Ian Jackson 377s fakeroot debian/rules clean 377s EXAMPLE RULES TARGET clean 377s dh_clean 377s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 377s dgit: Unapplying patches again to tidy up the tree. 377s + dpkg-source --after-build . 378s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 378s package seems new, not specifying -v 378s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 378s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 378s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 378s gbp:info: Performing the build 378s dpkg-buildpackage: info: source package example 378s dpkg-buildpackage: info: source version 1.0 378s dpkg-buildpackage: info: source distribution unstable 378s dpkg-buildpackage: info: source changed by Ian Jackson 378s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 378s dpkg-buildpackage: info: host architecture ppc64el 378s debian/rules build 378s EXAMPLE RULES TARGET build 378s fakeroot debian/rules binary 378s EXAMPLE RULES TARGET binary 378s dh_install 378s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 378s dh_gencontrol 378s dh_builddeb 378s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 378s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 378s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 378s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 378s dpkg-genbuildinfo --build=binary -O../example_1.0_ppc64el.buildinfo 378s dpkg-genchanges --build=binary -O../example_1.0_ppc64el.changes 378s dpkg-genchanges: info: binary-only upload (no source code included) 378s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 379s dpkg-buildpackage: info: binary-only upload (no source included) 379s dgit ok: build successful 379s 379s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 379s ' 379s + local 'ps=0 0' 379s + set -o pipefail 379s + exec 379s + echo '===== [gbp-build_-b,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch =====' 379s + case $ps in 379s + actual_status=success 379s + case "$require_fail-$tolerate_fail-$actual_status" in 379s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.output 379s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 379s + local 'desc=SOURCE FILE' 379s + shift 379s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 379s + echo 'SOURCE FILE MISSING' 379s + '[' success = success ']' 379s + local changes 379s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 379s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 379s + case "$changes" in 379s + perl -ne 'print if m/^files:/i ... m/^\S/' 379s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 379s + local 'desc=SOURCE IN CHANGES' 379s + shift 379s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 379s + echo 'SOURCE IN CHANGES MISSING' 379s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 379s + local 'desc=DEBS IN CHANGES' 379s + shift 379s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 379s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 379s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 379s + echo 'DEBS IN CHANGES EXISTS' 379s + exec 379s + quirk-clean-fixup 379s + case $cleanmode in 379s + perl -i.unfixed -ne ' 379s print unless 379s $_ eq $last && 379s $_ eq "EXAMPLE RULES TARGET clean\n"; 379s $last = $_; 379s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.results 379s + '[' success = failure ']' 379s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.results 379s + for branch in $bm_branches 379s + bm-run-one 379s + local 'args= --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch' 379s + bmid='gbp-build -b,dpkg-source-d,no-check,bad-build-deps' 379s + bmid=gbp-build_-b,dpkg-source-d,no-check,bad-build-deps 379s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 379s + 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 =====' 379s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.output 379s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.expected 379s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.results 379s + bm-compute-expected 379s + require_fail=unexpect 379s + tolerate_fail=unexpect 379s + exec 379s + 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 =====' 379s + local eff_cleanmode=dpkg-source-d,no-check 379s + case "$e_targets" in 379s + case "$act" in 379s + case $eff_cleanmode in 379s + echo 'EXAMPLE RULES TARGET clean' 379s + case $eff_cleanmode in 379s + '[' 'xbuild binary' '!=' x ']' 379s + bm-build-deps-ok 379s + case "$branch" in 379s + return 1 379s + tolerate_fail=tolerate 379s + for t in $e_targets 379s + bm-build-deps-ok 379s + case "$branch" in 379s + return 1 379s + require_fail=required 379s + echo 'EXAMPLE RULES TARGET build' 379s + for t in $e_targets 379s + bm-build-deps-ok 379s + case "$branch" in 379s + return 1 379s + require_fail=required 379s + echo 'EXAMPLE RULES TARGET binary' 379s + bm-report-test 'SOURCE FILE' false 379s + local 'desc=SOURCE FILE' 379s + shift 379s + false 379s + echo 'SOURCE FILE MISSING' 379s + bm-report-test 'SOURCE IN CHANGES' false 379s + local 'desc=SOURCE IN CHANGES' 379s + shift 379s + false 379s + echo 'SOURCE IN CHANGES MISSING' 379s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 379s + local 'desc=DEBS IN CHANGES' 379s + shift 379s + expr 'build binary' : '.*binary.*' 379s 12 379s + echo 'DEBS IN CHANGES EXISTS' 379s + exec 379s + git checkout bad-build-deps 379s Switched to branch 'bad-build-deps' 379s + git clean -xdf 379s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 379s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 379s + set +o pipefail 379s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.output 379s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch 379s + local dgit=dgit 379s + pwd 379s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 379s + : ' 379s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 379s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch 379s | git rev-parse --show-toplevel 379s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 379s | git config -z --get-regexp --local '.*' 379s | git config -z --get-regexp --local '.*' 379s | git config -z --get-regexp --global '.*' 379s | git config -z --get-regexp --system '.*' 379s format , quilt mode gbp 379s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 379s warning: could not open directory 'debian/source/': No such file or directory 379s => `' 379s + git diff --quiet HEAD 379s massage split -b. 379s massage done 2 -b. 379s format , quilt mode gbp 379s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 379s warning: could not open directory 'debian/source/': No such file or directory 379s => `' 379s + git diff --quiet HEAD 379s 379s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 379s dgit: Have to apply the patches - making the tree dirty. 379s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 379s 379s + dpkg-source --before-build . 379s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 379s dpkg-buildpackage: info: source package example 379s dpkg-buildpackage: info: source version 1.0 379s dpkg-buildpackage: info: source distribution unstable 379s dpkg-buildpackage: info: source changed by Ian Jackson 379s fakeroot debian/rules clean 379s EXAMPLE RULES TARGET clean 379s dh_clean 379s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 379s dgit: Unapplying patches again to tidy up the tree. 379s + dpkg-source --after-build . 379s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 379s package seems new, not specifying -v 379s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 379s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 379s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 379s gbp:info: Performing the build 379s dpkg-buildpackage: info: source package example 379s dpkg-buildpackage: info: source version 1.0 379s dpkg-buildpackage: info: source distribution unstable 379s dpkg-buildpackage: info: source changed by Ian Jackson 379s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 379s dpkg-buildpackage: info: host architecture ppc64el 380s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 380s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 380s dpkg-buildpackage: warning: (Use -d flag to override.) 380s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 380s 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 380s 380s dgit: error: subprocess failed with error exit status 1 380s + local 'ps=255 0' 380s + set -o pipefail 380s + exec 380s + 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 =====' 380s + case $ps in 380s + actual_status=failure 380s + echo 'OPERATION FAILED' 380s + case "$require_fail-$tolerate_fail-$actual_status" in 380s + echo 'REQUIRED FAILURE' 380s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.output 380s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 380s + local 'desc=SOURCE FILE' 380s + shift 380s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 380s + echo 'SOURCE FILE MISSING' 380s + '[' failure = success ']' 380s + exec 380s + quirk-clean-fixup 380s + case $cleanmode in 380s + perl -i.unfixed -ne ' 380s print unless 380s $_ eq $last && 380s $_ eq "EXAMPLE RULES TARGET clean\n"; 380s $last = $_; 380s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.results 380s + '[' failure = failure ']' 380s + : bm-act-iterate done. 380s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 380s + bm-guess-e-source-e-targets 'gbp-build -B' 380s + local 'some_act=gbp-build -B' 380s + case "$some_act" in 380s + e_source=false 380s + e_targets='build-arch binary-arch' 380s + real_act='gbp-build -B --git-ignore-branch' 380s + bm-act-iterate 380s + for cleanmode in $cleanmodes 380s + for branch in $bm_branches 380s + bm-run-one 380s + local 'args= --clean=git gbp-build -B --git-ignore-branch' 380s + bmid='gbp-build -B,git,indep-arch' 380s + bmid=gbp-build_-B,git,indep-arch 380s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 380s + heading='===== [gbp-build_-B,git,indep-arch] dgit --clean=git gbp-build -B --git-ignore-branch =====' 380s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.output 380s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.expected 380s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.results 380s + bm-compute-expected 380s + require_fail=unexpect 380s + tolerate_fail=unexpect 380s + exec 380s + echo '===== [gbp-build_-B,git,indep-arch] dgit --clean=git gbp-build -B --git-ignore-branch =====' 380s + local eff_cleanmode=git 380s + case "$e_targets" in 380s + case "$act" in 380s + case $eff_cleanmode in 380s + echo 'BUILD-MODES PROGRAM git clean -xdf' 380s + case $eff_cleanmode in 380s + '[' 'xbuild-arch binary-arch' '!=' x ']' 380s + bm-build-deps-ok 380s + case "$branch" in 380s + return 0 380s + for t in $e_targets 380s + bm-build-deps-ok 380s + case "$branch" in 380s + return 0 380s + echo 'EXAMPLE RULES TARGET build-arch' 380s + for t in $e_targets 380s + bm-build-deps-ok 380s + case "$branch" in 380s + return 0 380s + echo 'EXAMPLE RULES TARGET binary-arch' 380s + bm-report-test 'SOURCE FILE' false 380s + local 'desc=SOURCE FILE' 380s + shift 380s + false 380s + echo 'SOURCE FILE MISSING' 380s + bm-report-test 'SOURCE IN CHANGES' false 380s + local 'desc=SOURCE IN CHANGES' 380s + shift 380s + false 380s + echo 'SOURCE IN CHANGES MISSING' 380s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 380s + local 'desc=DEBS IN CHANGES' 380s + shift 380s + expr 'build-arch binary-arch' : '.*binary.*' 380s 22 380s + echo 'DEBS IN CHANGES EXISTS' 380s + exec 380s + git checkout indep-arch 380s Switched to branch 'indep-arch' 380s + git clean -xdf 380s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 380s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 380s + set +o pipefail 380s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -B --git-ignore-branch 380s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.output 380s + local dgit=dgit 380s + pwd 380s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 380s + : ' 380s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 380s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -B --git-ignore-branch 380s | git rev-parse --show-toplevel 380s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 380s | git config -z --get-regexp --local '.*' 380s | git config -z --get-regexp --local '.*' 380s | git config -z --get-regexp --global '.*' 380s | git config -z --get-regexp --system '.*' 380s format , quilt mode gbp 380s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 380s warning: could not open directory 'debian/source/': No such file or directory 380s => `' 380s + git diff --quiet HEAD 380s massage split -B. 380s massage done 2 -B. 380s format , quilt mode gbp 380s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 380s warning: could not open directory 'debian/source/': No such file or directory 380s => `' 380s + git diff --quiet HEAD 380s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 380s BUILD-MODES PROGRAM git clean -xdf 380s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 380s package seems new, not specifying -v 380s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 380s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 380s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 380s gbp:info: Performing the build 380s dpkg-buildpackage: info: source package example 380s dpkg-buildpackage: info: source version 1.0 380s dpkg-buildpackage: info: source distribution unstable 380s dpkg-buildpackage: info: source changed by Ian Jackson 380s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 380s dpkg-buildpackage: info: host architecture ppc64el 380s debian/rules build-arch 380s EXAMPLE RULES TARGET build-arch 380s fakeroot debian/rules binary-arch 380s EXAMPLE RULES TARGET binary-arch 380s dh_install 380s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 380s dh_gencontrol 380s dh_builddeb 380s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep ..+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 380s 380s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 380s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 380s dpkg-genbuildinfo --build=any -O../example_1.0_ppc64el.buildinfo 381s dpkg-genchanges --build=any -O../example_1.0_ppc64el.changes 381s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 381s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 381s dpkg-buildpackage: info: binary-only upload (no source included) 381s dgit ok: build successful 381s 381s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 381s ' 381s + local 'ps=0 0' 381s + set -o pipefail 381s + exec 381s + echo '===== [gbp-build_-B,git,indep-arch] dgit --clean=git gbp-build -B --git-ignore-branch =====' 381s + case $ps in 381s + actual_status=success 381s + case "$require_fail-$tolerate_fail-$actual_status" in 381s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.output 381s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 381s + local 'desc=SOURCE FILE' 381s + shift 381s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 381s + echo 'SOURCE FILE MISSING' 381s + '[' success = success ']' 381s + local changes 381s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 381s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 381s + case "$changes" in 381s + perl -ne 'print if m/^files:/i ... m/^\S/' 381s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 381s + local 'desc=SOURCE IN CHANGES' 381s + shift 381s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 381s + echo 'SOURCE IN CHANGES MISSING' 381s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 381s + local 'desc=DEBS IN CHANGES' 381s + shift 381s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 381s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 381s + echo 'DEBS IN CHANGES EXISTS' 381s + exec 381s + quirk-clean-fixup 381s + case $cleanmode in 381s + '[' success = failure ']' 381s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.results 381s + for branch in $bm_branches 381s + bm-run-one 381s + local 'args= --clean=git gbp-build -B --git-ignore-branch' 381s + bmid='gbp-build -B,git,bad-build-deps' 381s + bmid=gbp-build_-B,git,bad-build-deps 381s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 381s + heading='===== [gbp-build_-B,git,bad-build-deps] dgit --clean=git gbp-build -B --git-ignore-branch =====' 381s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,bad-build-deps.output 381s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,bad-build-deps.expected 381s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,bad-build-deps.results 381s + bm-compute-expected 381s + require_fail=unexpect 381s + tolerate_fail=unexpect 381s + exec 381s + echo '===== [gbp-build_-B,git,bad-build-deps] dgit --clean=git gbp-build -B --git-ignore-branch =====' 381s + local eff_cleanmode=git 381s + case "$e_targets" in 381s + case "$act" in 381s + case $eff_cleanmode in 381s + echo 'BUILD-MODES PROGRAM git clean -xdf' 381s + case $eff_cleanmode in 381s + '[' 'xbuild-arch binary-arch' '!=' x ']' 381s + bm-build-deps-ok 381s + case "$branch" in 381s + return 1 381s + tolerate_fail=tolerate 381s + for t in $e_targets 381s + bm-build-deps-ok 381s + case "$branch" in 381s + return 1 381s + require_fail=required 381s + echo 'EXAMPLE RULES TARGET build-arch' 381s + for t in $e_targets 381s + bm-build-deps-ok 381s + case "$branch" in 381s + return 1 381s + require_fail=required 381s + echo 'EXAMPLE RULES TARGET binary-arch' 381s + bm-report-test 'SOURCE FILE' false 381s + local 'desc=SOURCE FILE' 381s + shift 381s + false 381s + echo 'SOURCE FILE MISSING' 381s + bm-report-test 'SOURCE IN CHANGES' false 381s + local 'desc=SOURCE IN CHANGES' 381s + shift 381s + false 381s + echo 'SOURCE IN CHANGES MISSING' 381s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 381s + local 'desc=DEBS IN CHANGES' 381s + shift 381s + expr 'build-arch binary-arch' : '.*binary.*' 381s 22 381s + echo 'DEBS IN CHANGES EXISTS' 381s + exec 381s + git checkout bad-build-deps 381s Switched to branch 'bad-build-deps' 381s + git clean -xdf 381s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 381s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 381s + set +o pipefail 381s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -B --git-ignore-branch 381s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,bad-build-deps.output 381s + local dgit=dgit 381s + pwd 381s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 381s + : ' 381s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 381s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -B --git-ignore-branch 381s | git rev-parse --show-toplevel 381s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 381s | git config -z --get-regexp --local '.*' 381s | git config -z --get-regexp --local '.*' 381s | git config -z --get-regexp --global '.*' 381s | git config -z --get-regexp --system '.*' 381s format , quilt mode gbp 381s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 381s warning: could not open directory 'debian/source/': No such file or directory 381s => `' 381s + git diff --quiet HEAD 381s massage split -B. 381s massage done 2 -B. 381s format , quilt mode gbp 381s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 381s warning: could not open directory 'debian/source/': No such file or directory 381s => `' 381s + git diff --quiet HEAD 381s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 381s BUILD-MODES PROGRAM git clean -xdf 381s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 381s package seems new, not specifying -v 381s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 381s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 381s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 381s gbp:info: Performing the build 381s dpkg-buildpackage: info: source package example 381s dpkg-buildpackage: info: source version 1.0 381s dpkg-buildpackage: info: source distribution unstable 381s dpkg-buildpackage: info: source changed by Ian Jackson 381s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 381s dpkg-buildpackage: info: host architecture ppc64el 381s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 381s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 381s dpkg-buildpackage: warning: (Use -d flag to override.) 381s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 381s 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 381s 381s dgit: error: subprocess failed with error exit status 1 381s + local 'ps=255 0' 381s + set -o pipefail 381s + exec 381s + echo '===== [gbp-build_-B,git,bad-build-deps] dgit --clean=git gbp-build -B --git-ignore-branch =====' 381s + case $ps in 381s + actual_status=failure 381s + echo 'OPERATION FAILED' 381s + case "$require_fail-$tolerate_fail-$actual_status" in 381s + echo 'REQUIRED FAILURE' 381s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,git,bad-build-deps.output 381s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 381s + local 'desc=SOURCE FILE' 381s + shift 381s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 381s + echo 'SOURCE FILE MISSING' 381s + '[' failure = success ']' 381s + exec 381s + quirk-clean-fixup 381s + case $cleanmode in 381s + '[' failure = failure ']' 381s + for cleanmode in $cleanmodes 381s + for branch in $bm_branches 381s + bm-run-one 381s + local 'args= --clean=none gbp-build -B --git-ignore-branch' 381s + bmid='gbp-build -B,none,indep-arch' 381s + bmid=gbp-build_-B,none,indep-arch 381s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 381s + heading='===== [gbp-build_-B,none,indep-arch] dgit --clean=none gbp-build -B --git-ignore-branch =====' 381s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.output 381s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.expected 381s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.results 381s + bm-compute-expected 381s + require_fail=unexpect 381s + tolerate_fail=unexpect 381s + exec 381s + echo '===== [gbp-build_-B,none,indep-arch] dgit --clean=none gbp-build -B --git-ignore-branch =====' 381s + local eff_cleanmode=none 381s + case "$e_targets" in 381s + case "$act" in 381s + case $eff_cleanmode in 381s + case $eff_cleanmode in 381s + '[' 'xbuild-arch binary-arch' '!=' x ']' 381s + bm-build-deps-ok 381s + case "$branch" in 381s + return 0 381s + for t in $e_targets 381s + bm-build-deps-ok 381s + case "$branch" in 381s + return 0 381s + echo 'EXAMPLE RULES TARGET build-arch' 381s + for t in $e_targets 381s + bm-build-deps-ok 381s + case "$branch" in 381s + return 0 381s + echo 'EXAMPLE RULES TARGET binary-arch' 381s + bm-report-test 'SOURCE FILE' false 381s + local 'desc=SOURCE FILE' 381s + shift 381s + false 381s + echo 'SOURCE FILE MISSING' 381s + bm-report-test 'SOURCE IN CHANGES' false 381s + local 'desc=SOURCE IN CHANGES' 381s + shift 381s + false 381s + echo 'SOURCE IN CHANGES MISSING' 381s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 381s + local 'desc=DEBS IN CHANGES' 381s + shift 381s + expr 'build-arch binary-arch' : '.*binary.*' 381s 22 381s + echo 'DEBS IN CHANGES EXISTS' 381s + exec 381s + git checkout indep-arch 381s Switched to branch 'indep-arch' 381s + git clean -xdf 381s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 381s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 381s + set +o pipefail 381s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -B --git-ignore-branch 381s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.output 381s + local dgit=dgit 381s + pwd 381s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 381s + : ' 381s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 381s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -B --git-ignore-branch 382s | git rev-parse --show-toplevel 382s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 382s | git config -z --get-regexp --local '.*' 382s | git config -z --get-regexp --local '.*' 382s | git config -z --get-regexp --global '.*' 382s | git config -z --get-regexp --system '.*' 382s format , quilt mode gbp 382s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 382s warning: could not open directory 'debian/source/': No such file or directory 382s => `' 382s + git diff --quiet HEAD 382s massage split -B. 382s massage done 2 -B. 382s format , quilt mode gbp 382s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 382s warning: could not open directory 'debian/source/': No such file or directory 382s => `' 382s + git diff --quiet HEAD 382s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 382s package seems new, not specifying -v 382s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 382s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 382s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 382s gbp:info: Performing the build 382s dpkg-buildpackage: info: source package example 382s dpkg-buildpackage: info: source version 1.0 382s dpkg-buildpackage: info: source distribution unstable 382s dpkg-buildpackage: info: source changed by Ian Jackson 382s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 382s dpkg-buildpackage: info: host architecture ppc64el 382s debian/rules build-arch 382s EXAMPLE RULES TARGET build-arch 382s fakeroot debian/rules binary-arch 382s EXAMPLE RULES TARGET binary-arch 382s dh_install 382s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 382s dh_gencontrol 382s dh_builddeb 382s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 382s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 382s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 382s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 382s dpkg-genbuildinfo --build=any -O../example_1.0_ppc64el.buildinfo 382s dpkg-genchanges --build=any -O../example_1.0_ppc64el.changes 382s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 382s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 383s dpkg-buildpackage: info: binary-only upload (no source included) 383s dgit ok: build successful 383s 383s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 383s ' 383s + local 'ps=0 0' 383s + set -o pipefail 383s + exec 383s + echo '===== [gbp-build_-B,none,indep-arch] dgit --clean=none gbp-build -B --git-ignore-branch =====' 383s + case $ps in 383s + actual_status=success 383s + case "$require_fail-$tolerate_fail-$actual_status" in 383s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.output 383s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 383s + local 'desc=SOURCE FILE' 383s + shift 383s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 383s + echo 'SOURCE FILE MISSING' 383s + '[' success = success ']' 383s + local changes 383s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 383s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 383s + case "$changes" in 383s + perl -ne 'print if m/^files:/i ... m/^\S/' 383s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 383s + local 'desc=SOURCE IN CHANGES' 383s + shift 383s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 383s + echo 'SOURCE IN CHANGES MISSING' 383s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 383s + local 'desc=DEBS IN CHANGES' 383s + shift 383s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 383s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 383s + echo 'DEBS IN CHANGES EXISTS' 383s + exec 383s + quirk-clean-fixup 383s + case $cleanmode in 383s + '[' success = failure ']' 383s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.results 383s + for branch in $bm_branches 383s + bm-run-one 383s + local 'args= --clean=none gbp-build -B --git-ignore-branch' 383s + bmid='gbp-build -B,none,bad-build-deps' 383s + bmid=gbp-build_-B,none,bad-build-deps 383s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 383s + heading='===== [gbp-build_-B,none,bad-build-deps] dgit --clean=none gbp-build -B --git-ignore-branch =====' 383s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,bad-build-deps.output 383s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,bad-build-deps.expected 383s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,bad-build-deps.results 383s + bm-compute-expected 383s + require_fail=unexpect 383s + tolerate_fail=unexpect 383s + exec 383s + echo '===== [gbp-build_-B,none,bad-build-deps] dgit --clean=none gbp-build -B --git-ignore-branch =====' 383s + local eff_cleanmode=none 383s + case "$e_targets" in 383s + case "$act" in 383s + case $eff_cleanmode in 383s + case $eff_cleanmode in 383s + '[' 'xbuild-arch binary-arch' '!=' x ']' 383s + bm-build-deps-ok 383s + case "$branch" in 383s + return 1 383s + tolerate_fail=tolerate 383s + for t in $e_targets 383s + bm-build-deps-ok 383s + case "$branch" in 383s + return 1 383s + require_fail=required 383s + echo 'EXAMPLE RULES TARGET build-arch' 383s + for t in $e_targets 383s + bm-build-deps-ok 383s + case "$branch" in 383s + return 1 383s + require_fail=required 383s + echo 'EXAMPLE RULES TARGET binary-arch' 383s + bm-report-test 'SOURCE FILE' false 383s + local 'desc=SOURCE FILE' 383s + shift 383s + false 383s + echo 'SOURCE FILE MISSING' 383s + bm-report-test 'SOURCE IN CHANGES' false 383s + local 'desc=SOURCE IN CHANGES' 383s + shift 383s + false 383s + echo 'SOURCE IN CHANGES MISSING' 383s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 383s + local 'desc=DEBS IN CHANGES' 383s + shift 383s + expr 'build-arch binary-arch' : '.*binary.*' 383s 22 383s + echo 'DEBS IN CHANGES EXISTS' 383s + exec 383s + git checkout bad-build-deps 383s Switched to branch 'bad-build-deps' 383s + git clean -xdf 383s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 383s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 383s + set +o pipefail 383s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -B --git-ignore-branch 383s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,bad-build-deps.output 383s + local dgit=dgit 383s + pwd 383s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 383s + : ' 383s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 383s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -B --git-ignore-branch 383s | git rev-parse --show-toplevel 383s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 383s | git config -z --get-regexp --local '.*' 383s | git config -z --get-regexp --local '.*' 383s | git config -z --get-regexp --global '.*' 383s | git config -z --get-regexp --system '.*' 383s format , quilt mode gbp 383s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 383s warning: could not open directory 'debian/source/': No such file or directory 383s => `' 383s + git diff --quiet HEAD 383s massage split -B. 383s massage done 2 -B. 383s format , quilt mode gbp 383s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 383s warning: could not open directory 'debian/source/': No such file or directory 383s => `' 383s + git diff --quiet HEAD 383s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 383s package seems new, not specifying -v 383s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 383s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 383s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 383s gbp:info: Performing the build 383s dpkg-buildpackage: info: source package example 383s dpkg-buildpackage: info: source version 1.0 383s dpkg-buildpackage: info: source distribution unstable 383s dpkg-buildpackage: info: source changed by Ian Jackson 383s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 383s dpkg-buildpackage: info: host architecture ppc64el 383s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 383s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 383s dpkg-buildpackage: warning: (Use -d flag to override.) 383s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 383s 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 383s 383s dgit: error: subprocess failed with error exit status 1 383s + local 'ps=255 0' 383s + set -o pipefail 383s + exec 383s + echo '===== [gbp-build_-B,none,bad-build-deps] dgit --clean=none gbp-build -B --git-ignore-branch =====' 383s + case $ps in 383s + actual_status=failure 383s + echo 'OPERATION FAILED' 383s + case "$require_fail-$tolerate_fail-$actual_status" in 383s + echo 'REQUIRED FAILURE' 383s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,none,bad-build-deps.output 383s + '[' 1 = 1 ']' 383s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 383s + local 'desc=SOURCE FILE' 383s + shift 383s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 383s + echo 'SOURCE FILE MISSING' 383s + '[' failure = success ']' 383s + exec 383s + quirk-clean-fixup 383s + case $cleanmode in 383s + '[' failure = failure ']' 383s + for cleanmode in $cleanmodes 383s + for branch in $bm_branches 383s + bm-run-one 383s + local 'args= --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch' 383s + bmid='gbp-build -B,dpkg-source,no-check,indep-arch' 383s + bmid=gbp-build_-B,dpkg-source,no-check,indep-arch 383s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 383s + heading='===== [gbp-build_-B,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 383s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.output 383s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.expected 383s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.results 383s + bm-compute-expected 383s + require_fail=unexpect 383s + tolerate_fail=unexpect 383s + exec 383s + echo '===== [gbp-build_-B,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 383s + local eff_cleanmode=dpkg-source,no-check 383s + case "$e_targets" in 383s + case "$act" in 383s + case $eff_cleanmode in 383s + bm-build-deps-ok 383s + case "$branch" in 383s + return 0 383s + echo 'EXAMPLE RULES TARGET clean' 383s + case $eff_cleanmode in 383s + '[' 'xbuild-arch binary-arch' '!=' x ']' 383s + bm-build-deps-ok 383s + case "$branch" in 383s + return 0 383s + for t in $e_targets 383s + bm-build-deps-ok 383s + case "$branch" in 383s + return 0 383s + echo 'EXAMPLE RULES TARGET build-arch' 383s + for t in $e_targets 383s + bm-build-deps-ok 383s + case "$branch" in 383s + return 0 383s + echo 'EXAMPLE RULES TARGET binary-arch' 383s + bm-report-test 'SOURCE FILE' false 383s + local 'desc=SOURCE FILE' 383s + shift 383s + false 383s + echo 'SOURCE FILE MISSING' 383s + bm-report-test 'SOURCE IN CHANGES' false 383s + local 'desc=SOURCE IN CHANGES' 383s + shift 383s + false 383s + echo 'SOURCE IN CHANGES MISSING' 383s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 383s + local 'desc=DEBS IN CHANGES' 383s + shift 383s + expr 'build-arch binary-arch' : '.*binary.*' 383s 22 383s + echo 'DEBS IN CHANGES EXISTS' 383s + exec 383s + git checkout indep-arch 383s Switched to branch 'indep-arch' 383s + git clean -xdf 383s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 383s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 383s + set +o pipefail 383s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch 383s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.output 383s + local dgit=dgit 383s + pwd 383s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 383s + : ' 383s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 383s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch 383s | git rev-parse --show-toplevel 383s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 383s | git config -z --get-regexp --local '.*' 383s | git config -z --get-regexp --local '.*' 383s | git config -z --get-regexp --global '.*' 383s | git config -z --get-regexp --system '.*' 383s format , quilt mode gbp 383s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 383s warning: could not open directory 'debian/source/': No such file or directory 383s => `' 383s + git diff --quiet HEAD 383s massage split -B. 383s massage done 2 -B. 383s format , quilt mode gbp 383s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 383s warning: could not open directory 'debian/source/': No such file or directory 383s => `' 383s + git diff --quiet HEAD 383s 383s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 383s dgit: Have to apply the patches - making the tree dirty. 383s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 383s 383s + dpkg-source --before-build . 384s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 384s dpkg-buildpackage: info: source package example 384s dpkg-buildpackage: info: source version 1.0 384s dpkg-buildpackage: info: source distribution unstable 384s dpkg-buildpackage: info: source changed by Ian Jackson 384s fakeroot debian/rules clean 384s EXAMPLE RULES TARGET clean 384s dh_clean 384s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 384s dgit: Unapplying patches again to tidy up the tree. 384s + dpkg-source --after-build . 384s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 384s package seems new, not specifying -v 384s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 384s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 384s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 384s gbp:info: Performing the build 384s dpkg-buildpackage: info: source package example 384s dpkg-buildpackage: info: source version 1.0 384s dpkg-buildpackage: info: source distribution unstable 384s dpkg-buildpackage: info: source changed by Ian Jackson 384s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 384s dpkg-buildpackage: info: host architecture ppc64el 384s debian/rules build-arch 384s EXAMPLE RULES TARGET build-arch 384s fakeroot debian/rules binary-arch 384s EXAMPLE RULES TARGET binary-arch 384s dh_install 384s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 384s dh_gencontrol 385s dh_builddeb 385s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 385s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep ..dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 385s 385s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 385s dpkg-genbuildinfo --build=any -O../example_1.0_ppc64el.buildinfo 385s dpkg-genchanges --build=any -O../example_1.0_ppc64el.changes 385s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 385s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 385s dpkg-buildpackage: info: binary-only upload (no source included) 385s dgit ok: build successful 385s 385s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 385s ' 385s + local 'ps=0 0' 385s + set -o pipefail 385s + exec 385s + echo '===== [gbp-build_-B,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 385s + case $ps in 385s + actual_status=success 385s + case "$require_fail-$tolerate_fail-$actual_status" in 385s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.output 385s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 385s + local 'desc=SOURCE FILE' 385s + shift 385s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 385s + echo 'SOURCE FILE MISSING' 385s + '[' success = success ']' 385s + local changes 385s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 385s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 385s + case "$changes" in 385s + perl -ne 'print if m/^files:/i ... m/^\S/' 385s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 385s + local 'desc=SOURCE IN CHANGES' 385s + shift 385s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 385s + echo 'SOURCE IN CHANGES MISSING' 385s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 385s + local 'desc=DEBS IN CHANGES' 385s + shift 385s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 385s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 385s + echo 'DEBS IN CHANGES EXISTS' 385s + exec 385s + quirk-clean-fixup 385s + case $cleanmode in 385s + perl -i.unfixed -ne ' 385s print unless 385s $_ eq $last && 385s $_ eq "EXAMPLE RULES TARGET clean\n"; 385s $last = $_; 385s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.results 385s + '[' success = failure ']' 385s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.results 385s + for branch in $bm_branches 385s + bm-run-one 385s + local 'args= --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch' 385s + bmid='gbp-build -B,dpkg-source,no-check,bad-build-deps' 385s + bmid=gbp-build_-B,dpkg-source,no-check,bad-build-deps 385s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 385s + heading='===== [gbp-build_-B,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 385s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.output 385s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.expected 385s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.results 385s + bm-compute-expected 385s + require_fail=unexpect 385s + tolerate_fail=unexpect 385s + exec 385s + echo '===== [gbp-build_-B,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 385s + local eff_cleanmode=dpkg-source,no-check 385s + case "$e_targets" in 385s + case "$act" in 385s + case $eff_cleanmode in 385s + bm-build-deps-ok 385s + case "$branch" in 385s + return 1 385s + tolerate_fail=tolerate 385s + echo 'EXAMPLE RULES TARGET clean' 385s + case $eff_cleanmode in 385s + '[' 'xbuild-arch binary-arch' '!=' x ']' 385s + bm-build-deps-ok 385s + case "$branch" in 385s + return 1 385s + tolerate_fail=tolerate 385s + for t in $e_targets 385s + bm-build-deps-ok 385s + case "$branch" in 385s + return 1 385s + require_fail=required 385s + echo 'EXAMPLE RULES TARGET build-arch' 385s + for t in $e_targets 385s + bm-build-deps-ok 385s + case "$branch" in 385s + return 1 385s + require_fail=required 385s + echo 'EXAMPLE RULES TARGET binary-arch' 385s + bm-report-test 'SOURCE FILE' false 385s + local 'desc=SOURCE FILE' 385s + shift 385s + false 385s + echo 'SOURCE FILE MISSING' 385s + bm-report-test 'SOURCE IN CHANGES' false 385s + local 'desc=SOURCE IN CHANGES' 385s + shift 385s + false 385s + echo 'SOURCE IN CHANGES MISSING' 385s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 385s + local 'desc=DEBS IN CHANGES' 385s + shift 385s + expr 'build-arch binary-arch' : '.*binary.*' 385s 22 385s + echo 'DEBS IN CHANGES EXISTS' 385s + exec 385s + git checkout bad-build-deps 385s Switched to branch 'bad-build-deps' 385s + git clean -xdf 385s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 385s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 385s + set +o pipefail 385s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch 385s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.output 385s + local dgit=dgit 385s + pwd 385s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 385s + : ' 385s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 385s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch 385s | git rev-parse --show-toplevel 385s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 385s | git config -z --get-regexp --local '.*' 385s | git config -z --get-regexp --local '.*' 385s | git config -z --get-regexp --global '.*' 385s | git config -z --get-regexp --system '.*' 385s format , quilt mode gbp 385s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 385s warning: could not open directory 'debian/source/': No such file or directory 385s => `' 385s + git diff --quiet HEAD 385s massage split -B. 385s massage done 2 -B. 385s format , quilt mode gbp 385s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 385s warning: could not open directory 'debian/source/': No such file or directory 385s => `' 385s + git diff --quiet HEAD 385s 385s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 385s dgit: Have to apply the patches - making the tree dirty. 385s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 385s 385s + dpkg-source --before-build . 385s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 385s dpkg-buildpackage: info: source package example 385s dpkg-buildpackage: info: source version 1.0 385s dpkg-buildpackage: info: source distribution unstable 385s dpkg-buildpackage: info: source changed by Ian Jackson 385s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 385s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 385s dpkg-buildpackage: warning: (Use -d flag to override.) 385s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 385s 385s dgit: error: subprocess failed with error exit status 3 385s + local 'ps=255 0' 385s + set -o pipefail 385s + exec 385s + echo '===== [gbp-build_-B,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 385s + case $ps in 385s + actual_status=failure 385s + echo 'OPERATION FAILED' 385s + case "$require_fail-$tolerate_fail-$actual_status" in 385s + echo 'REQUIRED FAILURE' 385s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.output 385s + '[' 1 = 1 ']' 385s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 385s + local 'desc=SOURCE FILE' 385s + shift 385s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 385s + echo 'SOURCE FILE MISSING' 385s + '[' failure = success ']' 385s + exec 385s + quirk-clean-fixup 385s + case $cleanmode in 385s + perl -i.unfixed -ne ' 385s print unless 385s $_ eq $last && 385s $_ eq "EXAMPLE RULES TARGET clean\n"; 385s $last = $_; 385s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.results 385s + '[' failure = failure ']' 385s + for cleanmode in $cleanmodes 385s + for branch in $bm_branches 385s + bm-run-one 385s + local 'args= --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch' 385s + bmid='gbp-build -B,dpkg-source-d,no-check,indep-arch' 385s + bmid=gbp-build_-B,dpkg-source-d,no-check,indep-arch 385s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 385s + heading='===== [gbp-build_-B,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch =====' 385s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.output 385s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.expected 385s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.results 385s + bm-compute-expected 385s + require_fail=unexpect 385s + tolerate_fail=unexpect 385s + exec 385s + echo '===== [gbp-build_-B,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch =====' 385s + local eff_cleanmode=dpkg-source-d,no-check 385s + case "$e_targets" in 385s + case "$act" in 385s + case $eff_cleanmode in 385s + echo 'EXAMPLE RULES TARGET clean' 385s + case $eff_cleanmode in 385s + '[' 'xbuild-arch binary-arch' '!=' x ']' 385s + bm-build-deps-ok 385s + case "$branch" in 385s + return 0 385s + for t in $e_targets 385s + bm-build-deps-ok 385s + case "$branch" in 385s + return 0 385s + echo 'EXAMPLE RULES TARGET build-arch' 385s + for t in $e_targets 385s + bm-build-deps-ok 385s + case "$branch" in 385s + return 0 385s + echo 'EXAMPLE RULES TARGET binary-arch' 385s + bm-report-test 'SOURCE FILE' false 385s + local 'desc=SOURCE FILE' 385s + shift 385s + false 385s + echo 'SOURCE FILE MISSING' 385s + bm-report-test 'SOURCE IN CHANGES' false 385s + local 'desc=SOURCE IN CHANGES' 385s + shift 385s + false 385s + echo 'SOURCE IN CHANGES MISSING' 385s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 385s + local 'desc=DEBS IN CHANGES' 385s + shift 385s + expr 'build-arch binary-arch' : '.*binary.*' 385s 22 385s + echo 'DEBS IN CHANGES EXISTS' 385s + exec 385s + git checkout indep-arch 385s Switched to branch 'indep-arch' 385s + git clean -xdf 385s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 385s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 385s + set +o pipefail 385s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch 385s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.output 385s + local dgit=dgit 385s + pwd 385s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 385s + : ' 385s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 385s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch 386s | git rev-parse --show-toplevel 386s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 386s | git config -z --get-regexp --local '.*' 386s | git config -z --get-regexp --local '.*' 386s | git config -z --get-regexp --global '.*' 386s | git config -z --get-regexp --system '.*' 386s format , quilt mode gbp 386s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 386s warning: could not open directory 'debian/source/': No such file or directory 386s => `' 386s + git diff --quiet HEAD 386s massage split -B. 386s massage done 2 -B. 386s format , quilt mode gbp 386s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 386s warning: could not open directory 'debian/source/': No such file or directory 386s => `' 386s + git diff --quiet HEAD 386s 386s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 386s dgit: Have to apply the patches - making the tree dirty. 386s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 386s 386s + dpkg-source --before-build . 386s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 386s dpkg-buildpackage: info: source package example 386s dpkg-buildpackage: info: source version 1.0 386s dpkg-buildpackage: info: source distribution unstable 386s dpkg-buildpackage: info: source changed by Ian Jackson 386s fakeroot debian/rules clean 386s EXAMPLE RULES TARGET clean 386s dh_clean 386s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 386s dgit: Unapplying patches again to tidy up the tree. 386s + dpkg-source --after-build . 386s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 386s package seems new, not specifying -v 386s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 386s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 386s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 386s gbp:info: Performing the build 386s dpkg-buildpackage: info: source package example 386s dpkg-buildpackage: info: source version 1.0 386s dpkg-buildpackage: info: source distribution unstable 386s dpkg-buildpackage: info: source changed by Ian Jackson 386s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 386s dpkg-buildpackage: info: host architecture ppc64el 386s debian/rules build-arch 386s EXAMPLE RULES TARGET build-arch 386s fakeroot debian/rules binary-arch 386s EXAMPLE RULES TARGET binary-arch 386s dh_install 387s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 387s dh_gencontrol 387s dh_builddeb 387s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 387s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 387s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 387s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 387s dpkg-genbuildinfo --build=any -O../example_1.0_ppc64el.buildinfo 387s dpkg-genchanges --build=any -O../example_1.0_ppc64el.changes 387s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 387s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 387s dpkg-buildpackage: info: binary-only upload (no source included) 387s dgit ok: build successful 387s 387s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 387s ' 387s + local 'ps=0 0' 387s + set -o pipefail 387s + exec 387s + echo '===== [gbp-build_-B,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch =====' 387s + case $ps in 387s + actual_status=success 387s + case "$require_fail-$tolerate_fail-$actual_status" in 387s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.output 387s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 387s + local 'desc=SOURCE FILE' 387s + shift 387s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 387s + echo 'SOURCE FILE MISSING' 387s + '[' success = success ']' 387s + local changes 387s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 387s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes 387s + case "$changes" in 387s + perl -ne 'print if m/^files:/i ... m/^\S/' 387s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 387s + local 'desc=SOURCE IN CHANGES' 387s + shift 387s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 387s + echo 'SOURCE IN CHANGES MISSING' 387s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 387s + local 'desc=DEBS IN CHANGES' 387s + shift 387s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_ppc64el.changes.files 387s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 387s + echo 'DEBS IN CHANGES EXISTS' 387s + exec 387s + quirk-clean-fixup 387s + case $cleanmode in 387s + perl -i.unfixed -ne ' 387s print unless 387s $_ eq $last && 387s $_ eq "EXAMPLE RULES TARGET clean\n"; 387s $last = $_; 387s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.results 387s + '[' success = failure ']' 387s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.results 387s + for branch in $bm_branches 387s + bm-run-one 387s + local 'args= --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch' 387s + bmid='gbp-build -B,dpkg-source-d,no-check,bad-build-deps' 387s + bmid=gbp-build_-B,dpkg-source-d,no-check,bad-build-deps 387s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 387s + 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 =====' 387s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.output 387s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.expected 387s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.results 387s + bm-compute-expected 387s + require_fail=unexpect 387s + tolerate_fail=unexpect 387s + exec 387s + 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 =====' 387s + local eff_cleanmode=dpkg-source-d,no-check 387s + case "$e_targets" in 387s + case "$act" in 387s + case $eff_cleanmode in 387s + echo 'EXAMPLE RULES TARGET clean' 387s + case $eff_cleanmode in 387s + '[' 'xbuild-arch binary-arch' '!=' x ']' 387s + bm-build-deps-ok 387s + case "$branch" in 387s + return 1 387s + tolerate_fail=tolerate 387s + for t in $e_targets 387s + bm-build-deps-ok 387s + case "$branch" in 387s + return 1 387s + require_fail=required 387s + echo 'EXAMPLE RULES TARGET build-arch' 387s + for t in $e_targets 387s + bm-build-deps-ok 387s + case "$branch" in 387s + return 1 387s + require_fail=required 387s + echo 'EXAMPLE RULES TARGET binary-arch' 387s + bm-report-test 'SOURCE FILE' false 387s + local 'desc=SOURCE FILE' 387s + shift 387s + false 387s + echo 'SOURCE FILE MISSING' 387s + bm-report-test 'SOURCE IN CHANGES' false 387s + local 'desc=SOURCE IN CHANGES' 387s + shift 387s + false 387s + echo 'SOURCE IN CHANGES MISSING' 387s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 387s + local 'desc=DEBS IN CHANGES' 387s + shift 387s + expr 'build-arch binary-arch' : '.*binary.*' 387s 22 387s + echo 'DEBS IN CHANGES EXISTS' 387s + exec 387s + git checkout bad-build-deps 387s Switched to branch 'bad-build-deps' 387s + git clean -xdf 387s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 387s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 387s + set +o pipefail 387s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch 387s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.output 387s + local dgit=dgit 387s + pwd 387s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 387s + : ' 387s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 387s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch 387s | git rev-parse --show-toplevel 387s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 387s | git config -z --get-regexp --local '.*' 387s | git config -z --get-regexp --local '.*' 387s | git config -z --get-regexp --global '.*' 387s | git config -z --get-regexp --system '.*' 387s format , quilt mode gbp 387s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 387s warning: could not open directory 'debian/source/': No such file or directory 387s => `' 387s + git diff --quiet HEAD 387s massage split -B. 387s massage done 2 -B. 387s format , quilt mode gbp 387s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 387s warning: could not open directory 'debian/source/': No such file or directory 387s => `' 387s + git diff --quiet HEAD 387s 387s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 387s dgit: Have to apply the patches - making the tree dirty. 387s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 387s 387s + dpkg-source --before-build . 387s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 388s dpkg-buildpackage: info: source package example 388s dpkg-buildpackage: info: source version 1.0 388s dpkg-buildpackage: info: source distribution unstable 388s dpkg-buildpackage: info: source changed by Ian Jackson 388s fakeroot debian/rules clean 388s EXAMPLE RULES TARGET clean 388s dh_clean 388s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 388s dgit: Unapplying patches again to tidy up the tree. 388s + dpkg-source --after-build . 388s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 388s package seems new, not specifying -v 388s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 388s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 388s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 388s gbp:info: Performing the build 388s dpkg-buildpackage: info: source package example 388s dpkg-buildpackage: info: source version 1.0 388s dpkg-buildpackage: info: source distribution unstable 388s dpkg-buildpackage: info: source changed by Ian Jackson 388s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 388s dpkg-buildpackage: info: host architecture ppc64el 388s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 388s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 388s dpkg-buildpackage: warning: (Use -d flag to override.) 388s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 388s 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 388s 388s dgit: error: subprocess failed with error exit status 1 388s + local 'ps=255 0' 388s + set -o pipefail 388s + exec 388s + 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 =====' 388s + case $ps in 388s + actual_status=failure 388s + echo 'OPERATION FAILED' 388s + case "$require_fail-$tolerate_fail-$actual_status" in 388s + echo 'REQUIRED FAILURE' 388s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.output 388s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 388s + local 'desc=SOURCE FILE' 388s + shift 388s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 388s + echo 'SOURCE FILE MISSING' 388s + '[' failure = success ']' 388s + exec 388s + quirk-clean-fixup 388s + case $cleanmode in 388s + perl -i.unfixed -ne ' 388s print unless 388s $_ eq $last && 388s $_ eq "EXAMPLE RULES TARGET clean\n"; 388s $last = $_; 388s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.results 388s + '[' failure = failure ']' 388s + : bm-act-iterate done. 388s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 388s + bm-guess-e-source-e-targets 'gbp-build -A' 388s + local 'some_act=gbp-build -A' 388s + case "$some_act" in 388s + e_source=false 388s + e_targets='build-indep binary-indep' 388s + real_act='gbp-build -A --git-ignore-branch' 388s + bm-act-iterate 388s + for cleanmode in $cleanmodes 388s + for branch in $bm_branches 388s + bm-run-one 388s + local 'args= --clean=git gbp-build -A --git-ignore-branch' 388s + bmid='gbp-build -A,git,indep-arch' 388s + bmid=gbp-build_-A,git,indep-arch 388s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 388s + heading='===== [gbp-build_-A,git,indep-arch] dgit --clean=git gbp-build -A --git-ignore-branch =====' 388s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.output 388s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.expected 388s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.results 388s + bm-compute-expected 388s + require_fail=unexpect 388s + tolerate_fail=unexpect 388s + exec 388s + echo '===== [gbp-build_-A,git,indep-arch] dgit --clean=git gbp-build -A --git-ignore-branch =====' 388s + local eff_cleanmode=git 388s + case "$e_targets" in 388s + case "$act" in 388s + case $eff_cleanmode in 388s + echo 'BUILD-MODES PROGRAM git clean -xdf' 388s + case $eff_cleanmode in 388s + '[' 'xbuild-indep binary-indep' '!=' x ']' 388s + bm-build-deps-ok 388s + case "$branch" in 388s + return 0 388s + for t in $e_targets 388s + bm-build-deps-ok 388s + case "$branch" in 388s + return 0 388s + echo 'EXAMPLE RULES TARGET build-indep' 388s + for t in $e_targets 388s + bm-build-deps-ok 388s + case "$branch" in 388s + return 0 388s + echo 'EXAMPLE RULES TARGET binary-indep' 388s + bm-report-test 'SOURCE FILE' false 388s + local 'desc=SOURCE FILE' 388s + shift 388s + false 388s + echo 'SOURCE FILE MISSING' 388s + bm-report-test 'SOURCE IN CHANGES' false 388s + local 'desc=SOURCE IN CHANGES' 388s + shift 388s + false 388s + echo 'SOURCE IN CHANGES MISSING' 388s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 388s + local 'desc=DEBS IN CHANGES' 388s + shift 388s + expr 'build-indep binary-indep' : '.*binary.*' 388s 24 388s + echo 'DEBS IN CHANGES EXISTS' 388s + exec 388s + git checkout indep-arch 388s Switched to branch 'indep-arch' 388s + git clean -xdf 388s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 388s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 388s + set +o pipefail 388s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -A --git-ignore-branch 388s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.output 388s + local dgit=dgit 388s + pwd 388s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 388s + : ' 388s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 388s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -A --git-ignore-branch 388s | git rev-parse --show-toplevel 388s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 388s | git config -z --get-regexp --local '.*' 388s | git config -z --get-regexp --local '.*' 388s | git config -z --get-regexp --global '.*' 388s | git config -z --get-regexp --system '.*' 388s format , quilt mode gbp 388s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 388s warning: could not open directory 'debian/source/': No such file or directory 388s => `' 388s + git diff --quiet HEAD 388s massage split -A. 388s massage done 2 -A. 388s format , quilt mode gbp 388s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 388s warning: could not open directory 'debian/source/': No such file or directory 388s => `' 388s + git diff --quiet HEAD 388s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 388s BUILD-MODES PROGRAM git clean -xdf 388s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 388s package seems new, not specifying -v 388s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 388s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 388s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 388s gbp:info: Performing the build 389s dpkg-buildpackage: info: source package example 389s dpkg-buildpackage: info: source version 1.0 389s dpkg-buildpackage: info: source distribution unstable 389s dpkg-buildpackage: info: source changed by Ian Jackson 389s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 389s debian/rules build-indep 389s EXAMPLE RULES TARGET build-indep 389s fakeroot debian/rules binary-indep 389s EXAMPLE RULES TARGET binary-indep 389s dh_install 389s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 389s dh_gencontrol 389s dh_builddeb 389s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 389s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 389s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 389s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 389s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 389s dpkg-genchanges --build=all -O../example_1.0_all.changes 389s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 389s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 389s dpkg-buildpackage: info: binary-only upload (no source included) 389s dgit ok: build successful 389s 389s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 389s ' 389s + local 'ps=0 0' 389s + set -o pipefail 389s + exec 389s + echo '===== [gbp-build_-A,git,indep-arch] dgit --clean=git gbp-build -A --git-ignore-branch =====' 389s + case $ps in 389s + actual_status=success 389s + case "$require_fail-$tolerate_fail-$actual_status" in 389s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.output 389s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 389s + local 'desc=SOURCE FILE' 389s + shift 389s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 389s + echo 'SOURCE FILE MISSING' 389s + '[' success = success ']' 389s + local changes 389s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes 389s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes 389s + case "$changes" in 389s + perl -ne 'print if m/^files:/i ... m/^\S/' 389s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 389s + local 'desc=SOURCE IN CHANGES' 389s + shift 389s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 389s + echo 'SOURCE IN CHANGES MISSING' 389s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 389s + local 'desc=DEBS IN CHANGES' 389s + shift 389s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 389s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 389s + echo 'DEBS IN CHANGES EXISTS' 389s + exec 389s + quirk-clean-fixup 389s + case $cleanmode in 389s + '[' success = failure ']' 389s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.results 389s + for branch in $bm_branches 389s + bm-run-one 389s + local 'args= --clean=git gbp-build -A --git-ignore-branch' 389s + bmid='gbp-build -A,git,bad-build-deps' 389s + bmid=gbp-build_-A,git,bad-build-deps 389s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 389s + heading='===== [gbp-build_-A,git,bad-build-deps] dgit --clean=git gbp-build -A --git-ignore-branch =====' 389s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,bad-build-deps.output 389s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,bad-build-deps.expected 389s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,bad-build-deps.results 389s + bm-compute-expected 389s + require_fail=unexpect 389s + tolerate_fail=unexpect 389s + exec 389s + echo '===== [gbp-build_-A,git,bad-build-deps] dgit --clean=git gbp-build -A --git-ignore-branch =====' 389s + local eff_cleanmode=git 389s + case "$e_targets" in 389s + case "$act" in 389s + case $eff_cleanmode in 389s + echo 'BUILD-MODES PROGRAM git clean -xdf' 389s + case $eff_cleanmode in 389s + '[' 'xbuild-indep binary-indep' '!=' x ']' 389s + bm-build-deps-ok 389s + case "$branch" in 389s + return 1 389s + tolerate_fail=tolerate 389s + for t in $e_targets 389s + bm-build-deps-ok 389s + case "$branch" in 389s + return 1 389s + require_fail=required 389s + echo 'EXAMPLE RULES TARGET build-indep' 389s + for t in $e_targets 389s + bm-build-deps-ok 389s + case "$branch" in 389s + return 1 389s + require_fail=required 389s + echo 'EXAMPLE RULES TARGET binary-indep' 389s + bm-report-test 'SOURCE FILE' false 389s + local 'desc=SOURCE FILE' 389s + shift 389s + false 389s + echo 'SOURCE FILE MISSING' 389s + bm-report-test 'SOURCE IN CHANGES' false 389s + local 'desc=SOURCE IN CHANGES' 389s + shift 389s + false 389s + echo 'SOURCE IN CHANGES MISSING' 389s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 389s + local 'desc=DEBS IN CHANGES' 389s + shift 389s + expr 'build-indep binary-indep' : '.*binary.*' 389s 24 389s + echo 'DEBS IN CHANGES EXISTS' 389s + exec 389s + git checkout bad-build-deps 389s Switched to branch 'bad-build-deps' 389s + git clean -xdf 389s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 389s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 390s + set +o pipefail 390s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,bad-build-deps.output 390s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -A --git-ignore-branch 390s + local dgit=dgit 390s + pwd 390s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 390s + : ' 390s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 390s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -A --git-ignore-branch 390s | git rev-parse --show-toplevel 390s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 390s | git config -z --get-regexp --local '.*' 390s | git config -z --get-regexp --local '.*' 390s | git config -z --get-regexp --global '.*' 390s | git config -z --get-regexp --system '.*' 390s format , quilt mode gbp 390s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 390s warning: could not open directory 'debian/source/': No such file or directory 390s => `' 390s + git diff --quiet HEAD 390s massage split -A. 390s massage done 2 -A. 390s format , quilt mode gbp 390s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 390s warning: could not open directory 'debian/source/': No such file or directory 390s => `' 390s + git diff --quiet HEAD 390s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 390s BUILD-MODES PROGRAM git clean -xdf 390s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 390s package seems new, not specifying -v 390s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 390s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 390s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 390s gbp:info: Performing the build 390s dpkg-buildpackage: info: source package example 390s dpkg-buildpackage: info: source version 1.0 390s dpkg-buildpackage: info: source distribution unstable 390s dpkg-buildpackage: info: source changed by Ian Jackson 390s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 390s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 390s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 390s dpkg-buildpackage: warning: (Use -d flag to override.) 390s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 390s 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 390s 390s dgit: error: subprocess failed with error exit status 1 390s + local 'ps=255 0' 390s + set -o pipefail 390s + exec 390s + echo '===== [gbp-build_-A,git,bad-build-deps] dgit --clean=git gbp-build -A --git-ignore-branch =====' 390s + case $ps in 390s + actual_status=failure 390s + echo 'OPERATION FAILED' 390s + case "$require_fail-$tolerate_fail-$actual_status" in 390s + echo 'REQUIRED FAILURE' 390s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,git,bad-build-deps.output 390s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 390s + local 'desc=SOURCE FILE' 390s + shift 390s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 390s + echo 'SOURCE FILE MISSING' 390s + '[' failure = success ']' 390s + exec 390s + quirk-clean-fixup 390s + case $cleanmode in 390s + '[' failure = failure ']' 390s + for cleanmode in $cleanmodes 390s + for branch in $bm_branches 390s + bm-run-one 390s + local 'args= --clean=none gbp-build -A --git-ignore-branch' 390s + bmid='gbp-build -A,none,indep-arch' 390s + bmid=gbp-build_-A,none,indep-arch 390s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 390s + heading='===== [gbp-build_-A,none,indep-arch] dgit --clean=none gbp-build -A --git-ignore-branch =====' 390s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.output 390s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.expected 390s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.results 390s + bm-compute-expected 390s + require_fail=unexpect 390s + tolerate_fail=unexpect 390s + exec 390s + echo '===== [gbp-build_-A,none,indep-arch] dgit --clean=none gbp-build -A --git-ignore-branch =====' 390s + local eff_cleanmode=none 390s + case "$e_targets" in 390s + case "$act" in 390s + case $eff_cleanmode in 390s + case $eff_cleanmode in 390s + '[' 'xbuild-indep binary-indep' '!=' x ']' 390s + bm-build-deps-ok 390s + case "$branch" in 390s + return 0 390s + for t in $e_targets 390s + bm-build-deps-ok 390s + case "$branch" in 390s + return 0 390s + echo 'EXAMPLE RULES TARGET build-indep' 390s + for t in $e_targets 390s + bm-build-deps-ok 390s + case "$branch" in 390s + return 0 390s + echo 'EXAMPLE RULES TARGET binary-indep' 390s + bm-report-test 'SOURCE FILE' false 390s + local 'desc=SOURCE FILE' 390s + shift 390s + false 390s + echo 'SOURCE FILE MISSING' 390s + bm-report-test 'SOURCE IN CHANGES' false 390s + local 'desc=SOURCE IN CHANGES' 390s + shift 390s + false 390s + echo 'SOURCE IN CHANGES MISSING' 390s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 390s + local 'desc=DEBS IN CHANGES' 390s + shift 390s + expr 'build-indep binary-indep' : '.*binary.*' 390s 24 390s + echo 'DEBS IN CHANGES EXISTS' 390s + exec 390s + git checkout indep-arch 390s Switched to branch 'indep-arch' 390s + git clean -xdf 390s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 390s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 390s + set +o pipefail 390s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -A --git-ignore-branch 390s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.output 390s + local dgit=dgit 390s + pwd 390s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 390s + : ' 390s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 390s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -A --git-ignore-branch 390s | git rev-parse --show-toplevel 390s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 390s | git config -z --get-regexp --local '.*' 390s | git config -z --get-regexp --local '.*' 390s | git config -z --get-regexp --global '.*' 390s | git config -z --get-regexp --system '.*' 390s format , quilt mode gbp 390s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 390s warning: could not open directory 'debian/source/': No such file or directory 390s => `' 390s + git diff --quiet HEAD 390s massage split -A. 390s massage done 2 -A. 390s format , quilt mode gbp 390s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 390s warning: could not open directory 'debian/source/': No such file or directory 390s => `' 390s + git diff --quiet HEAD 390s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 390s package seems new, not specifying -v 390s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 390s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 390s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 390s gbp:info: Performing the build 390s dpkg-buildpackage: info: source package example 390s dpkg-buildpackage: info: source version 1.0 390s dpkg-buildpackage: info: source distribution unstable 390s dpkg-buildpackage: info: source changed by Ian Jackson 390s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 391s debian/rules build-indep 391s EXAMPLE RULES TARGET build-indep 391s fakeroot debian/rules binary-indep 391s EXAMPLE RULES TARGET binary-indep 391s dh_install 391s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 391s dh_gencontrol 391s dh_builddeb 391s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 391s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 391s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 391s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 391s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 391s dpkg-genchanges --build=all -O../example_1.0_all.changes 391s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 391s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 391s dpkg-buildpackage: info: binary-only upload (no source included) 391s dgit ok: build successful 391s 391s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 391s ' 391s + local 'ps=0 0' 391s + set -o pipefail 391s + exec 391s + echo '===== [gbp-build_-A,none,indep-arch] dgit --clean=none gbp-build -A --git-ignore-branch =====' 391s + case $ps in 391s + actual_status=success 391s + case "$require_fail-$tolerate_fail-$actual_status" in 391s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.output 391s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 391s + local 'desc=SOURCE FILE' 391s + shift 391s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 391s + echo 'SOURCE FILE MISSING' 391s + '[' success = success ']' 391s + local changes 391s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes 391s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes 391s + case "$changes" in 391s + perl -ne 'print if m/^files:/i ... m/^\S/' 391s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 391s + local 'desc=SOURCE IN CHANGES' 391s + shift 391s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 391s + echo 'SOURCE IN CHANGES MISSING' 391s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 391s + local 'desc=DEBS IN CHANGES' 391s + shift 391s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 391s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 391s + echo 'DEBS IN CHANGES EXISTS' 391s + exec 391s + quirk-clean-fixup 391s + case $cleanmode in 391s + '[' success = failure ']' 391s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.results 391s + for branch in $bm_branches 391s + bm-run-one 391s + local 'args= --clean=none gbp-build -A --git-ignore-branch' 391s + bmid='gbp-build -A,none,bad-build-deps' 391s + bmid=gbp-build_-A,none,bad-build-deps 391s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 391s + heading='===== [gbp-build_-A,none,bad-build-deps] dgit --clean=none gbp-build -A --git-ignore-branch =====' 391s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,bad-build-deps.output 391s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,bad-build-deps.expected 391s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,bad-build-deps.results 391s + bm-compute-expected 391s + require_fail=unexpect 391s + tolerate_fail=unexpect 391s + exec 391s + echo '===== [gbp-build_-A,none,bad-build-deps] dgit --clean=none gbp-build -A --git-ignore-branch =====' 391s + local eff_cleanmode=none 391s + case "$e_targets" in 391s + case "$act" in 391s + case $eff_cleanmode in 391s + case $eff_cleanmode in 391s + '[' 'xbuild-indep binary-indep' '!=' x ']' 391s + bm-build-deps-ok 391s + case "$branch" in 391s + return 1 391s + tolerate_fail=tolerate 391s + for t in $e_targets 391s + bm-build-deps-ok 391s + case "$branch" in 391s + return 1 391s + require_fail=required 391s + echo 'EXAMPLE RULES TARGET build-indep' 391s + for t in $e_targets 391s + bm-build-deps-ok 391s + case "$branch" in 391s + return 1 391s + require_fail=required 391s + echo 'EXAMPLE RULES TARGET binary-indep' 391s + bm-report-test 'SOURCE FILE' false 391s + local 'desc=SOURCE FILE' 391s + shift 391s + false 391s + echo 'SOURCE FILE MISSING' 391s + bm-report-test 'SOURCE IN CHANGES' false 391s + local 'desc=SOURCE IN CHANGES' 391s + shift 391s + false 391s + echo 'SOURCE IN CHANGES MISSING' 391s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 391s + local 'desc=DEBS IN CHANGES' 391s + shift 391s + expr 'build-indep binary-indep' : '.*binary.*' 391s 24 391s + echo 'DEBS IN CHANGES EXISTS' 391s + exec 391s + git checkout bad-build-deps 391s Switched to branch 'bad-build-deps' 391s + git clean -xdf 391s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 391s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 391s + set +o pipefail 391s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -A --git-ignore-branch 391s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,bad-build-deps.output 391s + local dgit=dgit 391s + pwd 391s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 391s + : ' 391s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 391s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -A --git-ignore-branch 391s | git rev-parse --show-toplevel 391s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 391s | git config -z --get-regexp --local '.*' 391s | git config -z --get-regexp --local '.*' 391s | git config -z --get-regexp --global '.*' 391s | git config -z --get-regexp --system '.*' 391s format , quilt mode gbp 391s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 391s warning: could not open directory 'debian/source/': No such file or directory 391s => `' 391s + git diff --quiet HEAD 391s massage split -A. 391s massage done 2 -A. 391s format , quilt mode gbp 391s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 391s warning: could not open directory 'debian/source/': No such file or directory 391s => `' 391s + git diff --quiet HEAD 391s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 391s package seems new, not specifying -v 391s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 391s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 391s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 392s gbp:info: Performing the build 392s dpkg-buildpackage: info: source package example 392s dpkg-buildpackage: info: source version 1.0 392s dpkg-buildpackage: info: source distribution unstable 392s dpkg-buildpackage: info: source changed by Ian Jackson 392s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 392s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 392s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 392s dpkg-buildpackage: warning: (Use -d flag to override.) 392s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 392s 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 392s 392s dgit: error: subprocess failed with error exit status 1 392s + local 'ps=255 0' 392s + set -o pipefail 392s + exec 392s + echo '===== [gbp-build_-A,none,bad-build-deps] dgit --clean=none gbp-build -A --git-ignore-branch =====' 392s + case $ps in 392s + actual_status=failure 392s + echo 'OPERATION FAILED' 392s + case "$require_fail-$tolerate_fail-$actual_status" in 392s + echo 'REQUIRED FAILURE' 392s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,none,bad-build-deps.output 392s + '[' 1 = 1 ']' 392s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 392s + local 'desc=SOURCE FILE' 392s + shift 392s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 392s + echo 'SOURCE FILE MISSING' 392s + '[' failure = success ']' 392s + exec 392s + quirk-clean-fixup 392s + case $cleanmode in 392s + '[' failure = failure ']' 392s + for cleanmode in $cleanmodes 392s + for branch in $bm_branches 392s + bm-run-one 392s + local 'args= --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch' 392s + bmid='gbp-build -A,dpkg-source,no-check,indep-arch' 392s + bmid=gbp-build_-A,dpkg-source,no-check,indep-arch 392s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 392s + heading='===== [gbp-build_-A,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 392s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.output 392s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.expected 392s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.results 392s + bm-compute-expected 392s + require_fail=unexpect 392s + tolerate_fail=unexpect 392s + exec 392s + echo '===== [gbp-build_-A,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 392s + local eff_cleanmode=dpkg-source,no-check 392s + case "$e_targets" in 392s + case "$act" in 392s + case $eff_cleanmode in 392s + bm-build-deps-ok 392s + case "$branch" in 392s + return 0 392s + echo 'EXAMPLE RULES TARGET clean' 392s + case $eff_cleanmode in 392s + '[' 'xbuild-indep binary-indep' '!=' x ']' 392s + bm-build-deps-ok 392s + case "$branch" in 392s + return 0 392s + for t in $e_targets 392s + bm-build-deps-ok 392s + case "$branch" in 392s + return 0 392s + echo 'EXAMPLE RULES TARGET build-indep' 392s + for t in $e_targets 392s + bm-build-deps-ok 392s + case "$branch" in 392s + return 0 392s + echo 'EXAMPLE RULES TARGET binary-indep' 392s + bm-report-test 'SOURCE FILE' false 392s + local 'desc=SOURCE FILE' 392s + shift 392s + false 392s + echo 'SOURCE FILE MISSING' 392s + bm-report-test 'SOURCE IN CHANGES' false 392s + local 'desc=SOURCE IN CHANGES' 392s + shift 392s + false 392s + echo 'SOURCE IN CHANGES MISSING' 392s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 392s + local 'desc=DEBS IN CHANGES' 392s + shift 392s + expr 'build-indep binary-indep' : '.*binary.*' 392s 24 392s + echo 'DEBS IN CHANGES EXISTS' 392s + exec 392s + git checkout indep-arch 392s Switched to branch 'indep-arch' 392s + git clean -xdf 392s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 392s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 392s + set +o pipefail 392s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch 392s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.output 392s + local dgit=dgit 392s + pwd 392s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 392s + : ' 392s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 392s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch 392s | git rev-parse --show-toplevel 392s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 392s | git config -z --get-regexp --local '.*' 392s | git config -z --get-regexp --local '.*' 392s | git config -z --get-regexp --global '.*' 392s | git config -z --get-regexp --system '.*' 392s format , quilt mode gbp 392s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 392s warning: could not open directory 'debian/source/': No such file or directory 392s => `' 392s + git diff --quiet HEAD 392s massage split -A. 392s massage done 2 -A. 392s format , quilt mode gbp 392s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 392s warning: could not open directory 'debian/source/': No such file or directory 392s => `' 392s + git diff --quiet HEAD 392s 392s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 392s dgit: Have to apply the patches - making the tree dirty. 392s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 392s 392s + dpkg-source --before-build . 392s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 392s dpkg-buildpackage: info: source package example 392s dpkg-buildpackage: info: source version 1.0 392s dpkg-buildpackage: info: source distribution unstable 392s dpkg-buildpackage: info: source changed by Ian Jackson 392s fakeroot debian/rules clean 392s EXAMPLE RULES TARGET clean 392s dh_clean 392s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 392s dgit: Unapplying patches again to tidy up the tree. 392s + dpkg-source --after-build . 392s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 392s package seems new, not specifying -v 392s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 393s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 393s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 393s gbp:info: Performing the build 395s dpkg-buildpackage: info: source package example 395s dpkg-buildpackage: info: source version 1.0 395s dpkg-buildpackage: info: source distribution unstable 395s dpkg-buildpackage: info: source changed by Ian Jackson 395s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 395s debian/rules build-indep 395s EXAMPLE RULES TARGET build-indep 395s fakeroot debian/rules binary-indep 395s EXAMPLE RULES TARGET binary-indep 395s dh_install 395s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 395s dh_gencontrol 395s dh_builddeb 395s + exec /usr/bin/dpkg-deb+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 395s -Znone --build debian/example-indep .. 395s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 395s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 395s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 395s dpkg-genchanges --build=all -O../example_1.0_all.changes 395s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 395s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 395s dpkg-buildpackage: info: binary-only upload (no source included) 395s dgit ok: build successful 395s 395s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 395s ' 395s + local 'ps=0 0' 395s + set -o pipefail 395s + exec 395s + echo '===== [gbp-build_-A,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 395s + case $ps in 395s + actual_status=success 395s + case "$require_fail-$tolerate_fail-$actual_status" in 395s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.output 395s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 395s + local 'desc=SOURCE FILE' 395s + shift 395s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 395s + echo 'SOURCE FILE MISSING' 395s + '[' success = success ']' 395s + local changes 395s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes 395s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes 395s + case "$changes" in 395s + perl -ne 'print if m/^files:/i ... m/^\S/' 395s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 395s + local 'desc=SOURCE IN CHANGES' 395s + shift 395s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 395s + echo 'SOURCE IN CHANGES MISSING' 395s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 395s + local 'desc=DEBS IN CHANGES' 395s + shift 395s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 395s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 395s + echo 'DEBS IN CHANGES EXISTS' 395s + exec 395s + quirk-clean-fixup 395s + case $cleanmode in 395s + perl -i.unfixed -ne ' 395s print unless 395s $_ eq $last && 395s $_ eq "EXAMPLE RULES TARGET clean\n"; 395s $last = $_; 395s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.results 395s + '[' success = failure ']' 395s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.results 395s + for branch in $bm_branches 395s + bm-run-one 395s + local 'args= --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch' 395s + bmid='gbp-build -A,dpkg-source,no-check,bad-build-deps' 395s + bmid=gbp-build_-A,dpkg-source,no-check,bad-build-deps 395s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 395s + heading='===== [gbp-build_-A,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 395s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.output 395s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.expected 395s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.results 395s + bm-compute-expected 395s + require_fail=unexpect 395s + tolerate_fail=unexpect 395s + exec 395s + echo '===== [gbp-build_-A,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 395s + local eff_cleanmode=dpkg-source,no-check 395s + case "$e_targets" in 395s + case "$act" in 395s + case $eff_cleanmode in 395s + bm-build-deps-ok 395s + case "$branch" in 395s + return 1 395s + tolerate_fail=tolerate 395s + echo 'EXAMPLE RULES TARGET clean' 395s + case $eff_cleanmode in 395s + '[' 'xbuild-indep binary-indep' '!=' x ']' 395s + bm-build-deps-ok 395s + case "$branch" in 395s + return 1 395s + tolerate_fail=tolerate 395s + for t in $e_targets 395s + bm-build-deps-ok 395s + case "$branch" in 395s + return 1 395s + require_fail=required 395s + echo 'EXAMPLE RULES TARGET build-indep' 395s + for t in $e_targets 395s + bm-build-deps-ok 395s + case "$branch" in 395s + return 1 395s + require_fail=required 395s + echo 'EXAMPLE RULES TARGET binary-indep' 395s + bm-report-test 'SOURCE FILE' false 395s + local 'desc=SOURCE FILE' 395s + shift 395s + false 395s + echo 'SOURCE FILE MISSING' 395s + bm-report-test 'SOURCE IN CHANGES' false 395s + local 'desc=SOURCE IN CHANGES' 395s + shift 395s + false 395s + echo 'SOURCE IN CHANGES MISSING' 395s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 395s + local 'desc=DEBS IN CHANGES' 395s + shift 395s + expr 'build-indep binary-indep' : '.*binary.*' 395s 24 395s + echo 'DEBS IN CHANGES EXISTS' 395s + exec 395s + git checkout bad-build-deps 395s Switched to branch 'bad-build-deps' 395s + git clean -xdf 395s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 395s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 395s + set +o pipefail 395s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch 395s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.output 395s + local dgit=dgit 395s + pwd 395s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 395s + : ' 395s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 395s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch 395s | git rev-parse --show-toplevel 395s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 395s | git config -z --get-regexp --local '.*' 395s | git config -z --get-regexp --local '.*' 395s | git config -z --get-regexp --global '.*' 395s | git config -z --get-regexp --system '.*' 395s format , quilt mode gbp 395s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 395s warning: could not open directory 'debian/source/': No such file or directory 395s => `' 395s + git diff --quiet HEAD 395s massage split -A. 395s massage done 2 -A. 395s format , quilt mode gbp 395s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 395s warning: could not open directory 'debian/source/': No such file or directory 395s => `' 395s + git diff --quiet HEAD 395s 395s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 395s dgit: Have to apply the patches - making the tree dirty. 395s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 395s 395s + dpkg-source --before-build . 395s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 395s dpkg-buildpackage: info: source package example 395s dpkg-buildpackage: info: source version 1.0 395s dpkg-buildpackage: info: source distribution unstable 395s dpkg-buildpackage: info: source changed by Ian Jackson 395s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 395s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 395s dpkg-buildpackage: warning: (Use -d flag to override.) 395s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 395s 395s dgit: error: subprocess failed with error exit status 3 395s + local 'ps=255 0' 395s + set -o pipefail 395s + exec 395s + echo '===== [gbp-build_-A,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 395s + case $ps in 395s + actual_status=failure 395s + echo 'OPERATION FAILED' 395s + case "$require_fail-$tolerate_fail-$actual_status" in 395s + echo 'REQUIRED FAILURE' 395s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.output 395s + '[' 1 = 1 ']' 395s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 395s + local 'desc=SOURCE FILE' 395s + shift 395s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 395s + echo 'SOURCE FILE MISSING' 395s + '[' failure = success ']' 395s + exec 395s + quirk-clean-fixup 395s + case $cleanmode in 395s + perl -i.unfixed -ne ' 395s print unless 395s $_ eq $last && 395s $_ eq "EXAMPLE RULES TARGET clean\n"; 395s $last = $_; 395s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.results 395s + '[' failure = failure ']' 395s + for cleanmode in $cleanmodes 395s + for branch in $bm_branches 395s + bm-run-one 395s + local 'args= --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch' 395s + bmid='gbp-build -A,dpkg-source-d,no-check,indep-arch' 395s + bmid=gbp-build_-A,dpkg-source-d,no-check,indep-arch 395s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 395s + heading='===== [gbp-build_-A,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch =====' 395s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.output 395s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.expected 395s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.results 395s + bm-compute-expected 395s + require_fail=unexpect 395s + tolerate_fail=unexpect 395s + exec 395s + echo '===== [gbp-build_-A,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch =====' 395s + local eff_cleanmode=dpkg-source-d,no-check 395s + case "$e_targets" in 395s + case "$act" in 395s + case $eff_cleanmode in 395s + echo 'EXAMPLE RULES TARGET clean' 395s + case $eff_cleanmode in 395s + '[' 'xbuild-indep binary-indep' '!=' x ']' 395s + bm-build-deps-ok 395s + case "$branch" in 395s + return 0 395s + for t in $e_targets 395s + bm-build-deps-ok 395s + case "$branch" in 395s + return 0 395s + echo 'EXAMPLE RULES TARGET build-indep' 395s + for t in $e_targets 395s + bm-build-deps-ok 395s + case "$branch" in 395s + return 0 395s + echo 'EXAMPLE RULES TARGET binary-indep' 395s + bm-report-test 'SOURCE FILE' false 395s + local 'desc=SOURCE FILE' 395s + shift 395s + false 395s + echo 'SOURCE FILE MISSING' 395s + bm-report-test 'SOURCE IN CHANGES' false 395s + local 'desc=SOURCE IN CHANGES' 395s + shift 395s + false 395s + echo 'SOURCE IN CHANGES MISSING' 395s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 395s + local 'desc=DEBS IN CHANGES' 395s + shift 395s + expr 'build-indep binary-indep' : '.*binary.*' 395s 24 395s + echo 'DEBS IN CHANGES EXISTS' 395s + exec 395s + git checkout indep-arch 395s Switched to branch 'indep-arch' 395s + git clean -xdf 395s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 395s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 395s + set +o pipefail 395s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch 395s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.output 395s + local dgit=dgit 395s + pwd 395s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 395s + : ' 395s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 395s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch 395s | git rev-parse --show-toplevel 395s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 395s | git config -z --get-regexp --local '.*' 395s | git config -z --get-regexp --local '.*' 395s | git config -z --get-regexp --global '.*' 395s | git config -z --get-regexp --system '.*' 395s format , quilt mode gbp 395s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 395s warning: could not open directory 'debian/source/': No such file or directory 395s => `' 395s + git diff --quiet HEAD 395s massage split -A. 395s massage done 2 -A. 395s format , quilt mode gbp 395s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 395s warning: could not open directory 'debian/source/': No such file or directory 395s => `' 395s + git diff --quiet HEAD 395s 395s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 395s dgit: Have to apply the patches - making the tree dirty. 395s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 395s 395s + dpkg-source --before-build . 395s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 395s dpkg-buildpackage: info: source package example 395s dpkg-buildpackage: info: source version 1.0 395s dpkg-buildpackage: info: source distribution unstable 395s dpkg-buildpackage: info: source changed by Ian Jackson 395s fakeroot debian/rules clean 395s EXAMPLE RULES TARGET clean 395s dh_clean 395s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 395s dgit: Unapplying patches again to tidy up the tree. 395s + dpkg-source --after-build . 395s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 395s package seems new, not specifying -v 395s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 395s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 395s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 395s gbp:info: Performing the build 395s dpkg-buildpackage: info: source package example 395s dpkg-buildpackage: info: source version 1.0 395s dpkg-buildpackage: info: source distribution unstable 395s dpkg-buildpackage: info: source changed by Ian Jackson 395s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 395s debian/rules build-indep 395s EXAMPLE RULES TARGET build-indep 395s fakeroot debian/rules binary-indep 395s EXAMPLE RULES TARGET binary-indep 395s dh_install 395s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 395s dh_gencontrol 395s dh_builddeb 395s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 395s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 395s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 395s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 395s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 395s dpkg-genchanges --build=all -O../example_1.0_all.changes 395s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 395s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 395s dpkg-buildpackage: info: binary-only upload (no source included) 396s dgit ok: build successful 396s 396s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 396s ' 396s + local 'ps=0 0' 396s + set -o pipefail 396s + exec 396s + echo '===== [gbp-build_-A,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch =====' 396s + case $ps in 396s + actual_status=success 396s + case "$require_fail-$tolerate_fail-$actual_status" in 396s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.output 396s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 396s + local 'desc=SOURCE FILE' 396s + shift 396s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 396s + echo 'SOURCE FILE MISSING' 396s + '[' success = success ']' 396s + local changes 396s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes 396s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes 396s + case "$changes" in 396s + perl -ne 'print if m/^files:/i ... m/^\S/' 396s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 396s + local 'desc=SOURCE IN CHANGES' 396s + shift 396s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 396s + echo 'SOURCE IN CHANGES MISSING' 396s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 396s + local 'desc=DEBS IN CHANGES' 396s + shift 396s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_all.changes.files 396s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 396s + echo 'DEBS IN CHANGES EXISTS' 396s + exec 396s + quirk-clean-fixup 396s + case $cleanmode in 396s + perl -i.unfixed -ne ' 396s print unless 396s $_ eq $last && 396s $_ eq "EXAMPLE RULES TARGET clean\n"; 396s $last = $_; 396s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.results 396s + '[' success = failure ']' 396s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.results 396s + for branch in $bm_branches 396s + bm-run-one 396s + local 'args= --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch' 396s + bmid='gbp-build -A,dpkg-source-d,no-check,bad-build-deps' 396s + bmid=gbp-build_-A,dpkg-source-d,no-check,bad-build-deps 396s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 396s + 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 =====' 396s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.output 396s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.expected 396s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.results 396s + bm-compute-expected 396s + require_fail=unexpect 396s + tolerate_fail=unexpect 396s + exec 396s + 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 =====' 396s + local eff_cleanmode=dpkg-source-d,no-check 396s + case "$e_targets" in 396s + case "$act" in 396s + case $eff_cleanmode in 396s + echo 'EXAMPLE RULES TARGET clean' 396s + case $eff_cleanmode in 396s + '[' 'xbuild-indep binary-indep' '!=' x ']' 396s + bm-build-deps-ok 396s + case "$branch" in 396s + return 1 396s + tolerate_fail=tolerate 396s + for t in $e_targets 396s + bm-build-deps-ok 396s + case "$branch" in 396s + return 1 396s + require_fail=required 396s + echo 'EXAMPLE RULES TARGET build-indep' 396s + for t in $e_targets 396s + bm-build-deps-ok 396s + case "$branch" in 396s + return 1 396s + require_fail=required 396s + echo 'EXAMPLE RULES TARGET binary-indep' 396s + bm-report-test 'SOURCE FILE' false 396s + local 'desc=SOURCE FILE' 396s + shift 396s + false 396s + echo 'SOURCE FILE MISSING' 396s + bm-report-test 'SOURCE IN CHANGES' false 396s + local 'desc=SOURCE IN CHANGES' 396s + shift 396s + false 396s + echo 'SOURCE IN CHANGES MISSING' 396s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 396s + local 'desc=DEBS IN CHANGES' 396s + shift 396s + expr 'build-indep binary-indep' : '.*binary.*' 396s 24 396s + echo 'DEBS IN CHANGES EXISTS' 396s + exec 396s + git checkout bad-build-deps 396s Switched to branch 'bad-build-deps' 396s + git clean -xdf 396s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 396s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 396s + set +o pipefail 396s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch 396s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.output 396s + local dgit=dgit 396s + pwd 396s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 396s + : ' 396s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 396s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch 396s | git rev-parse --show-toplevel 396s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 396s | git config -z --get-regexp --local '.*' 396s | git config -z --get-regexp --local '.*' 396s | git config -z --get-regexp --global '.*' 396s | git config -z --get-regexp --system '.*' 396s format , quilt mode gbp 396s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 396s warning: could not open directory 'debian/source/': No such file or directory 396s => `' 396s + git diff --quiet HEAD 396s massage split -A. 396s massage done 2 -A. 396s format , quilt mode gbp 396s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 396s warning: could not open directory 'debian/source/': No such file or directory 396s => `' 396s + git diff --quiet HEAD 396s 396s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 396s dgit: Have to apply the patches - making the tree dirty. 396s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 396s 396s + dpkg-source --before-build . 396s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 396s dpkg-buildpackage: info: source package example 396s dpkg-buildpackage: info: source version 1.0 396s dpkg-buildpackage: info: source distribution unstable 396s dpkg-buildpackage: info: source changed by Ian Jackson 396s fakeroot debian/rules clean 396s EXAMPLE RULES TARGET clean 396s dh_clean 396s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 396s dgit: Unapplying patches again to tidy up the tree. 396s + dpkg-source --after-build . 396s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 396s package seems new, not specifying -v 396s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 396s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 396s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 396s gbp:info: Performing the build 396s dpkg-buildpackage: info: source package example 396s dpkg-buildpackage: info: source version 1.0 396s dpkg-buildpackage: info: source distribution unstable 396s dpkg-buildpackage: info: source changed by Ian Jackson 396s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 396s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 396s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 396s dpkg-buildpackage: warning: (Use -d flag to override.) 396s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 396s 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 396s 396s dgit: error: subprocess failed with error exit status 1 396s + local 'ps=255 0' 396s + set -o pipefail 396s + exec 396s + 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 =====' 396s + case $ps in 396s + actual_status=failure 396s + echo 'OPERATION FAILED' 396s + case "$require_fail-$tolerate_fail-$actual_status" in 396s + echo 'REQUIRED FAILURE' 396s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.output 396s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 396s + local 'desc=SOURCE FILE' 396s + shift 396s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 396s + echo 'SOURCE FILE MISSING' 396s + '[' failure = success ']' 396s + exec 396s + quirk-clean-fixup 396s + case $cleanmode in 396s + perl -i.unfixed -ne ' 396s print unless 396s $_ eq $last && 396s $_ eq "EXAMPLE RULES TARGET clean\n"; 396s $last = $_; 396s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.results 397s + '[' failure = failure ']' 397s + : bm-act-iterate done. 397s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 397s + bm-guess-e-source-e-targets 'gbp-build -F' 397s + local 'some_act=gbp-build -F' 397s + case "$some_act" in 397s + e_source=true 397s + e_targets='build binary' 397s + real_act='gbp-build -F --git-ignore-branch' 397s + bm-act-iterate 397s + for cleanmode in $cleanmodes 397s + for branch in $bm_branches 397s + bm-run-one 397s + local 'args= --clean=git gbp-build -F --git-ignore-branch' 397s + bmid='gbp-build -F,git,indep-arch' 397s + bmid=gbp-build_-F,git,indep-arch 397s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 397s + heading='===== [gbp-build_-F,git,indep-arch] dgit --clean=git gbp-build -F --git-ignore-branch =====' 397s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.output 397s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.expected 397s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.results 397s + bm-compute-expected 397s + require_fail=unexpect 397s + tolerate_fail=unexpect 397s + exec 397s + echo '===== [gbp-build_-F,git,indep-arch] dgit --clean=git gbp-build -F --git-ignore-branch =====' 397s + local eff_cleanmode=git 397s + case "$e_targets" in 397s + case "$act" in 397s + case $eff_cleanmode in 397s + echo 'BUILD-MODES PROGRAM git clean -xdf' 397s + case $eff_cleanmode in 397s + '[' 'xbuild binary' '!=' x ']' 397s + bm-build-deps-ok 397s + case "$branch" in 397s + return 0 397s + for t in $e_targets 397s + bm-build-deps-ok 397s + case "$branch" in 397s + return 0 397s + echo 'EXAMPLE RULES TARGET build' 397s + for t in $e_targets 397s + bm-build-deps-ok 397s + case "$branch" in 397s + return 0 397s + echo 'EXAMPLE RULES TARGET binary' 397s + bm-report-test 'SOURCE FILE' true 397s + local 'desc=SOURCE FILE' 397s + shift 397s + true 397s + echo 'SOURCE FILE EXISTS' 397s + bm-report-test 'SOURCE IN CHANGES' true 397s + local 'desc=SOURCE IN CHANGES' 397s + shift 397s + true 397s + echo 'SOURCE IN CHANGES EXISTS' 397s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 397s + local 'desc=DEBS IN CHANGES' 397s + shift 397s + expr 'build binary' : '.*binary.*' 397s 12 397s + echo 'DEBS IN CHANGES EXISTS' 397s + exec 397s + git checkout indep-arch 397s Switched to branch 'indep-arch' 397s + git clean -xdf 397s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 397s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 397s + set +o pipefail 397s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -F --git-ignore-branch 397s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.output 397s + local dgit=dgit 397s + pwd 397s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 397s + : ' 397s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 397s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -F --git-ignore-branch 397s | git rev-parse --show-toplevel 397s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 397s | git config -z --get-regexp --local '.*' 397s | git config -z --get-regexp --local '.*' 397s | git config -z --get-regexp --global '.*' 397s | git config -z --get-regexp --system '.*' 397s format , quilt mode gbp 397s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 397s warning: could not open directory 'debian/source/': No such file or directory 397s => `' 397s + git diff --quiet HEAD 397s massage split -F. 397s massage done 3 -b. 397s format , quilt mode gbp 397s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 397s warning: could not open directory 'debian/source/': No such file or directory 397s => `' 397s + git diff --quiet HEAD 397s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 397s BUILD-MODES PROGRAM git clean -xdf 397s | git rev-parse 'HEAD~0' 397s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 397s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 397s CD work 397s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 397s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 397s CD .. 397s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 397s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 397s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 397s dpkg-source: info: using source format '1.0' 397s dpkg-source: info: building example in example_1.0.tar.gz 397s dpkg-source: info: building example in example_1.0.dsc 397s CD work 397s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 397s package seems new, not specifying -v 397s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 397s dpkg-genchanges: info: including full source code in upload 397s CD .. 397s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 397s renaming (Files) example_1.0.tar.gz 397s renaming (dsc) example_1.0.dsc 397s renaming (changes) example_1.0_source.changes 397s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 397s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 397s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 397s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 397s gbp:info: Performing the build 397s dpkg-buildpackage: info: source package example 397s dpkg-buildpackage: info: source version 1.0 397s dpkg-buildpackage: info: source distribution unstable 397s dpkg-buildpackage: info: source changed by Ian Jackson 397s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 397s dpkg-buildpackage: info: host architecture ppc64el 397s debian/rules build 397s EXAMPLE RULES TARGET build 397s fakeroot debian/rules binary 397s EXAMPLE RULES TARGET binary 397s dh_install 397s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 397s dh_gencontrol 398s dh_builddeb 398s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 398s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 398s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 398s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 398s dpkg-genbuildinfo --build=binary -O../example_1.0_ppc64el.buildinfo 398s dpkg-genchanges --build=binary -O../example_1.0_ppc64el.changes 398s dpkg-genchanges: info: binary-only upload (no source code included) 398s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 398s dpkg-buildpackage: info: binary-only upload (no source included) 398s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 398s + mergechanges -f example_1.0_source.changes example_1.0_ppc64el.changes 399s dgit ok: build successful, results in example_1.0_multi.changes 399s 399s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 399s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 399s ' 399s + local 'ps=0 0' 399s + set -o pipefail 399s + exec 399s + echo '===== [gbp-build_-F,git,indep-arch] dgit --clean=git gbp-build -F --git-ignore-branch =====' 399s + case $ps in 399s + actual_status=success 399s + case "$require_fail-$tolerate_fail-$actual_status" in 399s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.output 399s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 399s + local 'desc=SOURCE FILE' 399s + shift 399s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 399s + echo 'SOURCE FILE EXISTS' 399s + '[' success = success ']' 399s + local changes 399s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 399s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 399s + case "$changes" in 399s + perl -ne 'print if m/^files:/i ... m/^\S/' 399s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 399s + local 'desc=SOURCE IN CHANGES' 399s + shift 399s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 399s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 399s + echo 'SOURCE IN CHANGES EXISTS' 399s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 399s + local 'desc=DEBS IN CHANGES' 399s + shift 399s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 399s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 399s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 399s + echo 'DEBS IN CHANGES EXISTS' 399s + exec 399s + quirk-clean-fixup 399s + case $cleanmode in 399s + '[' success = failure ']' 399s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.results 399s + for branch in $bm_branches 399s + bm-run-one 399s + local 'args= --clean=git gbp-build -F --git-ignore-branch' 399s + bmid='gbp-build -F,git,bad-build-deps' 399s + bmid=gbp-build_-F,git,bad-build-deps 399s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 399s + heading='===== [gbp-build_-F,git,bad-build-deps] dgit --clean=git gbp-build -F --git-ignore-branch =====' 399s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,bad-build-deps.output 399s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,bad-build-deps.expected 399s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,bad-build-deps.results 399s + bm-compute-expected 399s + require_fail=unexpect 399s + tolerate_fail=unexpect 399s + exec 399s + echo '===== [gbp-build_-F,git,bad-build-deps] dgit --clean=git gbp-build -F --git-ignore-branch =====' 399s + local eff_cleanmode=git 399s + case "$e_targets" in 399s + case "$act" in 399s + case $eff_cleanmode in 399s + echo 'BUILD-MODES PROGRAM git clean -xdf' 399s + case $eff_cleanmode in 399s + '[' 'xbuild binary' '!=' x ']' 399s + bm-build-deps-ok 399s + case "$branch" in 399s + return 1 399s + tolerate_fail=tolerate 399s + for t in $e_targets 399s + bm-build-deps-ok 399s + case "$branch" in 399s + return 1 399s + require_fail=required 399s + echo 'EXAMPLE RULES TARGET build' 399s + for t in $e_targets 399s + bm-build-deps-ok 399s + case "$branch" in 399s + return 1 399s + require_fail=required 399s + echo 'EXAMPLE RULES TARGET binary' 399s + bm-report-test 'SOURCE FILE' true 399s + local 'desc=SOURCE FILE' 399s + shift 399s + true 399s + echo 'SOURCE FILE EXISTS' 399s + bm-report-test 'SOURCE IN CHANGES' true 399s + local 'desc=SOURCE IN CHANGES' 399s + shift 399s + true 399s + echo 'SOURCE IN CHANGES EXISTS' 399s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 399s + local 'desc=DEBS IN CHANGES' 399s + shift 399s + expr 'build binary' : '.*binary.*' 399s 12 399s + echo 'DEBS IN CHANGES EXISTS' 399s + exec 399s + git checkout bad-build-deps 399s Switched to branch 'bad-build-deps' 399s + git clean -xdf 399s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 399s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 399s + set +o pipefail 399s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -F --git-ignore-branch 399s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,bad-build-deps.output 399s + local dgit=dgit 399s + pwd 399s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 399s + : ' 399s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 399s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -F --git-ignore-branch 399s | git rev-parse --show-toplevel 399s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 399s | git config -z --get-regexp --local '.*' 399s | git config -z --get-regexp --local '.*' 399s | git config -z --get-regexp --global '.*' 399s | git config -z --get-regexp --system '.*' 399s format , quilt mode gbp 399s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 399s warning: could not open directory 'debian/source/': No such file or directory 399s => `' 399s + git diff --quiet HEAD 399s massage split -F. 399s massage done 3 -b. 399s format , quilt mode gbp 399s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 399s warning: could not open directory 'debian/source/': No such file or directory 399s => `' 399s + git diff --quiet HEAD 399s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 399s BUILD-MODES PROGRAM git clean -xdf 399s | git rev-parse 'HEAD~0' 399s => `d09bc55f43bc5586103335d232c16bd041247bd1' 399s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 399s CD work 399s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 399s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 399s CD .. 399s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 399s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 399s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 399s dpkg-source: info: using source format '1.0' 399s dpkg-source: info: building example in example_1.0.tar.gz 399s dpkg-source: info: building example in example_1.0.dsc 399s CD work 399s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 399s package seems new, not specifying -v 399s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 399s dpkg-genchanges: info: including full source code in upload 399s CD .. 399s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 399s renaming (Files) example_1.0.tar.gz 399s renaming (dsc) example_1.0.dsc 399s renaming (changes) example_1.0_source.changes 399s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 399s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 399s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 399s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 399s gbp:info: Performing the build 399s dpkg-buildpackage: info: source package example 399s dpkg-buildpackage: info: source version 1.0 399s dpkg-buildpackage: info: source distribution unstable 399s dpkg-buildpackage: info: source changed by Ian Jackson 399s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 399s dpkg-buildpackage: info: host architecture ppc64el 399s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 399s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 399s dpkg-buildpackage: warning: (Use -d flag to override.) 399s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 399s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 399s 399s dgit: error: subprocess failed with error exit status 1 399s + local 'ps=255 0' 399s + set -o pipefail 399s + exec 399s + echo '===== [gbp-build_-F,git,bad-build-deps] dgit --clean=git gbp-build -F --git-ignore-branch =====' 399s + case $ps in 399s + actual_status=failure 399s + echo 'OPERATION FAILED' 399s + case "$require_fail-$tolerate_fail-$actual_status" in 399s + echo 'REQUIRED FAILURE' 399s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,git,bad-build-deps.output 399s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 399s + local 'desc=SOURCE FILE' 399s + shift 399s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 399s + echo 'SOURCE FILE EXISTS' 399s + '[' failure = success ']' 399s + exec 399s + quirk-clean-fixup 399s + case $cleanmode in 399s + '[' failure = failure ']' 399s + for cleanmode in $cleanmodes 399s + for branch in $bm_branches 399s + bm-run-one 399s + local 'args= --clean=none gbp-build -F --git-ignore-branch' 399s + bmid='gbp-build -F,none,indep-arch' 399s + bmid=gbp-build_-F,none,indep-arch 399s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 399s + heading='===== [gbp-build_-F,none,indep-arch] dgit --clean=none gbp-build -F --git-ignore-branch =====' 399s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.output 399s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.expected 399s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.results 399s + bm-compute-expected 399s + require_fail=unexpect 399s + tolerate_fail=unexpect 399s + exec 399s + echo '===== [gbp-build_-F,none,indep-arch] dgit --clean=none gbp-build -F --git-ignore-branch =====' 399s + local eff_cleanmode=none 399s + case "$e_targets" in 399s + case "$act" in 399s + case $eff_cleanmode in 399s + case $eff_cleanmode in 399s + '[' 'xbuild binary' '!=' x ']' 399s + bm-build-deps-ok 399s + case "$branch" in 399s + return 0 399s + for t in $e_targets 399s + bm-build-deps-ok 399s + case "$branch" in 399s + return 0 399s + echo 'EXAMPLE RULES TARGET build' 399s + for t in $e_targets 399s + bm-build-deps-ok 399s + case "$branch" in 399s + return 0 399s + echo 'EXAMPLE RULES TARGET binary' 399s + bm-report-test 'SOURCE FILE' true 399s + local 'desc=SOURCE FILE' 399s + shift 399s + true 399s + echo 'SOURCE FILE EXISTS' 399s + bm-report-test 'SOURCE IN CHANGES' true 399s + local 'desc=SOURCE IN CHANGES' 399s + shift 399s + true 399s + echo 'SOURCE IN CHANGES EXISTS' 399s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 399s + local 'desc=DEBS IN CHANGES' 399s + shift 399s + expr 'build binary' : '.*binary.*' 399s 12 399s + echo 'DEBS IN CHANGES EXISTS' 399s + exec 399s + git checkout indep-arch 399s Switched to branch 'indep-arch' 399s + git clean -xdf 399s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 399s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 399s + set +o pipefail 399s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -F --git-ignore-branch 399s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.output 399s + local dgit=dgit 399s + pwd 399s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 399s + : ' 399s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 399s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -F --git-ignore-branch 400s | git rev-parse --show-toplevel 400s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 400s | git config -z --get-regexp --local '.*' 400s | git config -z --get-regexp --local '.*' 400s | git config -z --get-regexp --global '.*' 400s | git config -z --get-regexp --system '.*' 400s format , quilt mode gbp 400s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 400s warning: could not open directory 'debian/source/': No such file or directory 400s => `' 400s + git diff --quiet HEAD 400s massage split -F. 400s massage done 3 -b. 400s format , quilt mode gbp 400s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 400s warning: could not open directory 'debian/source/': No such file or directory 400s => `' 400s + git diff --quiet HEAD 400s | git rev-parse 'HEAD~0' 400s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 400s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 400s CD work 400s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 400s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 400s CD .. 400s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 400s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 400s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 400s dpkg-source: info: using source format '1.0' 400s dpkg-source: info: building example in example_1.0.tar.gz 400s dpkg-source: info: building example in example_1.0.dsc 400s CD work 400s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 400s package seems new, not specifying -v 400s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 400s dpkg-genchanges: info: including full source code in upload 400s CD .. 400s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 400s renaming (Files) example_1.0.tar.gz 400s renaming (dsc) example_1.0.dsc 400s renaming (changes) example_1.0_source.changes 400s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 400s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 400s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 400s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 400s gbp:info: Performing the build 400s dpkg-buildpackage: info: source package example 400s dpkg-buildpackage: info: source version 1.0 400s dpkg-buildpackage: info: source distribution unstable 400s dpkg-buildpackage: info: source changed by Ian Jackson 400s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 400s dpkg-buildpackage: info: host architecture ppc64el 400s debian/rules build 400s EXAMPLE RULES TARGET build 400s fakeroot debian/rules binary 400s EXAMPLE RULES TARGET binary 400s dh_install 400s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 400s dh_gencontrol 400s dh_builddeb 400s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 400s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch ..dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 400s 400s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 400s dpkg-genbuildinfo --build=binary -O../example_1.0_ppc64el.buildinfo 401s dpkg-genchanges --build=binary -O../example_1.0_ppc64el.changes 401s dpkg-genchanges: info: binary-only upload (no source code included) 401s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 401s dpkg-buildpackage: info: binary-only upload (no source included) 401s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 401s + mergechanges -f example_1.0_source.changes example_1.0_ppc64el.changes 401s dgit ok: build successful, results in example_1.0_multi.changes 401s 401s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 401s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 401s ' 401s + local 'ps=0 0' 401s + set -o pipefail 401s + exec 401s + echo '===== [gbp-build_-F,none,indep-arch] dgit --clean=none gbp-build -F --git-ignore-branch =====' 401s + case $ps in 401s + actual_status=success 401s + case "$require_fail-$tolerate_fail-$actual_status" in 401s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.output 401s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 401s + local 'desc=SOURCE FILE' 401s + shift 401s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 401s + echo 'SOURCE FILE EXISTS' 401s + '[' success = success ']' 401s + local changes 401s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 401s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 401s + case "$changes" in 401s + perl -ne 'print if m/^files:/i ... m/^\S/' 401s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 401s + local 'desc=SOURCE IN CHANGES' 401s + shift 401s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 401s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 401s + echo 'SOURCE IN CHANGES EXISTS' 401s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 401s + local 'desc=DEBS IN CHANGES' 401s + shift 401s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 401s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 401s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 401s + echo 'DEBS IN CHANGES EXISTS' 401s + exec 401s + quirk-clean-fixup 401s + case $cleanmode in 401s + '[' success = failure ']' 401s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.results 401s + for branch in $bm_branches 401s + bm-run-one 401s + local 'args= --clean=none gbp-build -F --git-ignore-branch' 401s + bmid='gbp-build -F,none,bad-build-deps' 401s + bmid=gbp-build_-F,none,bad-build-deps 401s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 401s + heading='===== [gbp-build_-F,none,bad-build-deps] dgit --clean=none gbp-build -F --git-ignore-branch =====' 401s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,bad-build-deps.output 401s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,bad-build-deps.expected 401s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,bad-build-deps.results 401s + bm-compute-expected 401s + require_fail=unexpect 401s + tolerate_fail=unexpect 401s + exec 401s + echo '===== [gbp-build_-F,none,bad-build-deps] dgit --clean=none gbp-build -F --git-ignore-branch =====' 401s + local eff_cleanmode=none 401s + case "$e_targets" in 401s + case "$act" in 401s + case $eff_cleanmode in 401s + case $eff_cleanmode in 401s + '[' 'xbuild binary' '!=' x ']' 401s + bm-build-deps-ok 401s + case "$branch" in 401s + return 1 401s + tolerate_fail=tolerate 401s + for t in $e_targets 401s + bm-build-deps-ok 401s + case "$branch" in 401s + return 1 401s + require_fail=required 401s + echo 'EXAMPLE RULES TARGET build' 401s + for t in $e_targets 401s + bm-build-deps-ok 401s + case "$branch" in 401s + return 1 401s + require_fail=required 401s + echo 'EXAMPLE RULES TARGET binary' 401s + bm-report-test 'SOURCE FILE' true 401s + local 'desc=SOURCE FILE' 401s + shift 401s + true 401s + echo 'SOURCE FILE EXISTS' 401s + bm-report-test 'SOURCE IN CHANGES' true 401s + local 'desc=SOURCE IN CHANGES' 401s + shift 401s + true 401s + echo 'SOURCE IN CHANGES EXISTS' 401s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 401s + local 'desc=DEBS IN CHANGES' 401s + shift 401s + expr 'build binary' : '.*binary.*' 401s 12 401s + echo 'DEBS IN CHANGES EXISTS' 401s + exec 401s + git checkout bad-build-deps 401s Switched to branch 'bad-build-deps' 401s + git clean -xdf 401s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 401s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 401s + set +o pipefail 401s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,bad-build-deps.output 401s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -F --git-ignore-branch 401s + local dgit=dgit 401s + pwd 401s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 401s + : ' 401s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 401s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -F --git-ignore-branch 401s | git rev-parse --show-toplevel 401s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 401s | git config -z --get-regexp --local '.*' 401s | git config -z --get-regexp --local '.*' 401s | git config -z --get-regexp --global '.*' 401s | git config -z --get-regexp --system '.*' 402s format , quilt mode gbp 402s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 402s warning: could not open directory 'debian/source/': No such file or directory 402s => `' 402s + git diff --quiet HEAD 402s massage split -F. 402s massage done 3 -b. 402s format , quilt mode gbp 402s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 402s warning: could not open directory 'debian/source/': No such file or directory 402s => `' 402s + git diff --quiet HEAD 402s | git rev-parse 'HEAD~0' 402s => `d09bc55f43bc5586103335d232c16bd041247bd1' 402s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 402s CD work 402s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 402s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 402s CD .. 402s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 402s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 402s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 402s dpkg-source: info: using source format '1.0' 402s dpkg-source: info: building example in example_1.0.tar.gz 402s dpkg-source: info: building example in example_1.0.dsc 402s CD work 402s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 402s package seems new, not specifying -v 402s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 402s dpkg-genchanges: info: including full source code in upload 402s CD .. 402s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 402s renaming (Files) example_1.0.tar.gz 402s renaming (dsc) example_1.0.dsc 402s renaming (changes) example_1.0_source.changes 402s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 402s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 402s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 402s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 402s gbp:info: Performing the build 402s dpkg-buildpackage: info: source package example 402s dpkg-buildpackage: info: source version 1.0 402s dpkg-buildpackage: info: source distribution unstable 402s dpkg-buildpackage: info: source changed by Ian Jackson 402s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 402s dpkg-buildpackage: info: host architecture ppc64el 402s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 402s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 402s dpkg-buildpackage: warning: (Use -d flag to override.) 402s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 402s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 402s 402s dgit: error: subprocess failed with error exit status 1 402s + local 'ps=255 0' 402s + set -o pipefail 402s + exec 402s + echo '===== [gbp-build_-F,none,bad-build-deps] dgit --clean=none gbp-build -F --git-ignore-branch =====' 402s + case $ps in 402s + actual_status=failure 402s + echo 'OPERATION FAILED' 402s + case "$require_fail-$tolerate_fail-$actual_status" in 402s + echo 'REQUIRED FAILURE' 402s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,none,bad-build-deps.output 402s + '[' 1 = 1 ']' 402s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 402s + local 'desc=SOURCE FILE' 402s + shift 402s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 402s + echo 'SOURCE FILE EXISTS' 402s + '[' failure = success ']' 402s + exec 402s + quirk-clean-fixup 402s + case $cleanmode in 402s + '[' failure = failure ']' 402s + for cleanmode in $cleanmodes 402s + for branch in $bm_branches 402s + bm-run-one 402s + local 'args= --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch' 402s + bmid='gbp-build -F,dpkg-source,no-check,indep-arch' 402s + bmid=gbp-build_-F,dpkg-source,no-check,indep-arch 402s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 402s + heading='===== [gbp-build_-F,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 402s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.output 402s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.expected 402s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.results 402s + bm-compute-expected 402s + require_fail=unexpect 402s + tolerate_fail=unexpect 402s + exec 402s + echo '===== [gbp-build_-F,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 402s + local eff_cleanmode=dpkg-source,no-check 402s + case "$e_targets" in 402s + case "$act" in 402s + case $eff_cleanmode in 402s + bm-build-deps-ok 402s + case "$branch" in 402s + return 0 402s + echo 'EXAMPLE RULES TARGET clean' 402s + case $eff_cleanmode in 402s + '[' 'xbuild binary' '!=' x ']' 402s + bm-build-deps-ok 402s + case "$branch" in 402s + return 0 402s + for t in $e_targets 402s + bm-build-deps-ok 402s + case "$branch" in 402s + return 0 402s + echo 'EXAMPLE RULES TARGET build' 402s + for t in $e_targets 402s + bm-build-deps-ok 402s + case "$branch" in 402s + return 0 402s + echo 'EXAMPLE RULES TARGET binary' 402s + bm-report-test 'SOURCE FILE' true 402s + local 'desc=SOURCE FILE' 402s + shift 402s + true 402s + echo 'SOURCE FILE EXISTS' 402s + bm-report-test 'SOURCE IN CHANGES' true 402s + local 'desc=SOURCE IN CHANGES' 402s + shift 402s + true 402s + echo 'SOURCE IN CHANGES EXISTS' 402s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 402s + local 'desc=DEBS IN CHANGES' 402s + shift 402s + expr 'build binary' : '.*binary.*' 402s 12 402s + echo 'DEBS IN CHANGES EXISTS' 402s + exec 402s + git checkout indep-arch 402s Switched to branch 'indep-arch' 402s + git clean -xdf 402s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 402s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 402s + set +o pipefail 402s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch 402s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.output 402s + local dgit=dgit 402s + pwd 402s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 402s + : ' 402s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 402s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch 402s | git rev-parse --show-toplevel 402s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 402s | git config -z --get-regexp --local '.*' 402s | git config -z --get-regexp --local '.*' 402s | git config -z --get-regexp --global '.*' 402s | git config -z --get-regexp --system '.*' 402s format , quilt mode gbp 402s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 402s warning: could not open directory 'debian/source/': No such file or directory 402s => `' 402s + git diff --quiet HEAD 402s massage split -F. 402s massage done 3 -b. 402s format , quilt mode gbp 402s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 402s warning: could not open directory 'debian/source/': No such file or directory 402s => `' 402s + git diff --quiet HEAD 402s 402s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 402s dgit: Have to apply the patches - making the tree dirty. 402s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 402s 402s + dpkg-source --before-build . 402s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 403s dpkg-buildpackage: info: source package example 403s dpkg-buildpackage: info: source version 1.0 403s dpkg-buildpackage: info: source distribution unstable 403s dpkg-buildpackage: info: source changed by Ian Jackson 403s fakeroot debian/rules clean 403s EXAMPLE RULES TARGET clean 403s dh_clean 403s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 403s | git rev-parse 'HEAD~0' 403s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 403s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 403s CD work 403s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 403s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 403s CD .. 403s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 403s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 403s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 403s dpkg-source: info: using source format '1.0' 403s dpkg-source: info: building example in example_1.0.tar.gz 403s dpkg-source: info: building example in example_1.0.dsc 403s CD work 403s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 403s package seems new, not specifying -v 403s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 403s dpkg-genchanges: info: including full source code in upload 403s CD .. 403s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 403s renaming (Files) example_1.0.tar.gz 403s renaming (dsc) example_1.0.dsc 403s renaming (changes) example_1.0_source.changes 403s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 403s dgit: Unapplying patches again to tidy up the tree. 403s + dpkg-source --after-build . 403s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 403s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 403s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 403s gbp:info: Performing the build 403s dpkg-buildpackage: info: source package example 403s dpkg-buildpackage: info: source version 1.0 403s dpkg-buildpackage: info: source distribution unstable 403s dpkg-buildpackage: info: source changed by Ian Jackson 403s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 403s dpkg-buildpackage: info: host architecture ppc64el 403s debian/rules build 403s EXAMPLE RULES TARGET build 403s fakeroot debian/rules binary 403s EXAMPLE RULES TARGET binary 403s dh_install 403s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 403s dh_gencontrol 404s dh_builddeb 404s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 404s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 404s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 404s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 404s dpkg-genbuildinfo --build=binary -O../example_1.0_ppc64el.buildinfo 404s dpkg-genchanges --build=binary -O../example_1.0_ppc64el.changes 404s dpkg-genchanges: info: binary-only upload (no source code included) 404s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 404s dpkg-buildpackage: info: binary-only upload (no source included) 404s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 404s + mergechanges -f example_1.0_source.changes example_1.0_ppc64el.changes 405s dgit ok: build successful, results in example_1.0_multi.changes 405s 405s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 405s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 405s ' 405s + local 'ps=0 0' 405s + set -o pipefail 405s + exec 405s + echo '===== [gbp-build_-F,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 405s + case $ps in 405s + actual_status=success 405s + case "$require_fail-$tolerate_fail-$actual_status" in 405s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.output 405s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 405s + local 'desc=SOURCE FILE' 405s + shift 405s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 405s + echo 'SOURCE FILE EXISTS' 405s + '[' success = success ']' 405s + local changes 405s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 405s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 405s + case "$changes" in 405s + perl -ne 'print if m/^files:/i ... m/^\S/' 405s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 405s + local 'desc=SOURCE IN CHANGES' 405s + shift 405s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 405s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 405s + echo 'SOURCE IN CHANGES EXISTS' 405s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 405s + local 'desc=DEBS IN CHANGES' 405s + shift 405s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 405s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 405s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 405s + echo 'DEBS IN CHANGES EXISTS' 405s + exec 405s + quirk-clean-fixup 405s + case $cleanmode in 405s + perl -i.unfixed -ne ' 405s print unless 405s $_ eq $last && 405s $_ eq "EXAMPLE RULES TARGET clean\n"; 405s $last = $_; 405s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.results 405s + '[' success = failure ']' 405s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.results 405s + for branch in $bm_branches 405s + bm-run-one 405s + local 'args= --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch' 405s + bmid='gbp-build -F,dpkg-source,no-check,bad-build-deps' 405s + bmid=gbp-build_-F,dpkg-source,no-check,bad-build-deps 405s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 405s + heading='===== [gbp-build_-F,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 405s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.output 405s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.expected 405s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.results 405s + bm-compute-expected 405s + require_fail=unexpect 405s + tolerate_fail=unexpect 405s + exec 405s + echo '===== [gbp-build_-F,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 405s + local eff_cleanmode=dpkg-source,no-check 405s + case "$e_targets" in 405s + case "$act" in 405s + case $eff_cleanmode in 405s + bm-build-deps-ok 405s + case "$branch" in 405s + return 1 405s + tolerate_fail=tolerate 405s + echo 'EXAMPLE RULES TARGET clean' 405s + case $eff_cleanmode in 405s + '[' 'xbuild binary' '!=' x ']' 405s + bm-build-deps-ok 405s + case "$branch" in 405s + return 1 405s + tolerate_fail=tolerate 405s + for t in $e_targets 405s + bm-build-deps-ok 405s + case "$branch" in 405s + return 1 405s + require_fail=required 405s + echo 'EXAMPLE RULES TARGET build' 405s + for t in $e_targets 405s + bm-build-deps-ok 405s + case "$branch" in 405s + return 1 405s + require_fail=required 405s + echo 'EXAMPLE RULES TARGET binary' 405s + bm-report-test 'SOURCE FILE' true 405s + local 'desc=SOURCE FILE' 405s + shift 405s + true 405s + echo 'SOURCE FILE EXISTS' 405s + bm-report-test 'SOURCE IN CHANGES' true 405s + local 'desc=SOURCE IN CHANGES' 405s + shift 405s + true 405s + echo 'SOURCE IN CHANGES EXISTS' 405s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 405s + local 'desc=DEBS IN CHANGES' 405s + shift 405s + expr 'build binary' : '.*binary.*' 405s 12 405s + echo 'DEBS IN CHANGES EXISTS' 405s + exec 405s + git checkout bad-build-deps 405s Switched to branch 'bad-build-deps' 405s + git clean -xdf 405s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 405s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 405s + set +o pipefail 405s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch 405s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.output 405s + local dgit=dgit 405s + pwd 405s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 405s + : ' 405s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 405s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch 405s | git rev-parse --show-toplevel 405s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 405s | git config -z --get-regexp --local '.*' 405s | git config -z --get-regexp --local '.*' 405s | git config -z --get-regexp --global '.*' 405s | git config -z --get-regexp --system '.*' 405s format , quilt mode gbp 405s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 405s warning: could not open directory 'debian/source/': No such file or directory 405s => `' 405s + git diff --quiet HEAD 405s massage split -F. 405s massage done 3 -b. 405s format , quilt mode gbp 405s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 405s warning: could not open directory 'debian/source/': No such file or directory 405s => `' 405s + git diff --quiet HEAD 405s 405s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 405s dgit: Have to apply the patches - making the tree dirty. 405s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 405s 405s + dpkg-source --before-build . 405s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 405s dpkg-buildpackage: info: source package example 405s dpkg-buildpackage: info: source version 1.0 405s dpkg-buildpackage: info: source distribution unstable 405s dpkg-buildpackage: info: source changed by Ian Jackson 405s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 405s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 405s dpkg-buildpackage: warning: (Use -d flag to override.) 405s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 405s 405s dgit: error: subprocess failed with error exit status 3 405s + local 'ps=255 0' 405s + set -o pipefail 405s + exec 405s + echo '===== [gbp-build_-F,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 405s + case $ps in 405s + actual_status=failure 405s + echo 'OPERATION FAILED' 405s + case "$require_fail-$tolerate_fail-$actual_status" in 405s + echo 'REQUIRED FAILURE' 405s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.output 405s + '[' 1 = 1 ']' 405s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 405s + local 'desc=SOURCE FILE' 405s + shift 405s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 405s + echo 'SOURCE FILE MISSING' 405s + '[' failure = success ']' 405s + exec 405s + quirk-clean-fixup 405s + case $cleanmode in 405s + perl -i.unfixed -ne ' 405s print unless 405s $_ eq $last && 405s $_ eq "EXAMPLE RULES TARGET clean\n"; 405s $last = $_; 405s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.results 405s + '[' failure = failure ']' 405s + for cleanmode in $cleanmodes 405s + for branch in $bm_branches 405s + bm-run-one 405s + local 'args= --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch' 405s + bmid='gbp-build -F,dpkg-source-d,no-check,indep-arch' 405s + bmid=gbp-build_-F,dpkg-source-d,no-check,indep-arch 405s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 405s + heading='===== [gbp-build_-F,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch =====' 405s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.output 405s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.expected 405s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.results 405s + bm-compute-expected 405s + require_fail=unexpect 405s + tolerate_fail=unexpect 405s + exec 405s + echo '===== [gbp-build_-F,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch =====' 405s + local eff_cleanmode=dpkg-source-d,no-check 405s + case "$e_targets" in 405s + case "$act" in 405s + case $eff_cleanmode in 405s + echo 'EXAMPLE RULES TARGET clean' 405s + case $eff_cleanmode in 405s + '[' 'xbuild binary' '!=' x ']' 405s + bm-build-deps-ok 405s + case "$branch" in 405s + return 0 405s + for t in $e_targets 405s + bm-build-deps-ok 405s + case "$branch" in 405s + return 0 405s + echo 'EXAMPLE RULES TARGET build' 405s + for t in $e_targets 405s + bm-build-deps-ok 405s + case "$branch" in 405s + return 0 405s + echo 'EXAMPLE RULES TARGET binary' 405s + bm-report-test 'SOURCE FILE' true 405s + local 'desc=SOURCE FILE' 405s + shift 405s + true 405s + echo 'SOURCE FILE EXISTS' 405s + bm-report-test 'SOURCE IN CHANGES' true 405s + local 'desc=SOURCE IN CHANGES' 405s + shift 405s + true 405s + echo 'SOURCE IN CHANGES EXISTS' 405s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 405s + local 'desc=DEBS IN CHANGES' 405s + shift 405s + expr 'build binary' : '.*binary.*' 405s 12 405s + echo 'DEBS IN CHANGES EXISTS' 405s + exec 405s + git checkout indep-arch 405s Switched to branch 'indep-arch' 405s + git clean -xdf 405s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 405s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 405s + set +o pipefail 405s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch 405s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.output 405s + local dgit=dgit 405s + pwd 405s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 405s + : ' 405s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 405s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch 405s | git rev-parse --show-toplevel 405s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 405s | git config -z --get-regexp --local '.*' 405s | git config -z --get-regexp --local '.*' 405s | git config -z --get-regexp --global '.*' 405s | git config -z --get-regexp --system '.*' 405s format , quilt mode gbp 405s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 405s warning: could not open directory 'debian/source/': No such file or directory 405s => `' 405s + git diff --quiet HEAD 405s massage split -F. 405s massage done 3 -b. 405s format , quilt mode gbp 405s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 405s warning: could not open directory 'debian/source/': No such file or directory 405s => `' 405s + git diff --quiet HEAD 405s 405s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 405s dgit: Have to apply the patches - making the tree dirty. 405s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 405s 405s + dpkg-source --before-build . 405s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 405s dpkg-buildpackage: info: source package example 405s dpkg-buildpackage: info: source version 1.0 405s dpkg-buildpackage: info: source distribution unstable 405s dpkg-buildpackage: info: source changed by Ian Jackson 405s fakeroot debian/rules clean 405s EXAMPLE RULES TARGET clean 405s dh_clean 406s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 406s | git rev-parse 'HEAD~0' 406s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 406s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 406s CD work 406s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 406s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 406s CD .. 406s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 406s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 406s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 406s dpkg-source: info: using source format '1.0' 406s dpkg-source: info: building example in example_1.0.tar.gz 406s dpkg-source: info: building example in example_1.0.dsc 406s CD work 406s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 406s package seems new, not specifying -v 406s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 406s dpkg-genchanges: info: including full source code in upload 406s CD .. 406s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 406s renaming (Files) example_1.0.tar.gz 406s renaming (dsc) example_1.0.dsc 406s renaming (changes) example_1.0_source.changes 406s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 406s dgit: Unapplying patches again to tidy up the tree. 406s + dpkg-source --after-build . 406s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 406s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 406s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 406s gbp:info: Performing the build 406s dpkg-buildpackage: info: source package example 406s dpkg-buildpackage: info: source version 1.0 406s dpkg-buildpackage: info: source distribution unstable 406s dpkg-buildpackage: info: source changed by Ian Jackson 406s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 406s dpkg-buildpackage: info: host architecture ppc64el 406s debian/rules build 406s EXAMPLE RULES TARGET build 406s fakeroot debian/rules binary 406s EXAMPLE RULES TARGET binary 406s dh_install 406s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 406s dh_gencontrol 406s dh_builddeb 407s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 407s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 407s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 407s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 407s dpkg-genbuildinfo --build=binary -O../example_1.0_ppc64el.buildinfo 407s dpkg-genchanges --build=binary -O../example_1.0_ppc64el.changes 407s dpkg-genchanges: info: binary-only upload (no source code included) 407s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 407s dpkg-buildpackage: info: binary-only upload (no source included) 407s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 407s + mergechanges -f example_1.0_source.changes example_1.0_ppc64el.changes 407s dgit ok: build successful, results in example_1.0_multi.changes 407s 407s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 407s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 407s ' 407s + local 'ps=0 0' 407s + set -o pipefail 407s + exec 407s + echo '===== [gbp-build_-F,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch =====' 407s + case $ps in 407s + actual_status=success 407s + case "$require_fail-$tolerate_fail-$actual_status" in 407s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.output 407s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 407s + local 'desc=SOURCE FILE' 407s + shift 407s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 407s + echo 'SOURCE FILE EXISTS' 407s + '[' success = success ']' 407s + local changes 407s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 407s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 407s + case "$changes" in 407s + perl -ne 'print if m/^files:/i ... m/^\S/' 407s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 407s + local 'desc=SOURCE IN CHANGES' 407s + shift 407s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 407s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 407s + echo 'SOURCE IN CHANGES EXISTS' 407s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 407s + local 'desc=DEBS IN CHANGES' 407s + shift 407s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 407s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 407s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 407s + echo 'DEBS IN CHANGES EXISTS' 407s + exec 407s + quirk-clean-fixup 407s + case $cleanmode in 407s + perl -i.unfixed -ne ' 407s print unless 407s $_ eq $last && 407s $_ eq "EXAMPLE RULES TARGET clean\n"; 407s $last = $_; 407s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.results 407s + '[' success = failure ']' 407s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.results 407s + for branch in $bm_branches 407s + bm-run-one 407s + local 'args= --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch' 407s + bmid='gbp-build -F,dpkg-source-d,no-check,bad-build-deps' 407s + bmid=gbp-build_-F,dpkg-source-d,no-check,bad-build-deps 407s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 407s + 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 =====' 407s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.output 407s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.expected 407s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.results 407s + bm-compute-expected 407s + require_fail=unexpect 407s + tolerate_fail=unexpect 407s + exec 407s + 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 =====' 407s + local eff_cleanmode=dpkg-source-d,no-check 407s + case "$e_targets" in 407s + case "$act" in 407s + case $eff_cleanmode in 407s + echo 'EXAMPLE RULES TARGET clean' 407s + case $eff_cleanmode in 407s + '[' 'xbuild binary' '!=' x ']' 407s + bm-build-deps-ok 407s + case "$branch" in 407s + return 1 407s + tolerate_fail=tolerate 407s + for t in $e_targets 407s + bm-build-deps-ok 407s + case "$branch" in 407s + return 1 407s + require_fail=required 407s + echo 'EXAMPLE RULES TARGET build' 407s + for t in $e_targets 407s + bm-build-deps-ok 407s + case "$branch" in 407s + return 1 407s + require_fail=required 407s + echo 'EXAMPLE RULES TARGET binary' 407s + bm-report-test 'SOURCE FILE' true 407s + local 'desc=SOURCE FILE' 407s + shift 407s + true 407s + echo 'SOURCE FILE EXISTS' 407s + bm-report-test 'SOURCE IN CHANGES' true 407s + local 'desc=SOURCE IN CHANGES' 407s + shift 407s + true 407s + echo 'SOURCE IN CHANGES EXISTS' 407s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 407s + local 'desc=DEBS IN CHANGES' 407s + shift 407s + expr 'build binary' : '.*binary.*' 407s 12 407s + echo 'DEBS IN CHANGES EXISTS' 407s + exec 407s + git checkout bad-build-deps 407s Switched to branch 'bad-build-deps' 407s + git clean -xdf 407s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 407s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 407s + set +o pipefail 407s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.output 407s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch 407s + local dgit=dgit 407s + pwd 407s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 407s + : ' 407s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 407s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch 408s | git rev-parse --show-toplevel 408s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 408s | git config -z --get-regexp --local '.*' 408s | git config -z --get-regexp --local '.*' 408s | git config -z --get-regexp --global '.*' 408s | git config -z --get-regexp --system '.*' 408s format , quilt mode gbp 408s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 408s warning: could not open directory 'debian/source/': No such file or directory 408s => `' 408s + git diff --quiet HEAD 408s massage split -F. 408s massage done 3 -b. 408s format , quilt mode gbp 408s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 408s warning: could not open directory 'debian/source/': No such file or directory 408s => `' 408s + git diff --quiet HEAD 408s 408s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 408s dgit: Have to apply the patches - making the tree dirty. 408s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 408s 408s + dpkg-source --before-build . 408s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 408s dpkg-buildpackage: info: source package example 408s dpkg-buildpackage: info: source version 1.0 408s dpkg-buildpackage: info: source distribution unstable 408s dpkg-buildpackage: info: source changed by Ian Jackson 408s fakeroot debian/rules clean 408s EXAMPLE RULES TARGET clean 408s dh_clean 408s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 408s | git rev-parse 'HEAD~0' 408s => `d09bc55f43bc5586103335d232c16bd041247bd1' 408s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 408s CD work 408s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 408s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 408s CD .. 408s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 408s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 408s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 408s dpkg-source: info: using source format '1.0' 408s dpkg-source: info: building example in example_1.0.tar.gz 408s dpkg-source: info: building example in example_1.0.dsc 408s CD work 408s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 408s package seems new, not specifying -v 408s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 408s dpkg-genchanges: info: including full source code in upload 408s CD .. 408s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 408s renaming (Files) example_1.0.tar.gz 408s renaming (dsc) example_1.0.dsc 408s renaming (changes) example_1.0_source.changes 408s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 408s dgit: Unapplying patches again to tidy up the tree. 408s + dpkg-source --after-build . 408s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 408s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 408s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 408s gbp:info: Performing the build 408s dpkg-buildpackage: info: source package example 408s dpkg-buildpackage: info: source version 1.0 408s dpkg-buildpackage: info: source distribution unstable 408s dpkg-buildpackage: info: source changed by Ian Jackson 408s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 408s dpkg-buildpackage: info: host architecture ppc64el 409s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 409s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 409s dpkg-buildpackage: warning: (Use -d flag to override.) 409s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 409s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 409s 409s dgit: error: subprocess failed with error exit status 1 409s + local 'ps=255 0' 409s + set -o pipefail 409s + exec 409s + 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 =====' 409s + case $ps in 409s + actual_status=failure 409s + echo 'OPERATION FAILED' 409s + case "$require_fail-$tolerate_fail-$actual_status" in 409s + echo 'REQUIRED FAILURE' 409s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.output 409s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 409s + local 'desc=SOURCE FILE' 409s + shift 409s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 409s + echo 'SOURCE FILE EXISTS' 409s + '[' failure = success ']' 409s + exec 409s + quirk-clean-fixup 409s + case $cleanmode in 409s + perl -i.unfixed -ne ' 409s print unless 409s $_ eq $last && 409s $_ eq "EXAMPLE RULES TARGET clean\n"; 409s $last = $_; 409s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.results 409s + '[' failure = failure ']' 409s + : bm-act-iterate done. 409s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 409s + bm-guess-e-source-e-targets 'gbp-build -g' 409s + local 'some_act=gbp-build -g' 409s + case "$some_act" in 409s + e_source=true 409s + e_targets='build-indep binary-indep' 409s + real_act='gbp-build -g --git-ignore-branch' 409s + bm-act-iterate 409s + for cleanmode in $cleanmodes 409s + for branch in $bm_branches 409s + bm-run-one 409s + local 'args= --clean=git gbp-build -g --git-ignore-branch' 409s + bmid='gbp-build -g,git,indep-arch' 409s + bmid=gbp-build_-g,git,indep-arch 409s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 409s + heading='===== [gbp-build_-g,git,indep-arch] dgit --clean=git gbp-build -g --git-ignore-branch =====' 409s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.output 409s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.expected 409s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.results 409s + bm-compute-expected 409s + require_fail=unexpect 409s + tolerate_fail=unexpect 409s + exec 409s + echo '===== [gbp-build_-g,git,indep-arch] dgit --clean=git gbp-build -g --git-ignore-branch =====' 409s + local eff_cleanmode=git 409s + case "$e_targets" in 409s + case "$act" in 409s + case $eff_cleanmode in 409s + echo 'BUILD-MODES PROGRAM git clean -xdf' 409s + case $eff_cleanmode in 409s + '[' 'xbuild-indep binary-indep' '!=' x ']' 409s + bm-build-deps-ok 409s + case "$branch" in 409s + return 0 409s + for t in $e_targets 409s + bm-build-deps-ok 409s + case "$branch" in 409s + return 0 409s + echo 'EXAMPLE RULES TARGET build-indep' 409s + for t in $e_targets 409s + bm-build-deps-ok 409s + case "$branch" in 409s + return 0 409s + echo 'EXAMPLE RULES TARGET binary-indep' 409s + bm-report-test 'SOURCE FILE' true 409s + local 'desc=SOURCE FILE' 409s + shift 409s + true 409s + echo 'SOURCE FILE EXISTS' 409s + bm-report-test 'SOURCE IN CHANGES' true 409s + local 'desc=SOURCE IN CHANGES' 409s + shift 409s + true 409s + echo 'SOURCE IN CHANGES EXISTS' 409s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 409s + local 'desc=DEBS IN CHANGES' 409s + shift 409s + expr 'build-indep binary-indep' : '.*binary.*' 409s 24 409s + echo 'DEBS IN CHANGES EXISTS' 409s + exec 409s + git checkout indep-arch 409s Switched to branch 'indep-arch' 409s + git clean -xdf 409s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 409s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 409s + set +o pipefail 409s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.output 409s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -g --git-ignore-branch 409s + local dgit=dgit 409s + pwd 409s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 409s + : ' 409s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 409s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -g --git-ignore-branch 409s | git rev-parse --show-toplevel 409s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 409s | git config -z --get-regexp --local '.*' 409s | git config -z --get-regexp --local '.*' 409s | git config -z --get-regexp --global '.*' 409s | git config -z --get-regexp --system '.*' 409s format , quilt mode gbp 409s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 409s warning: could not open directory 'debian/source/': No such file or directory 409s => `' 409s + git diff --quiet HEAD 409s massage split -g. 409s massage done 3 -A. 409s format , quilt mode gbp 409s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 409s warning: could not open directory 'debian/source/': No such file or directory 409s => `' 409s + git diff --quiet HEAD 409s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 409s BUILD-MODES PROGRAM git clean -xdf 409s | git rev-parse 'HEAD~0' 409s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 409s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 409s CD work 409s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 409s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 409s CD .. 409s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 409s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 409s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 409s dpkg-source: info: using source format '1.0' 409s dpkg-source: info: building example in example_1.0.tar.gz 409s dpkg-source: info: building example in example_1.0.dsc 409s CD work 409s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 409s package seems new, not specifying -v 409s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 409s dpkg-genchanges: info: including full source code in upload 409s CD .. 409s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 409s renaming (Files) example_1.0.tar.gz 409s renaming (dsc) example_1.0.dsc 409s renaming (changes) example_1.0_source.changes 409s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 409s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 409s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 409s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 409s gbp:info: Performing the build 409s dpkg-buildpackage: info: source package example 409s dpkg-buildpackage: info: source version 1.0 409s dpkg-buildpackage: info: source distribution unstable 409s dpkg-buildpackage: info: source changed by Ian Jackson 409s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 410s debian/rules build-indep 410s EXAMPLE RULES TARGET build-indep 410s fakeroot debian/rules binary-indep 410s EXAMPLE RULES TARGET binary-indep 410s dh_install 410s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 410s dh_gencontrol 410s dh_builddeb 410s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 410s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 410s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 410s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 410s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 410s dpkg-genchanges --build=all -O../example_1.0_all.changes 410s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 410s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 410s dpkg-buildpackage: info: binary-only upload (no source included) 410s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 410s + mergechanges -f example_1.0_source.changes example_1.0_all.changes 411s dgit ok: build successful, results in example_1.0_multi.changes 411s 411s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 411s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 411s ' 411s + local 'ps=0 0' 411s + set -o pipefail 411s + exec 411s + echo '===== [gbp-build_-g,git,indep-arch] dgit --clean=git gbp-build -g --git-ignore-branch =====' 411s + case $ps in 411s + actual_status=success 411s + case "$require_fail-$tolerate_fail-$actual_status" in 411s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.output 411s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 411s + local 'desc=SOURCE FILE' 411s + shift 411s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 411s + echo 'SOURCE FILE EXISTS' 411s + '[' success = success ']' 411s + local changes 411s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 411s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 411s + case "$changes" in 411s + perl -ne 'print if m/^files:/i ... m/^\S/' 411s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 411s + local 'desc=SOURCE IN CHANGES' 411s + shift 411s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 411s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 411s + echo 'SOURCE IN CHANGES EXISTS' 411s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 411s + local 'desc=DEBS IN CHANGES' 411s + shift 411s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 411s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 411s + echo 'DEBS IN CHANGES EXISTS' 411s + exec 411s + quirk-clean-fixup 411s + case $cleanmode in 411s + '[' success = failure ']' 411s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.results 411s + for branch in $bm_branches 411s + bm-run-one 411s + local 'args= --clean=git gbp-build -g --git-ignore-branch' 411s + bmid='gbp-build -g,git,bad-build-deps' 411s + bmid=gbp-build_-g,git,bad-build-deps 411s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 411s + heading='===== [gbp-build_-g,git,bad-build-deps] dgit --clean=git gbp-build -g --git-ignore-branch =====' 411s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,bad-build-deps.output 411s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,bad-build-deps.expected 411s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,bad-build-deps.results 411s + bm-compute-expected 411s + require_fail=unexpect 411s + tolerate_fail=unexpect 411s + exec 411s + echo '===== [gbp-build_-g,git,bad-build-deps] dgit --clean=git gbp-build -g --git-ignore-branch =====' 411s + local eff_cleanmode=git 411s + case "$e_targets" in 411s + case "$act" in 411s + case $eff_cleanmode in 411s + echo 'BUILD-MODES PROGRAM git clean -xdf' 411s + case $eff_cleanmode in 411s + '[' 'xbuild-indep binary-indep' '!=' x ']' 411s + bm-build-deps-ok 411s + case "$branch" in 411s + return 1 411s + tolerate_fail=tolerate 411s + for t in $e_targets 411s + bm-build-deps-ok 411s + case "$branch" in 411s + return 1 411s + require_fail=required 411s + echo 'EXAMPLE RULES TARGET build-indep' 411s + for t in $e_targets 411s + bm-build-deps-ok 411s + case "$branch" in 411s + return 1 411s + require_fail=required 411s + echo 'EXAMPLE RULES TARGET binary-indep' 411s + bm-report-test 'SOURCE FILE' true 411s + local 'desc=SOURCE FILE' 411s + shift 411s + true 411s + echo 'SOURCE FILE EXISTS' 411s + bm-report-test 'SOURCE IN CHANGES' true 411s + local 'desc=SOURCE IN CHANGES' 411s + shift 411s + true 411s + echo 'SOURCE IN CHANGES EXISTS' 411s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 411s + local 'desc=DEBS IN CHANGES' 411s + shift 411s + expr 'build-indep binary-indep' : '.*binary.*' 411s 24 411s + echo 'DEBS IN CHANGES EXISTS' 411s + exec 411s + git checkout bad-build-deps 411s Switched to branch 'bad-build-deps' 411s + git clean -xdf 411s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 411s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 411s + set +o pipefail 411s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,bad-build-deps.output 411s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -g --git-ignore-branch 411s + local dgit=dgit 411s + pwd 411s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 411s + : ' 411s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 411s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -g --git-ignore-branch 411s | git rev-parse --show-toplevel 411s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 411s | git config -z --get-regexp --local '.*' 411s | git config -z --get-regexp --local '.*' 411s | git config -z --get-regexp --global '.*' 411s | git config -z --get-regexp --system '.*' 411s format , quilt mode gbp 411s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 411s warning: could not open directory 'debian/source/': No such file or directory 411s => `' 411s + git diff --quiet HEAD 411s massage split -g. 411s massage done 3 -A. 411s format , quilt mode gbp 411s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 411s warning: could not open directory 'debian/source/': No such file or directory 411s => `' 411s + git diff --quiet HEAD 411s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 411s BUILD-MODES PROGRAM git clean -xdf 411s | git rev-parse 'HEAD~0' 411s => `d09bc55f43bc5586103335d232c16bd041247bd1' 411s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 411s CD work 411s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 411s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 411s CD .. 411s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 411s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 411s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 411s dpkg-source: info: using source format '1.0' 411s dpkg-source: info: building example in example_1.0.tar.gz 411s dpkg-source: info: building example in example_1.0.dsc 411s CD work 411s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 411s package seems new, not specifying -v 411s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 411s dpkg-genchanges: info: including full source code in upload 411s CD .. 411s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 411s renaming (Files) example_1.0.tar.gz 411s renaming (dsc) example_1.0.dsc 411s renaming (changes) example_1.0_source.changes 411s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 411s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 411s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 411s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 411s gbp:info: Performing the build 411s dpkg-buildpackage: info: source package example 411s dpkg-buildpackage: info: source version 1.0 411s dpkg-buildpackage: info: source distribution unstable 411s dpkg-buildpackage: info: source changed by Ian Jackson 411s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 412s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 412s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 412s dpkg-buildpackage: warning: (Use -d flag to override.) 412s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 412s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 412s 412s dgit: error: subprocess failed with error exit status 1 412s + local 'ps=255 0' 412s + set -o pipefail 412s + exec 412s + echo '===== [gbp-build_-g,git,bad-build-deps] dgit --clean=git gbp-build -g --git-ignore-branch =====' 412s + case $ps in 412s + actual_status=failure 412s + echo 'OPERATION FAILED' 412s + case "$require_fail-$tolerate_fail-$actual_status" in 412s + echo 'REQUIRED FAILURE' 412s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,git,bad-build-deps.output 412s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 412s + local 'desc=SOURCE FILE' 412s + shift 412s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 412s + echo 'SOURCE FILE EXISTS' 412s + '[' failure = success ']' 412s + exec 412s + quirk-clean-fixup 412s + case $cleanmode in 412s + '[' failure = failure ']' 412s + for cleanmode in $cleanmodes 412s + for branch in $bm_branches 412s + bm-run-one 412s + local 'args= --clean=none gbp-build -g --git-ignore-branch' 412s + bmid='gbp-build -g,none,indep-arch' 412s + bmid=gbp-build_-g,none,indep-arch 412s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 412s + heading='===== [gbp-build_-g,none,indep-arch] dgit --clean=none gbp-build -g --git-ignore-branch =====' 412s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.output 412s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.expected 412s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.results 412s + bm-compute-expected 412s + require_fail=unexpect 412s + tolerate_fail=unexpect 412s + exec 412s + echo '===== [gbp-build_-g,none,indep-arch] dgit --clean=none gbp-build -g --git-ignore-branch =====' 412s + local eff_cleanmode=none 412s + case "$e_targets" in 412s + case "$act" in 412s + case $eff_cleanmode in 412s + case $eff_cleanmode in 412s + '[' 'xbuild-indep binary-indep' '!=' x ']' 412s + bm-build-deps-ok 412s + case "$branch" in 412s + return 0 412s + for t in $e_targets 412s + bm-build-deps-ok 412s + case "$branch" in 412s + return 0 412s + echo 'EXAMPLE RULES TARGET build-indep' 412s + for t in $e_targets 412s + bm-build-deps-ok 412s + case "$branch" in 412s + return 0 412s + echo 'EXAMPLE RULES TARGET binary-indep' 412s + bm-report-test 'SOURCE FILE' true 412s + local 'desc=SOURCE FILE' 412s + shift 412s + true 412s + echo 'SOURCE FILE EXISTS' 412s + bm-report-test 'SOURCE IN CHANGES' true 412s + local 'desc=SOURCE IN CHANGES' 412s + shift 412s + true 412s + echo 'SOURCE IN CHANGES EXISTS' 412s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 412s + local 'desc=DEBS IN CHANGES' 412s + shift 412s + expr 'build-indep binary-indep' : '.*binary.*' 412s 24 412s + echo 'DEBS IN CHANGES EXISTS' 412s + exec 412s + git checkout indep-arch 412s Switched to branch 'indep-arch' 412s + git clean -xdf 412s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 412s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 412s + set +o pipefail 412s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -g --git-ignore-branch 412s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.output 412s + local dgit=dgit 412s + pwd 412s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 412s + : ' 412s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 412s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -g --git-ignore-branch 412s | git rev-parse --show-toplevel 412s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 412s | git config -z --get-regexp --local '.*' 412s | git config -z --get-regexp --local '.*' 412s | git config -z --get-regexp --global '.*' 412s | git config -z --get-regexp --system '.*' 412s format , quilt mode gbp 412s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 412s warning: could not open directory 'debian/source/': No such file or directory 412s => `' 412s + git diff --quiet HEAD 412s massage split -g. 412s massage done 3 -A. 412s format , quilt mode gbp 412s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 412s warning: could not open directory 'debian/source/': No such file or directory 412s => `' 412s + git diff --quiet HEAD 412s | git rev-parse 'HEAD~0' 412s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 412s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 412s CD work 412s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 412s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 412s CD .. 412s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 412s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 412s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 412s dpkg-source: info: using source format '1.0' 412s dpkg-source: info: building example in example_1.0.tar.gz 412s dpkg-source: info: building example in example_1.0.dsc 412s CD work 412s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 412s package seems new, not specifying -v 412s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 412s dpkg-genchanges: info: including full source code in upload 412s CD .. 412s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 412s renaming (Files) example_1.0.tar.gz 412s renaming (dsc) example_1.0.dsc 412s renaming (changes) example_1.0_source.changes 412s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 412s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 412s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 412s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 412s gbp:info: Performing the build 412s dpkg-buildpackage: info: source package example 412s dpkg-buildpackage: info: source version 1.0 412s dpkg-buildpackage: info: source distribution unstable 412s dpkg-buildpackage: info: source changed by Ian Jackson 412s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 412s debian/rules build-indep 412s EXAMPLE RULES TARGET build-indep 412s fakeroot debian/rules binary-indep 413s EXAMPLE RULES TARGET binary-indep 413s dh_install 413s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 413s dh_gencontrol 413s dh_builddeb 413s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 413s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 413s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 413s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 413s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 413s dpkg-genchanges --build=all -O../example_1.0_all.changes 413s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 413s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 413s dpkg-buildpackage: info: binary-only upload (no source included) 413s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 413s + mergechanges -f example_1.0_source.changes example_1.0_all.changes 414s dgit ok: build successful, results in example_1.0_multi.changes 414s 414s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 414s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 414s ' 414s + local 'ps=0 0' 414s + set -o pipefail 414s + exec 414s + echo '===== [gbp-build_-g,none,indep-arch] dgit --clean=none gbp-build -g --git-ignore-branch =====' 414s + case $ps in 414s + actual_status=success 414s + case "$require_fail-$tolerate_fail-$actual_status" in 414s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.output 414s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 414s + local 'desc=SOURCE FILE' 414s + shift 414s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 414s + echo 'SOURCE FILE EXISTS' 414s + '[' success = success ']' 414s + local changes 414s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 414s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 414s + case "$changes" in 414s + perl -ne 'print if m/^files:/i ... m/^\S/' 414s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 414s + local 'desc=SOURCE IN CHANGES' 414s + shift 414s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 414s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 414s + echo 'SOURCE IN CHANGES EXISTS' 414s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 414s + local 'desc=DEBS IN CHANGES' 414s + shift 414s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 414s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 414s + echo 'DEBS IN CHANGES EXISTS' 414s + exec 414s + quirk-clean-fixup 414s + case $cleanmode in 414s + '[' success = failure ']' 414s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.results 414s + for branch in $bm_branches 414s + bm-run-one 414s + local 'args= --clean=none gbp-build -g --git-ignore-branch' 414s + bmid='gbp-build -g,none,bad-build-deps' 414s + bmid=gbp-build_-g,none,bad-build-deps 414s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 414s + heading='===== [gbp-build_-g,none,bad-build-deps] dgit --clean=none gbp-build -g --git-ignore-branch =====' 414s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,bad-build-deps.output 414s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,bad-build-deps.expected 414s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,bad-build-deps.results 414s + bm-compute-expected 414s + require_fail=unexpect 414s + tolerate_fail=unexpect 414s + exec 414s + echo '===== [gbp-build_-g,none,bad-build-deps] dgit --clean=none gbp-build -g --git-ignore-branch =====' 414s + local eff_cleanmode=none 414s + case "$e_targets" in 414s + case "$act" in 414s + case $eff_cleanmode in 414s + case $eff_cleanmode in 414s + '[' 'xbuild-indep binary-indep' '!=' x ']' 414s + bm-build-deps-ok 414s + case "$branch" in 414s + return 1 414s + tolerate_fail=tolerate 414s + for t in $e_targets 414s + bm-build-deps-ok 414s + case "$branch" in 414s + return 1 414s + require_fail=required 414s + echo 'EXAMPLE RULES TARGET build-indep' 414s + for t in $e_targets 414s + bm-build-deps-ok 414s + case "$branch" in 414s + return 1 414s + require_fail=required 414s + echo 'EXAMPLE RULES TARGET binary-indep' 414s + bm-report-test 'SOURCE FILE' true 414s + local 'desc=SOURCE FILE' 414s + shift 414s + true 414s + echo 'SOURCE FILE EXISTS' 414s + bm-report-test 'SOURCE IN CHANGES' true 414s + local 'desc=SOURCE IN CHANGES' 414s + shift 414s + true 414s + echo 'SOURCE IN CHANGES EXISTS' 414s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 414s + local 'desc=DEBS IN CHANGES' 414s + shift 414s + expr 'build-indep binary-indep' : '.*binary.*' 414s 24 414s + echo 'DEBS IN CHANGES EXISTS' 414s + exec 414s + git checkout bad-build-deps 414s Switched to branch 'bad-build-deps' 414s + git clean -xdf 414s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 414s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 414s + set +o pipefail 414s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -g --git-ignore-branch 414s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,bad-build-deps.output 414s + local dgit=dgit 414s + pwd 414s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 414s + : ' 414s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 414s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -g --git-ignore-branch 414s | git rev-parse --show-toplevel 415s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 415s | git config -z --get-regexp --local '.*' 415s | git config -z --get-regexp --local '.*' 415s | git config -z --get-regexp --global '.*' 415s | git config -z --get-regexp --system '.*' 415s format , quilt mode gbp 415s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 415s warning: could not open directory 'debian/source/': No such file or directory 415s => `' 415s + git diff --quiet HEAD 415s massage split -g. 415s massage done 3 -A. 415s format , quilt mode gbp 415s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 415s warning: could not open directory 'debian/source/': No such file or directory 415s => `' 415s + git diff --quiet HEAD 415s | git rev-parse 'HEAD~0' 415s => `d09bc55f43bc5586103335d232c16bd041247bd1' 415s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 415s CD work 415s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 415s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 415s CD .. 415s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 415s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 415s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 415s dpkg-source: info: using source format '1.0' 415s dpkg-source: info: building example in example_1.0.tar.gz 415s dpkg-source: info: building example in example_1.0.dsc 415s CD work 415s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 415s package seems new, not specifying -v 415s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 415s dpkg-genchanges: info: including full source code in upload 415s CD .. 415s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 415s renaming (Files) example_1.0.tar.gz 415s renaming (dsc) example_1.0.dsc 415s renaming (changes) example_1.0_source.changes 415s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 415s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 415s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 415s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 415s gbp:info: Performing the build 415s dpkg-buildpackage: info: source package example 415s dpkg-buildpackage: info: source version 1.0 415s dpkg-buildpackage: info: source distribution unstable 415s dpkg-buildpackage: info: source changed by Ian Jackson 415s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 415s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 415s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 415s dpkg-buildpackage: warning: (Use -d flag to override.) 415s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 415s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 415s 415s dgit: error: subprocess failed with error exit status 1 415s + local 'ps=255 0' 415s + set -o pipefail 415s + exec 415s + echo '===== [gbp-build_-g,none,bad-build-deps] dgit --clean=none gbp-build -g --git-ignore-branch =====' 415s + case $ps in 415s + actual_status=failure 415s + echo 'OPERATION FAILED' 415s + case "$require_fail-$tolerate_fail-$actual_status" in 415s + echo 'REQUIRED FAILURE' 415s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,none,bad-build-deps.output 415s + '[' 1 = 1 ']' 415s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 415s + local 'desc=SOURCE FILE' 415s + shift 415s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 415s + echo 'SOURCE FILE EXISTS' 415s + '[' failure = success ']' 415s + exec 415s + quirk-clean-fixup 415s + case $cleanmode in 415s + '[' failure = failure ']' 415s + for cleanmode in $cleanmodes 415s + for branch in $bm_branches 415s + bm-run-one 415s + local 'args= --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch' 415s + bmid='gbp-build -g,dpkg-source,no-check,indep-arch' 415s + bmid=gbp-build_-g,dpkg-source,no-check,indep-arch 415s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 415s + heading='===== [gbp-build_-g,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 415s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.output 415s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.expected 415s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.results 415s + bm-compute-expected 415s + require_fail=unexpect 415s + tolerate_fail=unexpect 415s + exec 415s + echo '===== [gbp-build_-g,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 415s + local eff_cleanmode=dpkg-source,no-check 415s + case "$e_targets" in 415s + case "$act" in 415s + case $eff_cleanmode in 415s + bm-build-deps-ok 415s + case "$branch" in 415s + return 0 415s + echo 'EXAMPLE RULES TARGET clean' 415s + case $eff_cleanmode in 415s + '[' 'xbuild-indep binary-indep' '!=' x ']' 415s + bm-build-deps-ok 415s + case "$branch" in 415s + return 0 415s + for t in $e_targets 415s + bm-build-deps-ok 415s + case "$branch" in 415s + return 0 415s + echo 'EXAMPLE RULES TARGET build-indep' 415s + for t in $e_targets 415s + bm-build-deps-ok 415s + case "$branch" in 415s + return 0 415s + echo 'EXAMPLE RULES TARGET binary-indep' 415s + bm-report-test 'SOURCE FILE' true 415s + local 'desc=SOURCE FILE' 415s + shift 415s + true 415s + echo 'SOURCE FILE EXISTS' 415s + bm-report-test 'SOURCE IN CHANGES' true 415s + local 'desc=SOURCE IN CHANGES' 415s + shift 415s + true 415s + echo 'SOURCE IN CHANGES EXISTS' 415s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 415s + local 'desc=DEBS IN CHANGES' 415s + shift 415s + expr 'build-indep binary-indep' : '.*binary.*' 415s 24 415s + echo 'DEBS IN CHANGES EXISTS' 415s + exec 415s + git checkout indep-arch 415s Switched to branch 'indep-arch' 415s + git clean -xdf 415s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 415s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 415s + set +o pipefail 415s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch 415s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.output 415s + local dgit=dgit 415s + pwd 415s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 415s + : ' 415s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 415s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch 415s | git rev-parse --show-toplevel 415s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 415s | git config -z --get-regexp --local '.*' 415s | git config -z --get-regexp --local '.*' 415s | git config -z --get-regexp --global '.*' 415s | git config -z --get-regexp --system '.*' 415s format , quilt mode gbp 415s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 415s warning: could not open directory 'debian/source/': No such file or directory 415s => `' 415s + git diff --quiet HEAD 415s massage split -g. 415s massage done 3 -A. 415s format , quilt mode gbp 415s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 415s warning: could not open directory 'debian/source/': No such file or directory 415s => `' 415s + git diff --quiet HEAD 415s 415s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 415s dgit: Have to apply the patches - making the tree dirty. 415s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 415s 415s + dpkg-source --before-build . 415s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 415s dpkg-buildpackage: info: source package example 415s dpkg-buildpackage: info: source version 1.0 415s dpkg-buildpackage: info: source distribution unstable 415s dpkg-buildpackage: info: source changed by Ian Jackson 415s fakeroot debian/rules clean 415s EXAMPLE RULES TARGET clean 415s dh_clean 415s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 415s | git rev-parse 'HEAD~0' 415s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 415s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 415s CD work 415s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 415s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 415s CD .. 415s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 415s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 415s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 415s dpkg-source: info: using source format '1.0' 415s dpkg-source: info: building example in example_1.0.tar.gz 415s dpkg-source: info: building example in example_1.0.dsc 415s CD work 415s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 415s package seems new, not specifying -v 415s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 415s dpkg-genchanges: info: including full source code in upload 415s CD .. 415s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 415s renaming (Files) example_1.0.tar.gz 415s renaming (dsc) example_1.0.dsc 415s renaming (changes) example_1.0_source.changes 415s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 415s dgit: Unapplying patches again to tidy up the tree. 415s + dpkg-source --after-build . 415s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 416s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 416s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 416s gbp:info: Performing the build 416s dpkg-buildpackage: info: source package example 416s dpkg-buildpackage: info: source version 1.0 416s dpkg-buildpackage: info: source distribution unstable 416s dpkg-buildpackage: info: source changed by Ian Jackson 416s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 416s debian/rules build-indep 416s EXAMPLE RULES TARGET build-indep 416s fakeroot debian/rules binary-indep 416s EXAMPLE RULES TARGET binary-indep 416s dh_install 416s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 416s dh_gencontrol 416s dh_builddeb 416s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 416s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch ..dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 416s 416s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 416s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 416s dpkg-genchanges --build=all -O../example_1.0_all.changes 416s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 416s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 416s dpkg-buildpackage: info: binary-only upload (no source included) 417s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 417s + mergechanges -f example_1.0_source.changes example_1.0_all.changes 417s dgit ok: build successful, results in example_1.0_multi.changes 417s 417s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 417s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 417s ' 417s + local 'ps=0 0' 417s + set -o pipefail 417s + exec 417s + echo '===== [gbp-build_-g,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 417s + case $ps in 417s + actual_status=success 417s + case "$require_fail-$tolerate_fail-$actual_status" in 417s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.output 417s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 417s + local 'desc=SOURCE FILE' 417s + shift 417s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 417s + echo 'SOURCE FILE EXISTS' 417s + '[' success = success ']' 417s + local changes 417s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 417s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 417s + case "$changes" in 417s + perl -ne 'print if m/^files:/i ... m/^\S/' 417s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 417s + local 'desc=SOURCE IN CHANGES' 417s + shift 417s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 417s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 417s + echo 'SOURCE IN CHANGES EXISTS' 417s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 417s + local 'desc=DEBS IN CHANGES' 417s + shift 417s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 417s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 417s + echo 'DEBS IN CHANGES EXISTS' 417s + exec 417s + quirk-clean-fixup 417s + case $cleanmode in 417s + perl -i.unfixed -ne ' 417s print unless 417s $_ eq $last && 417s $_ eq "EXAMPLE RULES TARGET clean\n"; 417s $last = $_; 417s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.results 417s + '[' success = failure ']' 417s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.results 417s + for branch in $bm_branches 417s + bm-run-one 417s + local 'args= --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch' 417s + bmid='gbp-build -g,dpkg-source,no-check,bad-build-deps' 417s + bmid=gbp-build_-g,dpkg-source,no-check,bad-build-deps 417s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 417s + heading='===== [gbp-build_-g,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 417s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.output 417s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.expected 417s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.results 417s + bm-compute-expected 417s + require_fail=unexpect 417s + tolerate_fail=unexpect 417s + exec 417s + echo '===== [gbp-build_-g,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 417s + local eff_cleanmode=dpkg-source,no-check 417s + case "$e_targets" in 417s + case "$act" in 417s + case $eff_cleanmode in 417s + bm-build-deps-ok 417s + case "$branch" in 417s + return 1 417s + tolerate_fail=tolerate 417s + echo 'EXAMPLE RULES TARGET clean' 417s + case $eff_cleanmode in 417s + '[' 'xbuild-indep binary-indep' '!=' x ']' 417s + bm-build-deps-ok 417s + case "$branch" in 417s + return 1 417s + tolerate_fail=tolerate 417s + for t in $e_targets 417s + bm-build-deps-ok 417s + case "$branch" in 417s + return 1 417s + require_fail=required 417s + echo 'EXAMPLE RULES TARGET build-indep' 417s + for t in $e_targets 417s + bm-build-deps-ok 417s + case "$branch" in 417s + return 1 417s + require_fail=required 417s + echo 'EXAMPLE RULES TARGET binary-indep' 417s + bm-report-test 'SOURCE FILE' true 417s + local 'desc=SOURCE FILE' 417s + shift 417s + true 417s + echo 'SOURCE FILE EXISTS' 417s + bm-report-test 'SOURCE IN CHANGES' true 417s + local 'desc=SOURCE IN CHANGES' 417s + shift 417s + true 417s + echo 'SOURCE IN CHANGES EXISTS' 417s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 417s + local 'desc=DEBS IN CHANGES' 417s + shift 417s + expr 'build-indep binary-indep' : '.*binary.*' 417s 24 417s + echo 'DEBS IN CHANGES EXISTS' 417s + exec 417s + git checkout bad-build-deps 417s Switched to branch 'bad-build-deps' 417s + git clean -xdf 417s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 417s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 417s + set +o pipefail 417s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch 417s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.output 417s + local dgit=dgit 417s + pwd 417s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 417s + : ' 417s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 417s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch 417s | git rev-parse --show-toplevel 417s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 417s | git config -z --get-regexp --local '.*' 417s | git config -z --get-regexp --local '.*' 417s | git config -z --get-regexp --global '.*' 417s | git config -z --get-regexp --system '.*' 417s format , quilt mode gbp 417s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 417s warning: could not open directory 'debian/source/': No such file or directory 417s => `' 417s + git diff --quiet HEAD 417s massage split -g. 417s massage done 3 -A. 417s format , quilt mode gbp 417s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 417s warning: could not open directory 'debian/source/': No such file or directory 417s => `' 417s + git diff --quiet HEAD 417s 417s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 417s dgit: Have to apply the patches - making the tree dirty. 417s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 417s 417s + dpkg-source --before-build . 417s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 417s dpkg-buildpackage: info: source package example 417s dpkg-buildpackage: info: source version 1.0 417s dpkg-buildpackage: info: source distribution unstable 417s dpkg-buildpackage: info: source changed by Ian Jackson 418s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 418s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 418s dpkg-buildpackage: warning: (Use -d flag to override.) 418s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 418s 418s dgit: error: subprocess failed with error exit status 3 418s + local 'ps=255 0' 418s + set -o pipefail 418s + exec 418s + echo '===== [gbp-build_-g,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 418s + case $ps in 418s + actual_status=failure 418s + echo 'OPERATION FAILED' 418s + case "$require_fail-$tolerate_fail-$actual_status" in 418s + echo 'REQUIRED FAILURE' 418s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.output 418s + '[' 1 = 1 ']' 418s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 418s + local 'desc=SOURCE FILE' 418s + shift 418s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 418s + echo 'SOURCE FILE MISSING' 418s + '[' failure = success ']' 418s + exec 418s + quirk-clean-fixup 418s + case $cleanmode in 418s + perl -i.unfixed -ne ' 418s print unless 418s $_ eq $last && 418s $_ eq "EXAMPLE RULES TARGET clean\n"; 418s $last = $_; 418s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.results 418s + '[' failure = failure ']' 418s + for cleanmode in $cleanmodes 418s + for branch in $bm_branches 418s + bm-run-one 418s + local 'args= --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch' 418s + bmid='gbp-build -g,dpkg-source-d,no-check,indep-arch' 418s + bmid=gbp-build_-g,dpkg-source-d,no-check,indep-arch 418s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 418s + heading='===== [gbp-build_-g,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch =====' 418s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.output 418s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.expected 418s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.results 418s + bm-compute-expected 418s + require_fail=unexpect 418s + tolerate_fail=unexpect 418s + exec 418s + echo '===== [gbp-build_-g,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch =====' 418s + local eff_cleanmode=dpkg-source-d,no-check 418s + case "$e_targets" in 418s + case "$act" in 418s + case $eff_cleanmode in 418s + echo 'EXAMPLE RULES TARGET clean' 418s + case $eff_cleanmode in 418s + '[' 'xbuild-indep binary-indep' '!=' x ']' 418s + bm-build-deps-ok 418s + case "$branch" in 418s + return 0 418s + for t in $e_targets 418s + bm-build-deps-ok 418s + case "$branch" in 418s + return 0 418s + echo 'EXAMPLE RULES TARGET build-indep' 418s + for t in $e_targets 418s + bm-build-deps-ok 418s + case "$branch" in 418s + return 0 418s + echo 'EXAMPLE RULES TARGET binary-indep' 418s + bm-report-test 'SOURCE FILE' true 418s + local 'desc=SOURCE FILE' 418s + shift 418s + true 418s + echo 'SOURCE FILE EXISTS' 418s + bm-report-test 'SOURCE IN CHANGES' true 418s + local 'desc=SOURCE IN CHANGES' 418s + shift 418s + true 418s + echo 'SOURCE IN CHANGES EXISTS' 418s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 418s + local 'desc=DEBS IN CHANGES' 418s + shift 418s + expr 'build-indep binary-indep' : '.*binary.*' 418s 24 418s + echo 'DEBS IN CHANGES EXISTS' 418s + exec 418s + git checkout indep-arch 418s Switched to branch 'indep-arch' 418s + git clean -xdf 418s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 418s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 418s + set +o pipefail 418s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch 418s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.output 418s + local dgit=dgit 418s + pwd 418s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 418s + : ' 418s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 418s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch 418s | git rev-parse --show-toplevel 418s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 418s | git config -z --get-regexp --local '.*' 418s | git config -z --get-regexp --local '.*' 418s | git config -z --get-regexp --global '.*' 418s | git config -z --get-regexp --system '.*' 418s format , quilt mode gbp 418s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 418s warning: could not open directory 'debian/source/': No such file or directory 418s => `' 418s + git diff --quiet HEAD 418s massage split -g. 418s massage done 3 -A. 418s format , quilt mode gbp 418s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 418s warning: could not open directory 'debian/source/': No such file or directory 418s => `' 418s + git diff --quiet HEAD 418s 418s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 418s dgit: Have to apply the patches - making the tree dirty. 418s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 418s 418s + dpkg-source --before-build . 418s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 418s dpkg-buildpackage: info: source package example 418s dpkg-buildpackage: info: source version 1.0 418s dpkg-buildpackage: info: source distribution unstable 418s dpkg-buildpackage: info: source changed by Ian Jackson 418s fakeroot debian/rules clean 418s EXAMPLE RULES TARGET clean 418s dh_clean 418s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 418s | git rev-parse 'HEAD~0' 418s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 418s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 418s CD work 418s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 418s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 418s CD .. 418s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 418s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 418s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 418s dpkg-source: info: using source format '1.0' 418s dpkg-source: info: building example in example_1.0.tar.gz 418s dpkg-source: info: building example in example_1.0.dsc 418s CD work 418s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 418s package seems new, not specifying -v 418s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 418s dpkg-genchanges: info: including full source code in upload 418s CD .. 418s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 418s renaming (Files) example_1.0.tar.gz 418s renaming (dsc) example_1.0.dsc 418s renaming (changes) example_1.0_source.changes 418s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 418s dgit: Unapplying patches again to tidy up the tree. 418s + dpkg-source --after-build . 418s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 419s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 419s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 419s gbp:info: Performing the build 419s dpkg-buildpackage: info: source package example 419s dpkg-buildpackage: info: source version 1.0 419s dpkg-buildpackage: info: source distribution unstable 419s dpkg-buildpackage: info: source changed by Ian Jackson 419s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 419s debian/rules build-indep 419s EXAMPLE RULES TARGET build-indep 419s fakeroot debian/rules binary-indep 419s EXAMPLE RULES TARGET binary-indep 419s dh_install 419s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 419s dh_gencontrol 419s dh_builddeb 419s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 419s + exec /usr/bin/dpkg-deb -Znonedpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 419s --build debian/example-arch .. 419s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 419s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 419s dpkg-genchanges --build=all -O../example_1.0_all.changes 419s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 419s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 419s dpkg-buildpackage: info: binary-only upload (no source included) 419s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 419s + mergechanges -f example_1.0_source.changes example_1.0_all.changes 420s dgit ok: build successful, results in example_1.0_multi.changes 420s 420s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 420s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 420s ' 420s + local 'ps=0 0' 420s + set -o pipefail 420s + exec 420s + echo '===== [gbp-build_-g,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch =====' 420s + case $ps in 420s + actual_status=success 420s + case "$require_fail-$tolerate_fail-$actual_status" in 420s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.output 420s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 420s + local 'desc=SOURCE FILE' 420s + shift 420s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 420s + echo 'SOURCE FILE EXISTS' 420s + '[' success = success ']' 420s + local changes 420s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 420s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 420s + case "$changes" in 420s + perl -ne 'print if m/^files:/i ... m/^\S/' 420s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 420s + local 'desc=SOURCE IN CHANGES' 420s + shift 420s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 420s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 420s + echo 'SOURCE IN CHANGES EXISTS' 420s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 420s + local 'desc=DEBS IN CHANGES' 420s + shift 420s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 420s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 420s + echo 'DEBS IN CHANGES EXISTS' 420s + exec 420s + quirk-clean-fixup 420s + case $cleanmode in 420s + perl -i.unfixed -ne ' 420s print unless 420s $_ eq $last && 420s $_ eq "EXAMPLE RULES TARGET clean\n"; 420s $last = $_; 420s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.results 420s + '[' success = failure ']' 420s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.results 420s + for branch in $bm_branches 420s + bm-run-one 420s + local 'args= --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch' 420s + bmid='gbp-build -g,dpkg-source-d,no-check,bad-build-deps' 420s + bmid=gbp-build_-g,dpkg-source-d,no-check,bad-build-deps 420s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 420s + 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 =====' 420s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.output 420s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.expected 420s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.results 420s + bm-compute-expected 420s + require_fail=unexpect 420s + tolerate_fail=unexpect 420s + exec 420s + 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 =====' 420s + local eff_cleanmode=dpkg-source-d,no-check 420s + case "$e_targets" in 420s + case "$act" in 420s + case $eff_cleanmode in 420s + echo 'EXAMPLE RULES TARGET clean' 420s + case $eff_cleanmode in 420s + '[' 'xbuild-indep binary-indep' '!=' x ']' 420s + bm-build-deps-ok 420s + case "$branch" in 420s + return 1 420s + tolerate_fail=tolerate 420s + for t in $e_targets 420s + bm-build-deps-ok 420s + case "$branch" in 420s + return 1 420s + require_fail=required 420s + echo 'EXAMPLE RULES TARGET build-indep' 420s + for t in $e_targets 420s + bm-build-deps-ok 420s + case "$branch" in 420s + return 1 420s + require_fail=required 420s + echo 'EXAMPLE RULES TARGET binary-indep' 420s + bm-report-test 'SOURCE FILE' true 420s + local 'desc=SOURCE FILE' 420s + shift 420s + true 420s + echo 'SOURCE FILE EXISTS' 420s + bm-report-test 'SOURCE IN CHANGES' true 420s + local 'desc=SOURCE IN CHANGES' 420s + shift 420s + true 420s + echo 'SOURCE IN CHANGES EXISTS' 420s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 420s + local 'desc=DEBS IN CHANGES' 420s + shift 420s + expr 'build-indep binary-indep' : '.*binary.*' 420s 24 420s + echo 'DEBS IN CHANGES EXISTS' 420s + exec 420s + git checkout bad-build-deps 420s Switched to branch 'bad-build-deps' 420s + git clean -xdf 420s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 420s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 420s + set +o pipefail 420s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch 420s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.output 420s + local dgit=dgit 420s + pwd 420s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 420s + : ' 420s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 420s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch 420s | git rev-parse --show-toplevel 420s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 420s | git config -z --get-regexp --local '.*' 420s | git config -z --get-regexp --local '.*' 420s | git config -z --get-regexp --global '.*' 420s | git config -z --get-regexp --system '.*' 420s format , quilt mode gbp 420s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 420s warning: could not open directory 'debian/source/': No such file or directory 420s => `' 420s + git diff --quiet HEAD 420s massage split -g. 420s massage done 3 -A. 420s format , quilt mode gbp 420s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 420s warning: could not open directory 'debian/source/': No such file or directory 420s => `' 420s + git diff --quiet HEAD 420s 420s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 420s dgit: Have to apply the patches - making the tree dirty. 420s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 420s 420s + dpkg-source --before-build . 420s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 420s dpkg-buildpackage: info: source package example 420s dpkg-buildpackage: info: source version 1.0 420s dpkg-buildpackage: info: source distribution unstable 420s dpkg-buildpackage: info: source changed by Ian Jackson 420s fakeroot debian/rules clean 420s EXAMPLE RULES TARGET clean 420s dh_clean 421s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 421s | git rev-parse 'HEAD~0' 421s => `d09bc55f43bc5586103335d232c16bd041247bd1' 421s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 421s CD work 421s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 421s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 421s CD .. 421s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 421s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 421s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 421s dpkg-source: info: using source format '1.0' 421s dpkg-source: info: building example in example_1.0.tar.gz 421s dpkg-source: info: building example in example_1.0.dsc 421s CD work 421s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 421s package seems new, not specifying -v 421s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 421s dpkg-genchanges: info: including full source code in upload 421s CD .. 421s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 421s renaming (Files) example_1.0.tar.gz 421s renaming (dsc) example_1.0.dsc 421s renaming (changes) example_1.0_source.changes 421s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 421s dgit: Unapplying patches again to tidy up the tree. 421s + dpkg-source --after-build . 421s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 421s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 421s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 421s gbp:info: Performing the build 421s dpkg-buildpackage: info: source package example 421s dpkg-buildpackage: info: source version 1.0 421s dpkg-buildpackage: info: source distribution unstable 421s dpkg-buildpackage: info: source changed by Ian Jackson 421s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 421s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 421s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 421s dpkg-buildpackage: warning: (Use -d flag to override.) 421s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 421s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 421s 421s dgit: error: subprocess failed with error exit status 1 421s + local 'ps=255 0' 421s + set -o pipefail 421s + exec 421s + 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 =====' 421s + case $ps in 421s + actual_status=failure 421s + echo 'OPERATION FAILED' 421s + case "$require_fail-$tolerate_fail-$actual_status" in 421s + echo 'REQUIRED FAILURE' 421s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.output 421s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 421s + local 'desc=SOURCE FILE' 421s + shift 421s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 421s + echo 'SOURCE FILE EXISTS' 421s + '[' failure = success ']' 421s + exec 421s + quirk-clean-fixup 421s + case $cleanmode in 421s + perl -i.unfixed -ne ' 421s print unless 421s $_ eq $last && 421s $_ eq "EXAMPLE RULES TARGET clean\n"; 421s $last = $_; 421s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.results 421s + '[' failure = failure ']' 421s + : bm-act-iterate done. 421s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 421s + bm-guess-e-source-e-targets 'gbp-build -G' 421s + local 'some_act=gbp-build -G' 421s + case "$some_act" in 421s + e_source=true 421s + e_targets='build-arch binary-arch' 421s + real_act='gbp-build -G --git-ignore-branch' 421s + bm-act-iterate 421s + for cleanmode in $cleanmodes 421s + for branch in $bm_branches 421s + bm-run-one 421s + local 'args= --clean=git gbp-build -G --git-ignore-branch' 421s + bmid='gbp-build -G,git,indep-arch' 421s + bmid=gbp-build_-G,git,indep-arch 421s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 421s + heading='===== [gbp-build_-G,git,indep-arch] dgit --clean=git gbp-build -G --git-ignore-branch =====' 421s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.output 421s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.expected 421s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.results 421s + bm-compute-expected 421s + require_fail=unexpect 421s + tolerate_fail=unexpect 421s + exec 421s + echo '===== [gbp-build_-G,git,indep-arch] dgit --clean=git gbp-build -G --git-ignore-branch =====' 421s + local eff_cleanmode=git 421s + case "$e_targets" in 421s + case "$act" in 421s + case $eff_cleanmode in 421s + echo 'BUILD-MODES PROGRAM git clean -xdf' 421s + case $eff_cleanmode in 421s + '[' 'xbuild-arch binary-arch' '!=' x ']' 421s + bm-build-deps-ok 421s + case "$branch" in 421s + return 0 421s + for t in $e_targets 421s + bm-build-deps-ok 421s + case "$branch" in 421s + return 0 421s + echo 'EXAMPLE RULES TARGET build-arch' 421s + for t in $e_targets 421s + bm-build-deps-ok 421s + case "$branch" in 421s + return 0 421s + echo 'EXAMPLE RULES TARGET binary-arch' 421s + bm-report-test 'SOURCE FILE' true 421s + local 'desc=SOURCE FILE' 421s + shift 421s + true 421s + echo 'SOURCE FILE EXISTS' 421s + bm-report-test 'SOURCE IN CHANGES' true 421s + local 'desc=SOURCE IN CHANGES' 421s + shift 421s + true 421s + echo 'SOURCE IN CHANGES EXISTS' 421s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 421s + local 'desc=DEBS IN CHANGES' 421s + shift 421s + expr 'build-arch binary-arch' : '.*binary.*' 421s 22 421s + echo 'DEBS IN CHANGES EXISTS' 421s + exec 421s + git checkout indep-arch 421s Switched to branch 'indep-arch' 421s + git clean -xdf 421s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 421s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 421s + set +o pipefail 421s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -G --git-ignore-branch 421s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.output 421s + local dgit=dgit 421s + pwd 421s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 421s + : ' 421s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 421s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -G --git-ignore-branch 422s | git rev-parse --show-toplevel 422s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 422s | git config -z --get-regexp --local '.*' 422s | git config -z --get-regexp --local '.*' 422s | git config -z --get-regexp --global '.*' 422s | git config -z --get-regexp --system '.*' 422s format , quilt mode gbp 422s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 422s warning: could not open directory 'debian/source/': No such file or directory 422s => `' 422s + git diff --quiet HEAD 422s massage split -G. 422s massage done 3 -B. 422s format , quilt mode gbp 422s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 422s warning: could not open directory 'debian/source/': No such file or directory 422s => `' 422s + git diff --quiet HEAD 422s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 422s BUILD-MODES PROGRAM git clean -xdf 422s | git rev-parse 'HEAD~0' 422s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 422s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 422s CD work 422s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 422s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 422s CD .. 422s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 422s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 422s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 422s dpkg-source: info: using source format '1.0' 422s dpkg-source: info: building example in example_1.0.tar.gz 422s dpkg-source: info: building example in example_1.0.dsc 422s CD work 422s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 422s package seems new, not specifying -v 422s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 422s dpkg-genchanges: info: including full source code in upload 422s CD .. 422s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 422s renaming (Files) example_1.0.tar.gz 422s renaming (dsc) example_1.0.dsc 422s renaming (changes) example_1.0_source.changes 422s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 422s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 422s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 422s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 422s gbp:info: Performing the build 422s dpkg-buildpackage: info: source package example 422s dpkg-buildpackage: info: source version 1.0 422s dpkg-buildpackage: info: source distribution unstable 422s dpkg-buildpackage: info: source changed by Ian Jackson 422s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 422s dpkg-buildpackage: info: host architecture ppc64el 422s debian/rules build-arch 422s EXAMPLE RULES TARGET build-arch 422s fakeroot debian/rules binary-arch 422s EXAMPLE RULES TARGET binary-arch 422s dh_install 422s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 422s dh_gencontrol 422s dh_builddeb 422s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 422s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 422s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 422s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 422s dpkg-genbuildinfo --build=any -O../example_1.0_ppc64el.buildinfo 423s dpkg-genchanges --build=any -O../example_1.0_ppc64el.changes 423s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 423s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 423s dpkg-buildpackage: info: binary-only upload (no source included) 423s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 423s + mergechanges -f example_1.0_source.changes example_1.0_ppc64el.changes 423s dgit ok: build successful, results in example_1.0_multi.changes 423s 423s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 423s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 423s ' 423s + local 'ps=0 0' 423s + set -o pipefail 423s + exec 423s + echo '===== [gbp-build_-G,git,indep-arch] dgit --clean=git gbp-build -G --git-ignore-branch =====' 423s + case $ps in 423s + actual_status=success 423s + case "$require_fail-$tolerate_fail-$actual_status" in 423s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.output 423s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 423s + local 'desc=SOURCE FILE' 423s + shift 423s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 423s + echo 'SOURCE FILE EXISTS' 423s + '[' success = success ']' 423s + local changes 423s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 423s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 423s + case "$changes" in 423s + perl -ne 'print if m/^files:/i ... m/^\S/' 423s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 423s + local 'desc=SOURCE IN CHANGES' 423s + shift 423s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 423s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 423s + echo 'SOURCE IN CHANGES EXISTS' 423s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 423s + local 'desc=DEBS IN CHANGES' 423s + shift 423s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 423s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 423s + echo 'DEBS IN CHANGES EXISTS' 423s + exec 423s + quirk-clean-fixup 423s + case $cleanmode in 423s + '[' success = failure ']' 423s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.results 423s + for branch in $bm_branches 423s + bm-run-one 423s + local 'args= --clean=git gbp-build -G --git-ignore-branch' 423s + bmid='gbp-build -G,git,bad-build-deps' 423s + bmid=gbp-build_-G,git,bad-build-deps 423s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 423s + heading='===== [gbp-build_-G,git,bad-build-deps] dgit --clean=git gbp-build -G --git-ignore-branch =====' 423s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,bad-build-deps.output 423s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,bad-build-deps.expected 423s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,bad-build-deps.results 423s + bm-compute-expected 423s + require_fail=unexpect 423s + tolerate_fail=unexpect 423s + exec 423s + echo '===== [gbp-build_-G,git,bad-build-deps] dgit --clean=git gbp-build -G --git-ignore-branch =====' 423s + local eff_cleanmode=git 423s + case "$e_targets" in 423s + case "$act" in 423s + case $eff_cleanmode in 423s + echo 'BUILD-MODES PROGRAM git clean -xdf' 423s + case $eff_cleanmode in 423s + '[' 'xbuild-arch binary-arch' '!=' x ']' 423s + bm-build-deps-ok 423s + case "$branch" in 423s + return 1 423s + tolerate_fail=tolerate 423s + for t in $e_targets 423s + bm-build-deps-ok 423s + case "$branch" in 423s + return 1 423s + require_fail=required 423s + echo 'EXAMPLE RULES TARGET build-arch' 423s + for t in $e_targets 423s + bm-build-deps-ok 423s + case "$branch" in 423s + return 1 423s + require_fail=required 423s + echo 'EXAMPLE RULES TARGET binary-arch' 423s + bm-report-test 'SOURCE FILE' true 423s + local 'desc=SOURCE FILE' 423s + shift 423s + true 423s + echo 'SOURCE FILE EXISTS' 423s + bm-report-test 'SOURCE IN CHANGES' true 423s + local 'desc=SOURCE IN CHANGES' 423s + shift 423s + true 423s + echo 'SOURCE IN CHANGES EXISTS' 423s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 423s + local 'desc=DEBS IN CHANGES' 423s + shift 423s + expr 'build-arch binary-arch' : '.*binary.*' 423s 22 423s + echo 'DEBS IN CHANGES EXISTS' 423s + exec 423s + git checkout bad-build-deps 423s Switched to branch 'bad-build-deps' 423s + git clean -xdf 423s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 423s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 423s + set +o pipefail 423s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,bad-build-deps.output 423s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -G --git-ignore-branch 423s + local dgit=dgit 423s + pwd 423s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 423s + : ' 423s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 423s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=git gbp-build -G --git-ignore-branch 424s | git rev-parse --show-toplevel 424s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 424s | git config -z --get-regexp --local '.*' 424s | git config -z --get-regexp --local '.*' 424s | git config -z --get-regexp --global '.*' 424s | git config -z --get-regexp --system '.*' 424s format , quilt mode gbp 424s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 424s warning: could not open directory 'debian/source/': No such file or directory 424s => `' 424s + git diff --quiet HEAD 424s massage split -G. 424s massage done 3 -B. 424s format , quilt mode gbp 424s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 424s warning: could not open directory 'debian/source/': No such file or directory 424s => `' 424s + git diff --quiet HEAD 424s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git clean -xdf 424s BUILD-MODES PROGRAM git clean -xdf 424s | git rev-parse 'HEAD~0' 424s => `d09bc55f43bc5586103335d232c16bd041247bd1' 424s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 424s CD work 424s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 424s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 424s CD .. 424s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 424s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 424s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 424s dpkg-source: info: using source format '1.0' 424s dpkg-source: info: building example in example_1.0.tar.gz 424s dpkg-source: info: building example in example_1.0.dsc 424s CD work 424s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 424s package seems new, not specifying -v 424s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 424s dpkg-genchanges: info: including full source code in upload 424s CD .. 424s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 424s renaming (Files) example_1.0.tar.gz 424s renaming (dsc) example_1.0.dsc 424s renaming (changes) example_1.0_source.changes 424s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 424s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 424s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 424s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 424s gbp:info: Performing the build 424s dpkg-buildpackage: info: source package example 424s dpkg-buildpackage: info: source version 1.0 424s dpkg-buildpackage: info: source distribution unstable 424s dpkg-buildpackage: info: source changed by Ian Jackson 424s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 424s dpkg-buildpackage: info: host architecture ppc64el 424s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 424s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 424s dpkg-buildpackage: warning: (Use -d flag to override.) 424s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 424s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 424s 424s dgit: error: subprocess failed with error exit status 1 424s + local 'ps=255 0' 424s + set -o pipefail 424s + exec 424s + echo '===== [gbp-build_-G,git,bad-build-deps] dgit --clean=git gbp-build -G --git-ignore-branch =====' 424s + case $ps in 424s + actual_status=failure 424s + echo 'OPERATION FAILED' 424s + case "$require_fail-$tolerate_fail-$actual_status" in 424s + echo 'REQUIRED FAILURE' 424s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,git,bad-build-deps.output 424s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 424s + local 'desc=SOURCE FILE' 424s + shift 424s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 424s + echo 'SOURCE FILE EXISTS' 424s + '[' failure = success ']' 424s + exec 424s + quirk-clean-fixup 424s + case $cleanmode in 424s + '[' failure = failure ']' 424s + for cleanmode in $cleanmodes 424s + for branch in $bm_branches 424s + bm-run-one 424s + local 'args= --clean=none gbp-build -G --git-ignore-branch' 424s + bmid='gbp-build -G,none,indep-arch' 424s + bmid=gbp-build_-G,none,indep-arch 424s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 424s + heading='===== [gbp-build_-G,none,indep-arch] dgit --clean=none gbp-build -G --git-ignore-branch =====' 424s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.output 424s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.expected 424s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.results 424s + bm-compute-expected 424s + require_fail=unexpect 424s + tolerate_fail=unexpect 424s + exec 424s + echo '===== [gbp-build_-G,none,indep-arch] dgit --clean=none gbp-build -G --git-ignore-branch =====' 424s + local eff_cleanmode=none 424s + case "$e_targets" in 424s + case "$act" in 424s + case $eff_cleanmode in 424s + case $eff_cleanmode in 424s + '[' 'xbuild-arch binary-arch' '!=' x ']' 424s + bm-build-deps-ok 424s + case "$branch" in 424s + return 0 424s + for t in $e_targets 424s + bm-build-deps-ok 424s + case "$branch" in 424s + return 0 424s + echo 'EXAMPLE RULES TARGET build-arch' 424s + for t in $e_targets 424s + bm-build-deps-ok 424s + case "$branch" in 424s + return 0 424s + echo 'EXAMPLE RULES TARGET binary-arch' 424s + bm-report-test 'SOURCE FILE' true 424s + local 'desc=SOURCE FILE' 424s + shift 424s + true 424s + echo 'SOURCE FILE EXISTS' 424s + bm-report-test 'SOURCE IN CHANGES' true 424s + local 'desc=SOURCE IN CHANGES' 424s + shift 424s + true 424s + echo 'SOURCE IN CHANGES EXISTS' 424s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 424s + local 'desc=DEBS IN CHANGES' 424s + shift 424s + expr 'build-arch binary-arch' : '.*binary.*' 424s 22 424s + echo 'DEBS IN CHANGES EXISTS' 424s + exec 424s + git checkout indep-arch 424s Switched to branch 'indep-arch' 424s + git clean -xdf 424s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 424s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 424s + set +o pipefail 424s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -G --git-ignore-branch 424s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.output 424s + local dgit=dgit 424s + pwd 424s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 424s + : ' 424s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 424s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -G --git-ignore-branch 425s | git rev-parse --show-toplevel 425s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 425s | git config -z --get-regexp --local '.*' 425s | git config -z --get-regexp --local '.*' 425s | git config -z --get-regexp --global '.*' 425s | git config -z --get-regexp --system '.*' 425s format , quilt mode gbp 425s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 425s warning: could not open directory 'debian/source/': No such file or directory 425s => `' 425s + git diff --quiet HEAD 425s massage split -G. 425s massage done 3 -B. 425s format , quilt mode gbp 425s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 425s warning: could not open directory 'debian/source/': No such file or directory 425s => `' 425s + git diff --quiet HEAD 425s | git rev-parse 'HEAD~0' 425s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 425s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 425s CD work 425s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 425s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 425s CD .. 425s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 425s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 425s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 425s dpkg-source: info: using source format '1.0' 425s dpkg-source: info: building example in example_1.0.tar.gz 425s dpkg-source: info: building example in example_1.0.dsc 425s CD work 425s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 425s package seems new, not specifying -v 425s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 425s dpkg-genchanges: info: including full source code in upload 425s CD .. 425s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 425s renaming (Files) example_1.0.tar.gz 425s renaming (dsc) example_1.0.dsc 425s renaming (changes) example_1.0_source.changes 425s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 425s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 425s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 425s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 425s gbp:info: Performing the build 425s dpkg-buildpackage: info: source package example 425s dpkg-buildpackage: info: source version 1.0 425s dpkg-buildpackage: info: source distribution unstable 425s dpkg-buildpackage: info: source changed by Ian Jackson 425s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 425s dpkg-buildpackage: info: host architecture ppc64el 425s debian/rules build-arch 425s EXAMPLE RULES TARGET build-arch 425s fakeroot debian/rules binary-arch 425s EXAMPLE RULES TARGET binary-arch 425s dh_install 425s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 425s dh_gencontrol 425s dh_builddeb 426s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep ..+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 426s 426s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 426s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 426s dpkg-genbuildinfo --build=any -O../example_1.0_ppc64el.buildinfo 426s dpkg-genchanges --build=any -O../example_1.0_ppc64el.changes 426s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 426s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 426s dpkg-buildpackage: info: binary-only upload (no source included) 426s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 426s + mergechanges -f example_1.0_source.changes example_1.0_ppc64el.changes 426s dgit ok: build successful, results in example_1.0_multi.changes 426s 426s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 426s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 426s ' 426s + local 'ps=0 0' 426s + set -o pipefail 426s + exec 426s + echo '===== [gbp-build_-G,none,indep-arch] dgit --clean=none gbp-build -G --git-ignore-branch =====' 426s + case $ps in 426s + actual_status=success 426s + case "$require_fail-$tolerate_fail-$actual_status" in 426s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.output 426s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 426s + local 'desc=SOURCE FILE' 426s + shift 426s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 426s + echo 'SOURCE FILE EXISTS' 426s + '[' success = success ']' 426s + local changes 426s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 426s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 426s + case "$changes" in 426s + perl -ne 'print if m/^files:/i ... m/^\S/' 426s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 426s + local 'desc=SOURCE IN CHANGES' 426s + shift 426s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 426s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 426s + echo 'SOURCE IN CHANGES EXISTS' 426s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 426s + local 'desc=DEBS IN CHANGES' 426s + shift 426s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 426s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 426s + echo 'DEBS IN CHANGES EXISTS' 426s + exec 426s + quirk-clean-fixup 426s + case $cleanmode in 426s + '[' success = failure ']' 426s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.results 426s + for branch in $bm_branches 427s + bm-run-one 427s + local 'args= --clean=none gbp-build -G --git-ignore-branch' 427s + bmid='gbp-build -G,none,bad-build-deps' 427s + bmid=gbp-build_-G,none,bad-build-deps 427s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 427s + heading='===== [gbp-build_-G,none,bad-build-deps] dgit --clean=none gbp-build -G --git-ignore-branch =====' 427s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,bad-build-deps.output 427s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,bad-build-deps.expected 427s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,bad-build-deps.results 427s + bm-compute-expected 427s + require_fail=unexpect 427s + tolerate_fail=unexpect 427s + exec 427s + echo '===== [gbp-build_-G,none,bad-build-deps] dgit --clean=none gbp-build -G --git-ignore-branch =====' 427s + local eff_cleanmode=none 427s + case "$e_targets" in 427s + case "$act" in 427s + case $eff_cleanmode in 427s + case $eff_cleanmode in 427s + '[' 'xbuild-arch binary-arch' '!=' x ']' 427s + bm-build-deps-ok 427s + case "$branch" in 427s + return 1 427s + tolerate_fail=tolerate 427s + for t in $e_targets 427s + bm-build-deps-ok 427s + case "$branch" in 427s + return 1 427s + require_fail=required 427s + echo 'EXAMPLE RULES TARGET build-arch' 427s + for t in $e_targets 427s + bm-build-deps-ok 427s + case "$branch" in 427s + return 1 427s + require_fail=required 427s + echo 'EXAMPLE RULES TARGET binary-arch' 427s + bm-report-test 'SOURCE FILE' true 427s + local 'desc=SOURCE FILE' 427s + shift 427s + true 427s + echo 'SOURCE FILE EXISTS' 427s + bm-report-test 'SOURCE IN CHANGES' true 427s + local 'desc=SOURCE IN CHANGES' 427s + shift 427s + true 427s + echo 'SOURCE IN CHANGES EXISTS' 427s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 427s + local 'desc=DEBS IN CHANGES' 427s + shift 427s + expr 'build-arch binary-arch' : '.*binary.*' 427s 22 427s + echo 'DEBS IN CHANGES EXISTS' 427s + exec 427s + git checkout bad-build-deps 427s Switched to branch 'bad-build-deps' 427s + git clean -xdf 427s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 427s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 427s + set +o pipefail 427s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,bad-build-deps.output 427s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -G --git-ignore-branch 427s + local dgit=dgit 427s + pwd 427s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 427s + : ' 427s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 427s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=none gbp-build -G --git-ignore-branch 427s | git rev-parse --show-toplevel 427s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 427s | git config -z --get-regexp --local '.*' 427s | git config -z --get-regexp --local '.*' 427s | git config -z --get-regexp --global '.*' 427s | git config -z --get-regexp --system '.*' 427s format , quilt mode gbp 427s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 427s warning: could not open directory 'debian/source/': No such file or directory 427s => `' 427s + git diff --quiet HEAD 427s massage split -G. 427s massage done 3 -B. 427s format , quilt mode gbp 427s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 427s warning: could not open directory 'debian/source/': No such file or directory 427s => `' 427s + git diff --quiet HEAD 427s | git rev-parse 'HEAD~0' 427s => `d09bc55f43bc5586103335d232c16bd041247bd1' 427s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 427s CD work 427s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 427s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 427s CD .. 427s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 427s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 427s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 427s dpkg-source: info: using source format '1.0' 427s dpkg-source: info: building example in example_1.0.tar.gz 427s dpkg-source: info: building example in example_1.0.dsc 427s CD work 427s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 427s package seems new, not specifying -v 427s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 427s dpkg-genchanges: info: including full source code in upload 427s CD .. 427s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 427s renaming (Files) example_1.0.tar.gz 427s renaming (dsc) example_1.0.dsc 427s renaming (changes) example_1.0_source.changes 427s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 427s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 427s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 427s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 427s gbp:info: Performing the build 427s dpkg-buildpackage: info: source package example 427s dpkg-buildpackage: info: source version 1.0 427s dpkg-buildpackage: info: source distribution unstable 427s dpkg-buildpackage: info: source changed by Ian Jackson 427s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 427s dpkg-buildpackage: info: host architecture ppc64el 427s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 427s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 427s dpkg-buildpackage: warning: (Use -d flag to override.) 427s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 427s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 427s 427s dgit: error: subprocess failed with error exit status 1 427s + local 'ps=255 0' 427s + set -o pipefail 427s + exec 427s + echo '===== [gbp-build_-G,none,bad-build-deps] dgit --clean=none gbp-build -G --git-ignore-branch =====' 427s + case $ps in 427s + actual_status=failure 427s + echo 'OPERATION FAILED' 427s + case "$require_fail-$tolerate_fail-$actual_status" in 427s + echo 'REQUIRED FAILURE' 427s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,none,bad-build-deps.output 427s + '[' 1 = 1 ']' 427s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 427s + local 'desc=SOURCE FILE' 427s + shift 427s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 427s + echo 'SOURCE FILE EXISTS' 427s + '[' failure = success ']' 427s + exec 427s + quirk-clean-fixup 427s + case $cleanmode in 427s + '[' failure = failure ']' 427s + for cleanmode in $cleanmodes 427s + for branch in $bm_branches 427s + bm-run-one 427s + local 'args= --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch' 427s + bmid='gbp-build -G,dpkg-source,no-check,indep-arch' 427s + bmid=gbp-build_-G,dpkg-source,no-check,indep-arch 427s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 427s + heading='===== [gbp-build_-G,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 427s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.output 427s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.expected 427s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.results 427s + bm-compute-expected 427s + require_fail=unexpect 427s + tolerate_fail=unexpect 427s + exec 427s + echo '===== [gbp-build_-G,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 427s + local eff_cleanmode=dpkg-source,no-check 427s + case "$e_targets" in 427s + case "$act" in 427s + case $eff_cleanmode in 427s + bm-build-deps-ok 427s + case "$branch" in 427s + return 0 427s + echo 'EXAMPLE RULES TARGET clean' 427s + case $eff_cleanmode in 427s + '[' 'xbuild-arch binary-arch' '!=' x ']' 427s + bm-build-deps-ok 427s + case "$branch" in 427s + return 0 427s + for t in $e_targets 427s + bm-build-deps-ok 427s + case "$branch" in 427s + return 0 427s + echo 'EXAMPLE RULES TARGET build-arch' 427s + for t in $e_targets 427s + bm-build-deps-ok 427s + case "$branch" in 427s + return 0 427s + echo 'EXAMPLE RULES TARGET binary-arch' 427s + bm-report-test 'SOURCE FILE' true 427s + local 'desc=SOURCE FILE' 427s + shift 427s + true 427s + echo 'SOURCE FILE EXISTS' 427s + bm-report-test 'SOURCE IN CHANGES' true 427s + local 'desc=SOURCE IN CHANGES' 427s + shift 427s + true 427s + echo 'SOURCE IN CHANGES EXISTS' 427s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 427s + local 'desc=DEBS IN CHANGES' 427s + shift 427s + expr 'build-arch binary-arch' : '.*binary.*' 427s 22 427s + echo 'DEBS IN CHANGES EXISTS' 427s + exec 427s + git checkout indep-arch 427s Switched to branch 'indep-arch' 427s + git clean -xdf 427s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 427s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 427s + set +o pipefail 427s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.output 427s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch 427s + local dgit=dgit 427s + pwd 427s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 427s + : ' 427s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 427s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch 428s | git rev-parse --show-toplevel 428s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 428s | git config -z --get-regexp --local '.*' 428s | git config -z --get-regexp --local '.*' 428s | git config -z --get-regexp --global '.*' 428s | git config -z --get-regexp --system '.*' 428s format , quilt mode gbp 428s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 428s warning: could not open directory 'debian/source/': No such file or directory 428s => `' 428s + git diff --quiet HEAD 428s massage split -G. 428s massage done 3 -B. 428s format , quilt mode gbp 428s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 428s warning: could not open directory 'debian/source/': No such file or directory 428s => `' 428s + git diff --quiet HEAD 428s 428s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 428s dgit: Have to apply the patches - making the tree dirty. 428s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 428s 428s + dpkg-source --before-build . 428s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 428s dpkg-buildpackage: info: source package example 428s dpkg-buildpackage: info: source version 1.0 428s dpkg-buildpackage: info: source distribution unstable 428s dpkg-buildpackage: info: source changed by Ian Jackson 428s fakeroot debian/rules clean 428s EXAMPLE RULES TARGET clean 428s dh_clean 428s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 428s | git rev-parse 'HEAD~0' 428s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 428s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 428s CD work 428s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 428s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 428s CD .. 428s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 428s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 428s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 428s dpkg-source: info: using source format '1.0' 428s dpkg-source: info: building example in example_1.0.tar.gz 428s dpkg-source: info: building example in example_1.0.dsc 428s CD work 428s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 428s package seems new, not specifying -v 428s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 428s dpkg-genchanges: info: including full source code in upload 428s CD .. 428s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 428s renaming (Files) example_1.0.tar.gz 428s renaming (dsc) example_1.0.dsc 428s renaming (changes) example_1.0_source.changes 428s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 428s dgit: Unapplying patches again to tidy up the tree. 428s + dpkg-source --after-build . 428s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 428s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 428s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 428s gbp:info: Performing the build 429s dpkg-buildpackage: info: source package example 429s dpkg-buildpackage: info: source version 1.0 429s dpkg-buildpackage: info: source distribution unstable 429s dpkg-buildpackage: info: source changed by Ian Jackson 429s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 429s dpkg-buildpackage: info: host architecture ppc64el 429s debian/rules build-arch 429s EXAMPLE RULES TARGET build-arch 429s fakeroot debian/rules binary-arch 429s EXAMPLE RULES TARGET binary-arch 429s dh_install 429s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 429s dh_gencontrol 429s dh_builddeb 429s + exec /usr/bin/dpkg-deb -Znone --build+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 429s debian/example-indep .. 429s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 429s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 429s dpkg-genbuildinfo --build=any -O../example_1.0_ppc64el.buildinfo 429s dpkg-genchanges --build=any -O../example_1.0_ppc64el.changes 429s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 429s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 429s dpkg-buildpackage: info: binary-only upload (no source included) 429s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 429s + mergechanges -f example_1.0_source.changes example_1.0_ppc64el.changes 430s dgit ok: build successful, results in example_1.0_multi.changes 430s 430s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 430s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 430s ' 430s + local 'ps=0 0' 430s + set -o pipefail 430s + exec 430s + echo '===== [gbp-build_-G,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 430s + case $ps in 430s + actual_status=success 430s + case "$require_fail-$tolerate_fail-$actual_status" in 430s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.output 430s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 430s + local 'desc=SOURCE FILE' 430s + shift 430s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 430s + echo 'SOURCE FILE EXISTS' 430s + '[' success = success ']' 430s + local changes 430s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 430s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 430s + case "$changes" in 430s + perl -ne 'print if m/^files:/i ... m/^\S/' 430s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 430s + local 'desc=SOURCE IN CHANGES' 430s + shift 430s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 430s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 430s + echo 'SOURCE IN CHANGES EXISTS' 430s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 430s + local 'desc=DEBS IN CHANGES' 430s + shift 430s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 430s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 430s + echo 'DEBS IN CHANGES EXISTS' 430s + exec 430s + quirk-clean-fixup 430s + case $cleanmode in 430s + perl -i.unfixed -ne ' 430s print unless 430s $_ eq $last && 430s $_ eq "EXAMPLE RULES TARGET clean\n"; 430s $last = $_; 430s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.results 430s + '[' success = failure ']' 430s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.results 430s + for branch in $bm_branches 430s + bm-run-one 430s + local 'args= --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch' 430s + bmid='gbp-build -G,dpkg-source,no-check,bad-build-deps' 430s + bmid=gbp-build_-G,dpkg-source,no-check,bad-build-deps 430s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 430s + heading='===== [gbp-build_-G,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 430s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.output 430s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.expected 430s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.results 430s + bm-compute-expected 430s + require_fail=unexpect 430s + tolerate_fail=unexpect 430s + exec 430s + echo '===== [gbp-build_-G,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 430s + local eff_cleanmode=dpkg-source,no-check 430s + case "$e_targets" in 430s + case "$act" in 430s + case $eff_cleanmode in 430s + bm-build-deps-ok 430s + case "$branch" in 430s + return 1 430s + tolerate_fail=tolerate 430s + echo 'EXAMPLE RULES TARGET clean' 430s + case $eff_cleanmode in 430s + '[' 'xbuild-arch binary-arch' '!=' x ']' 430s + bm-build-deps-ok 430s + case "$branch" in 430s + return 1 430s + tolerate_fail=tolerate 430s + for t in $e_targets 430s + bm-build-deps-ok 430s + case "$branch" in 430s + return 1 430s + require_fail=required 430s + echo 'EXAMPLE RULES TARGET build-arch' 430s + for t in $e_targets 430s + bm-build-deps-ok 430s + case "$branch" in 430s + return 1 430s + require_fail=required 430s + echo 'EXAMPLE RULES TARGET binary-arch' 430s + bm-report-test 'SOURCE FILE' true 430s + local 'desc=SOURCE FILE' 430s + shift 430s + true 430s + echo 'SOURCE FILE EXISTS' 430s + bm-report-test 'SOURCE IN CHANGES' true 430s + local 'desc=SOURCE IN CHANGES' 430s + shift 430s + true 430s + echo 'SOURCE IN CHANGES EXISTS' 430s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 430s + local 'desc=DEBS IN CHANGES' 430s + shift 430s + expr 'build-arch binary-arch' : '.*binary.*' 430s 22 430s + echo 'DEBS IN CHANGES EXISTS' 430s + exec 430s + git checkout bad-build-deps 430s Switched to branch 'bad-build-deps' 430s + git clean -xdf 430s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 430s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 430s + set +o pipefail 430s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.output 430s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch 430s + local dgit=dgit 430s + pwd 430s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 430s + : ' 430s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 430s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch 430s | git rev-parse --show-toplevel 430s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 430s | git config -z --get-regexp --local '.*' 430s | git config -z --get-regexp --local '.*' 430s | git config -z --get-regexp --global '.*' 430s | git config -z --get-regexp --system '.*' 430s format , quilt mode gbp 430s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 430s warning: could not open directory 'debian/source/': No such file or directory 430s => `' 430s + git diff --quiet HEAD 430s massage split -G. 430s massage done 3 -B. 430s format , quilt mode gbp 430s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 430s warning: could not open directory 'debian/source/': No such file or directory 430s => `' 430s + git diff --quiet HEAD 430s 430s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 430s dgit: Have to apply the patches - making the tree dirty. 430s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 430s 430s + dpkg-source --before-build . 430s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 430s dpkg-buildpackage: info: source package example 430s dpkg-buildpackage: info: source version 1.0 430s dpkg-buildpackage: info: source distribution unstable 430s dpkg-buildpackage: info: source changed by Ian Jackson 430s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 430s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 430s dpkg-buildpackage: warning: (Use -d flag to override.) 430s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 430s 430s dgit: error: subprocess failed with error exit status 3 430s + local 'ps=255 0' 430s + set -o pipefail 430s + exec 430s + echo '===== [gbp-build_-G,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 430s + case $ps in 430s + actual_status=failure 430s + echo 'OPERATION FAILED' 430s + case "$require_fail-$tolerate_fail-$actual_status" in 430s + echo 'REQUIRED FAILURE' 430s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.output 431s + '[' 1 = 1 ']' 431s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 431s + local 'desc=SOURCE FILE' 431s + shift 431s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 431s + echo 'SOURCE FILE MISSING' 431s + '[' failure = success ']' 431s + exec 431s + quirk-clean-fixup 431s + case $cleanmode in 431s + perl -i.unfixed -ne ' 431s print unless 431s $_ eq $last && 431s $_ eq "EXAMPLE RULES TARGET clean\n"; 431s $last = $_; 431s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.results 431s + '[' failure = failure ']' 431s + for cleanmode in $cleanmodes 431s + for branch in $bm_branches 431s + bm-run-one 431s + local 'args= --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch' 431s + bmid='gbp-build -G,dpkg-source-d,no-check,indep-arch' 431s + bmid=gbp-build_-G,dpkg-source-d,no-check,indep-arch 431s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 431s + heading='===== [gbp-build_-G,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch =====' 431s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.output 431s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.expected 431s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.results 431s + bm-compute-expected 431s + require_fail=unexpect 431s + tolerate_fail=unexpect 431s + exec 431s + echo '===== [gbp-build_-G,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch =====' 431s + local eff_cleanmode=dpkg-source-d,no-check 431s + case "$e_targets" in 431s + case "$act" in 431s + case $eff_cleanmode in 431s + echo 'EXAMPLE RULES TARGET clean' 431s + case $eff_cleanmode in 431s + '[' 'xbuild-arch binary-arch' '!=' x ']' 431s + bm-build-deps-ok 431s + case "$branch" in 431s + return 0 431s + for t in $e_targets 431s + bm-build-deps-ok 431s + case "$branch" in 431s + return 0 431s + echo 'EXAMPLE RULES TARGET build-arch' 431s + for t in $e_targets 431s + bm-build-deps-ok 431s + case "$branch" in 431s + return 0 431s + echo 'EXAMPLE RULES TARGET binary-arch' 431s + bm-report-test 'SOURCE FILE' true 431s + local 'desc=SOURCE FILE' 431s + shift 431s + true 431s + echo 'SOURCE FILE EXISTS' 431s + bm-report-test 'SOURCE IN CHANGES' true 431s + local 'desc=SOURCE IN CHANGES' 431s + shift 431s + true 431s + echo 'SOURCE IN CHANGES EXISTS' 431s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 431s + local 'desc=DEBS IN CHANGES' 431s + shift 431s + expr 'build-arch binary-arch' : '.*binary.*' 431s 22 431s + echo 'DEBS IN CHANGES EXISTS' 431s + exec 431s + git checkout indep-arch 431s Switched to branch 'indep-arch' 431s + git clean -xdf 431s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 431s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 431s + set +o pipefail 431s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.output 431s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch 431s + local dgit=dgit 431s + pwd 431s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 431s + : ' 431s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 431s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch 431s | git rev-parse --show-toplevel 431s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 431s | git config -z --get-regexp --local '.*' 431s | git config -z --get-regexp --local '.*' 431s | git config -z --get-regexp --global '.*' 431s | git config -z --get-regexp --system '.*' 431s format , quilt mode gbp 431s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 431s warning: could not open directory 'debian/source/': No such file or directory 431s => `' 431s + git diff --quiet HEAD 431s massage split -G. 431s massage done 3 -B. 431s format , quilt mode gbp 431s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 431s warning: could not open directory 'debian/source/': No such file or directory 431s => `' 431s + git diff --quiet HEAD 431s 431s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 431s dgit: Have to apply the patches - making the tree dirty. 431s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 431s 431s + dpkg-source --before-build . 431s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 431s dpkg-buildpackage: info: source package example 431s dpkg-buildpackage: info: source version 1.0 431s dpkg-buildpackage: info: source distribution unstable 431s dpkg-buildpackage: info: source changed by Ian Jackson 431s fakeroot debian/rules clean 431s EXAMPLE RULES TARGET clean 431s dh_clean 431s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 431s | git rev-parse 'HEAD~0' 431s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 431s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 431s CD work 431s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 431s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 431s CD .. 431s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 431s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 431s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 431s dpkg-source: info: using source format '1.0' 431s dpkg-source: info: building example in example_1.0.tar.gz 431s dpkg-source: info: building example in example_1.0.dsc 431s CD work 431s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 431s package seems new, not specifying -v 431s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 431s dpkg-genchanges: info: including full source code in upload 431s CD .. 431s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 431s renaming (Files) example_1.0.tar.gz 431s renaming (dsc) example_1.0.dsc 431s renaming (changes) example_1.0_source.changes 431s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 431s dgit: Unapplying patches again to tidy up the tree. 431s + dpkg-source --after-build . 431s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 431s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 431s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 431s gbp:info: Performing the build 432s dpkg-buildpackage: info: source package example 432s dpkg-buildpackage: info: source version 1.0 432s dpkg-buildpackage: info: source distribution unstable 432s dpkg-buildpackage: info: source changed by Ian Jackson 432s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 432s dpkg-buildpackage: info: host architecture ppc64el 432s debian/rules build-arch 432s EXAMPLE RULES TARGET build-arch 432s fakeroot debian/rules binary-arch 432s EXAMPLE RULES TARGET binary-arch 432s dh_install 432s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 432s dh_gencontrol 432s dh_builddeb 432s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep ..+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 432s 432s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_ppc64el.deb'. 432s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 432s dpkg-genbuildinfo --build=any -O../example_1.0_ppc64el.buildinfo 432s dpkg-genchanges --build=any -O../example_1.0_ppc64el.changes 432s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 432s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 432s dpkg-buildpackage: info: binary-only upload (no source included) 432s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 432s + mergechanges -f example_1.0_source.changes example_1.0_ppc64el.changes 433s dgit ok: build successful, results in example_1.0_multi.changes 433s 433s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 433s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 433s ' 433s + local 'ps=0 0' 433s + set -o pipefail 433s + exec 433s + echo '===== [gbp-build_-G,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch =====' 433s + case $ps in 433s + actual_status=success 433s + case "$require_fail-$tolerate_fail-$actual_status" in 433s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.output 433s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 433s + local 'desc=SOURCE FILE' 433s + shift 433s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 433s + echo 'SOURCE FILE EXISTS' 433s + '[' success = success ']' 433s + local changes 433s ++ echo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 433s + changes=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes 433s + case "$changes" in 433s + perl -ne 'print if m/^files:/i ... m/^\S/' 433s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 433s + local 'desc=SOURCE IN CHANGES' 433s + shift 433s + grep '\.dsc$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 433s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 433s + echo 'SOURCE IN CHANGES EXISTS' 433s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 433s + local 'desc=DEBS IN CHANGES' 433s + shift 433s + grep '\.deb$' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 433s f73f51099d2ca60b17e18c3fe930d22a 20672 devel extra example-arch_1.0_ppc64el.deb 433s + echo 'DEBS IN CHANGES EXISTS' 433s + exec 433s + quirk-clean-fixup 433s + case $cleanmode in 433s + perl -i.unfixed -ne ' 433s print unless 433s $_ eq $last && 433s $_ eq "EXAMPLE RULES TARGET clean\n"; 433s $last = $_; 433s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.results 433s + '[' success = failure ']' 433s + diff -U10 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.results 433s + for branch in $bm_branches 433s + bm-run-one 433s + local 'args= --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch' 433s + bmid='gbp-build -G,dpkg-source-d,no-check,bad-build-deps' 433s + bmid=gbp-build_-G,dpkg-source-d,no-check,bad-build-deps 433s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_{v}_*.changes' 433s + 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 =====' 433s + bmlog=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.output 433s + bmexp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.expected 433s + bmgot=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.results 433s + bm-compute-expected 433s + require_fail=unexpect 433s + tolerate_fail=unexpect 433s + exec 433s + 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 =====' 433s + local eff_cleanmode=dpkg-source-d,no-check 433s + case "$e_targets" in 433s + case "$act" in 433s + case $eff_cleanmode in 433s + echo 'EXAMPLE RULES TARGET clean' 433s + case $eff_cleanmode in 433s + '[' 'xbuild-arch binary-arch' '!=' x ']' 433s + bm-build-deps-ok 433s + case "$branch" in 433s + return 1 433s + tolerate_fail=tolerate 433s + for t in $e_targets 433s + bm-build-deps-ok 433s + case "$branch" in 433s + return 1 433s + require_fail=required 433s + echo 'EXAMPLE RULES TARGET build-arch' 433s + for t in $e_targets 433s + bm-build-deps-ok 433s + case "$branch" in 433s + return 1 433s + require_fail=required 433s + echo 'EXAMPLE RULES TARGET binary-arch' 433s + bm-report-test 'SOURCE FILE' true 433s + local 'desc=SOURCE FILE' 433s + shift 433s + true 433s + echo 'SOURCE FILE EXISTS' 433s + bm-report-test 'SOURCE IN CHANGES' true 433s + local 'desc=SOURCE IN CHANGES' 433s + shift 433s + true 433s + echo 'SOURCE IN CHANGES EXISTS' 433s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 433s + local 'desc=DEBS IN CHANGES' 433s + shift 433s + expr 'build-arch binary-arch' : '.*binary.*' 433s 22 433s + echo 'DEBS IN CHANGES EXISTS' 433s + exec 433s + git checkout bad-build-deps 433s Switched to branch 'bad-build-deps' 433s + git clean -xdf 433s + dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 433s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc 433s + set +o pipefail 433s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch 433s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.output 433s + local dgit=dgit 433s + pwd 433s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 433s + : ' 433s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 433s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch 433s | git rev-parse --show-toplevel 433s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 433s | git config -z --get-regexp --local '.*' 433s | git config -z --get-regexp --local '.*' 433s | git config -z --get-regexp --global '.*' 433s | git config -z --get-regexp --system '.*' 433s format , quilt mode gbp 433s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 433s warning: could not open directory 'debian/source/': No such file or directory 433s => `' 433s + git diff --quiet HEAD 433s massage split -G. 433s massage done 3 -B. 433s format , quilt mode gbp 433s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 433s warning: could not open directory 'debian/source/': No such file or directory 433s => `' 433s + git diff --quiet HEAD 433s 433s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 433s dgit: Have to apply the patches - making the tree dirty. 433s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 433s 433s + dpkg-source --before-build . 433s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 433s dpkg-buildpackage: info: source package example 433s dpkg-buildpackage: info: source version 1.0 433s dpkg-buildpackage: info: source distribution unstable 433s dpkg-buildpackage: info: source changed by Ian Jackson 433s fakeroot debian/rules clean 433s EXAMPLE RULES TARGET clean 433s dh_clean 433s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 433s | git rev-parse 'HEAD~0' 433s => `d09bc55f43bc5586103335d232c16bd041247bd1' 433s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 433s CD work 433s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git playtree-setup . 433s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 433s CD .. 433s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 434s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 434s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 434s dpkg-source: info: using source format '1.0' 434s dpkg-source: info: building example in example_1.0.tar.gz 434s dpkg-source: info: building example in example_1.0.dsc 434s CD work 434s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 434s package seems new, not specifying -v 434s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 434s dpkg-genchanges: info: including full source code in upload 434s CD .. 434s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd 434s renaming (Files) example_1.0.tar.gz 434s renaming (dsc) example_1.0.dsc 434s renaming (changes) example_1.0_source.changes 434s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 434s dgit: Unapplying patches again to tidy up the tree. 434s + dpkg-source --after-build . 434s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 434s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' 434s gbp:info: Moving '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example-1.0' 434s gbp:info: Performing the build 434s dpkg-buildpackage: info: source package example 434s dpkg-buildpackage: info: source version 1.0 434s dpkg-buildpackage: info: source distribution unstable 434s dpkg-buildpackage: info: source changed by Ian Jackson 434s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 434s dpkg-buildpackage: info: host architecture ppc64el 434s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 434s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 434s dpkg-buildpackage: warning: (Use -d flag to override.) 434s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 434s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 434s 434s dgit: error: subprocess failed with error exit status 1 434s + local 'ps=255 0' 434s + set -o pipefail 434s + exec 434s + 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 =====' 434s + case $ps in 434s + actual_status=failure 434s + echo 'OPERATION FAILED' 434s + case "$require_fail-$tolerate_fail-$actual_status" in 434s + echo 'REQUIRED FAILURE' 434s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.output 434s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 434s + local 'desc=SOURCE FILE' 434s + shift 434s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd/example_1.0.dsc ']' 434s + echo 'SOURCE FILE EXISTS' 434s + '[' failure = success ']' 434s + exec 434s + quirk-clean-fixup 434s + case $cleanmode in 434s + perl -i.unfixed -ne ' 434s print unless 434s $_ eq $last && 434s $_ eq "EXAMPLE RULES TARGET clean\n"; 434s $last = $_; 434s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.results 434s + '[' failure = failure ']' 434s + : bm-act-iterate done. 434s + t-ok 434s + : ======================================== 434s + t-check-only-bpd 434s + '[' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/bpd = .. ']' 434s + t-files-notexist '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.deb' '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.changes' '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.dsc' '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.buildinfo' '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.tar.*' '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.diff.*' 434s + local f 434s + for f in "$@" 434s + '[' -e '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.deb' ']' 434s + for f in "$@" 434s + '[' -e '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.changes' ']' 434s + for f in "$@" 434s + '[' -e '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.dsc' ']' 434s + for f in "$@" 434s + '[' -e '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.buildinfo' ']' 434s + for f in "$@" 434s + '[' -e '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.tar.*' ']' 434s + for f in "$@" 434s + '[' -e '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/*.diff.*' ']' 434s + t-fscks 434s + shopt -s nullglob 434s + for d in $tmp/*/.git $tmp/git/*.git 434s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 434s + t-git-fsck 434s ++ git rev-parse --git-dir 434s + local fsckerrs=.git/dgit-test-fsck.errs 434s + set +e 434s + LC_MESSAGES=C 434s + git fsck --no-dangling --strict 434s + tee .git/dgit-test-fsck.errs 434s + ps='0 0' 434s + set -e 434s + local pats 434s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 434s + test '0 0' = '0 0' 434s + pats+=(-e 'notice: HEAD points to an unborn branch') 434s + pats+=(-e 'notice: No default references') 434s + set +e 434s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 434s + rc=1 434s + set -e 434s + case $rc in 434s + t-save-artifacts 434s + artifacts=/tmp/autopkgtest.XK8uun/build-modes-gbp-artifacts 434s + '[' x/tmp/autopkgtest.XK8uun/build-modes-gbp-artifacts = x ']' 434s + '[' xtmp = x ']' 434s + GZIP=-1v 434s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/build-modes-gbp-artifacts/build-modes-gbp.tar.gz '--exclude=*.tar' . 434s gzip: warning: GZIP environment variable is deprecated; use an alias or script 434s 86.3% 434s + echo ok. 434s ok. 434s + rc=0 434s + set +x 434s + set +e 434s + pwd 434s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 434s + '[' x '!=' x ']' 434s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 434s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 434s + set -e 434s + test 0 = 0 435s autopkgtest [22:54:25]: test build-modes-gbp: -----------------------] 436s autopkgtest [22:54:26]: test build-modes-gbp: - - - - - - - - - - results - - - - - - - - - - 436s build-modes-gbp PASS 437s autopkgtest [22:54:27]: test clone-reprepro: preparing testbed 651s autopkgtest [22:58:01]: testbed dpkg architecture: ppc64el 651s autopkgtest [22:58:01]: testbed apt version: 2.4.13 651s autopkgtest [22:58:01]: @@@@@@@@@@@@@@@@@@@@ test bed setup 651s autopkgtest [22:58:01]: testbed release detected to be: jammy 652s autopkgtest [22:58:02]: updating testbed package index (apt update) 652s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 653s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 653s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 653s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 653s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 653s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.2 kB] 653s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 653s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el Packages [170 kB] 653s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el c-n-f Metadata [2476 B] 653s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el Packages [1704 B] 653s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el c-n-f Metadata [116 B] 653s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el Packages [85.0 kB] 653s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el c-n-f Metadata [2064 B] 653s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse ppc64el c-n-f Metadata [116 B] 656s Fetched 715 kB in 1s (742 kB/s) 656s Reading package lists... 657s autopkgtest [22:58:07]: upgrading testbed (apt dist-upgrade and autopurge) 657s Reading package lists... 657s Building dependency tree... 657s Reading state information... 658s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 658s Starting 2 pkgProblemResolver with broken count: 0 658s Done 658s Entering ResolveByKeep 658s 658s The following NEW packages will be installed: 658s linux-headers-5.15.0-136 linux-headers-5.15.0-136-generic 658s linux-image-5.15.0-136-generic linux-modules-5.15.0-136-generic 658s linux-modules-extra-5.15.0-136-generic 658s The following packages will be upgraded: 658s apt apt-utils libapt-pkg6.0 linux-generic linux-headers-generic 658s linux-headers-virtual linux-image-generic linux-image-virtual linux-virtual 658s 9 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. 658s Need to get 112 MB of archives. 658s After this operation, 613 MB of additional disk space will be used. 658s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el libapt-pkg6.0 ppc64el 2.4.14 [1030 kB] 659s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt ppc64el 2.4.14 [1407 kB] 659s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt-utils ppc64el 2.4.14 [236 kB] 659s Get:4 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-5.15.0-136-generic ppc64el 5.15.0-136.147 [22.0 MB] 661s Get:5 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-5.15.0-136-generic ppc64el 5.15.0-136.147 [11.5 MB] 662s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-extra-5.15.0-136-generic ppc64el 5.15.0-136.147 [60.3 MB] 664s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-generic ppc64el 5.15.0.136.134 [1700 B] 664s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-generic ppc64el 5.15.0.136.134 [2466 B] 664s Get:9 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-virtual ppc64el 5.15.0.136.134 [1676 B] 664s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-virtual ppc64el 5.15.0.136.134 [2464 B] 664s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-virtual ppc64el 5.15.0.136.134 [1634 B] 664s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136 all 5.15.0-136.147 [12.3 MB] 664s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136-generic ppc64el 5.15.0-136.147 [3208 kB] 664s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-generic ppc64el 5.15.0.136.134 [2364 B] 664s Fetched 112 MB in 6s (18.9 MB/s) 665s (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 ... 66539 files and directories currently installed.) 665s Preparing to unpack .../libapt-pkg6.0_2.4.14_ppc64el.deb ... 665s Unpacking libapt-pkg6.0:ppc64el (2.4.14) over (2.4.13) ... 665s Setting up libapt-pkg6.0:ppc64el (2.4.14) ... 665s (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 ... 66539 files and directories currently installed.) 665s Preparing to unpack .../apt_2.4.14_ppc64el.deb ... 665s Unpacking apt (2.4.14) over (2.4.13) ... 665s Setting up apt (2.4.14) ... 666s (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 ... 66539 files and directories currently installed.) 666s Preparing to unpack .../00-apt-utils_2.4.14_ppc64el.deb ... 666s Unpacking apt-utils (2.4.14) over (2.4.13) ... 666s Selecting previously unselected package linux-modules-5.15.0-136-generic. 666s Preparing to unpack .../01-linux-modules-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 666s Unpacking linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 666s Selecting previously unselected package linux-image-5.15.0-136-generic. 666s Preparing to unpack .../02-linux-image-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 666s Unpacking linux-image-5.15.0-136-generic (5.15.0-136.147) ... 666s Selecting previously unselected package linux-modules-extra-5.15.0-136-generic. 666s Preparing to unpack .../03-linux-modules-extra-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 666s Unpacking linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 669s Preparing to unpack .../04-linux-generic_5.15.0.136.134_ppc64el.deb ... 669s Unpacking linux-generic (5.15.0.136.134) over (5.15.0.135.133) ... 669s Preparing to unpack .../05-linux-image-generic_5.15.0.136.134_ppc64el.deb ... 669s Unpacking linux-image-generic (5.15.0.136.134) over (5.15.0.135.133) ... 669s Preparing to unpack .../06-linux-virtual_5.15.0.136.134_ppc64el.deb ... 669s Unpacking linux-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 669s Preparing to unpack .../07-linux-image-virtual_5.15.0.136.134_ppc64el.deb ... 669s Unpacking linux-image-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 669s Preparing to unpack .../08-linux-headers-virtual_5.15.0.136.134_ppc64el.deb ... 669s Unpacking linux-headers-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 669s Selecting previously unselected package linux-headers-5.15.0-136. 669s Preparing to unpack .../09-linux-headers-5.15.0-136_5.15.0-136.147_all.deb ... 669s Unpacking linux-headers-5.15.0-136 (5.15.0-136.147) ... 671s Selecting previously unselected package linux-headers-5.15.0-136-generic. 671s Preparing to unpack .../10-linux-headers-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 671s Unpacking linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 671s Preparing to unpack .../11-linux-headers-generic_5.15.0.136.134_ppc64el.deb ... 671s Unpacking linux-headers-generic (5.15.0.136.134) over (5.15.0.135.133) ... 671s Setting up apt-utils (2.4.14) ... 671s Setting up linux-headers-5.15.0-136 (5.15.0-136.147) ... 672s Setting up linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 672s Setting up linux-headers-generic (5.15.0.136.134) ... 672s Setting up linux-headers-virtual (5.15.0.136.134) ... 672s Setting up linux-image-5.15.0-136-generic (5.15.0-136.147) ... 673s I: /boot/vmlinux is now a symlink to vmlinux-5.15.0-136-generic 673s I: /boot/initrd.img is now a symlink to initrd.img-5.15.0-136-generic 673s Setting up linux-image-virtual (5.15.0.136.134) ... 673s Setting up linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 674s Setting up linux-virtual (5.15.0.136.134) ... 674s Setting up linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 675s Setting up linux-image-generic (5.15.0.136.134) ... 675s Setting up linux-generic (5.15.0.136.134) ... 675s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 675s Processing triggers for man-db (2.10.2-1) ... 675s Processing triggers for linux-image-5.15.0-136-generic (5.15.0-136.147) ... 675s /etc/kernel/postinst.d/initramfs-tools: 675s update-initramfs: Generating /boot/initrd.img-5.15.0-136-generic 675s No lz4 in /usr/bin:/sbin:/bin, using gzip 700s /etc/kernel/postinst.d/zz-update-grub: 700s Sourcing file `/etc/default/grub' 700s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 700s Sourcing file `/etc/default/grub.d/init-select.cfg' 700s Generating grub configuration file ... 701s Found linux image: /boot/vmlinux-5.15.0-136-generic 701s Found initrd image: /boot/initrd.img-5.15.0-136-generic 701s Found linux image: /boot/vmlinux-5.15.0-135-generic 701s Found initrd image: /boot/initrd.img-5.15.0-135-generic 701s Warning: os-prober will not be executed to detect other bootable partitions. 701s Systems on them will not be added to the GRUB boot configuration. 701s Check GRUB_DISABLE_OS_PROBER documentation entry. 701s done 702s Reading package lists... 703s Building dependency tree... 703s Reading state information... 703s Starting pkgProblemResolver with broken count: 0 703s Starting 2 pkgProblemResolver with broken count: 0 703s Done 703s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 703s autopkgtest [22:58:53]: rebooting testbed after setup commands that affected boot 736s Reading package lists... 737s Building dependency tree... 737s Reading state information... 737s Starting pkgProblemResolver with broken count: 0 737s Starting 2 pkgProblemResolver with broken count: 0 737s Done 737s The following NEW packages will be installed: 737s autoconf automake autopoint autotools-dev build-essential chiark-utils-bin 737s cpp cpp-11 debhelper debugedit devscripts dgit dgit-infrastructure 737s dh-autoreconf dh-strip-nondeterminism dput dwz fakeroot faketime g++ g++-11 737s gcc gcc-11 gcc-11-base gettext git git-buildpackage git-man intltool-debian 737s libarchive-zip-perl libasan6 libatomic1 libb-hooks-op-check-perl 737s libc-dev-bin libc6-dev libcc1-0 libclass-method-modifiers-perl 737s libclass-xsaccessor-perl libcrypt-dev libdbd-sqlite3-perl libdbi-perl 737s libdebhelper-perl libdevel-callchecker-perl libdynaloader-functions-perl 737s libencode-locale-perl liberror-perl libexporter-tiny-perl libfakeroot 737s libfaketime libfile-dirlist-perl libfile-homedir-perl libfile-listing-perl 737s libfile-stripnondeterminism-perl libfile-touch-perl libfile-which-perl 737s libgcc-11-dev libgomp1 libhtml-parser-perl libhtml-tagset-perl 737s libhtml-tree-perl libhttp-cookies-perl libhttp-date-perl 737s libhttp-message-perl libhttp-negotiate-perl libimport-into-perl 737s libio-html-perl libio-pty-perl libio-socket-ssl-perl libipc-run-perl 737s libisl23 libitm1 libjson-perl liblist-moreutils-perl 737s liblist-moreutils-xs-perl liblsan0 liblwp-mediatypes-perl 737s liblwp-protocol-https-perl libmodule-runtime-perl libmoo-perl libmpc3 737s libnet-http-perl libnet-ssleay-perl libnsl-dev libparams-classify-perl 737s libquadmath0 librole-tiny-perl libstdc++-11-dev libsub-override-perl 737s libsub-quote-perl libtext-csv-perl libtext-glob-perl libtimedate-perl 737s libtirpc-dev libtool libtry-tiny-perl libtsan0 libubsan1 liburi-perl 737s libwww-curl-perl libwww-perl libwww-robotrules-perl linux-libc-dev m4 737s patchutils perl-openssl-defaults po-debconf python3-dateutil python3-debian 737s python3-gpg reprepro rpcsvc-proto sqlite3 wdiff 737s 0 upgraded, 113 newly installed, 0 to remove and 0 not upgraded. 737s Need to get 69.0 MB of archives. 737s After this operation, 263 MB of additional disk space will be used. 737s Get:1 http://ftpmaster.internal/ubuntu jammy/main ppc64el m4 ppc64el 1.4.18-5ubuntu2 [214 kB] 737s Get:2 http://ftpmaster.internal/ubuntu jammy/main ppc64el autoconf all 2.71-2 [338 kB] 737s Get:3 http://ftpmaster.internal/ubuntu jammy/main ppc64el autotools-dev all 20220109.1 [44.9 kB] 738s Get:4 http://ftpmaster.internal/ubuntu jammy/main ppc64el automake all 1:1.16.5-1.3 [558 kB] 738s Get:5 http://ftpmaster.internal/ubuntu jammy/main ppc64el autopoint all 0.21-4ubuntu4 [422 kB] 738s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc-dev-bin ppc64el 2.35-0ubuntu3.9 [21.4 kB] 738s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-libc-dev ppc64el 5.15.0-136.147 [1313 kB] 738s Get:8 http://ftpmaster.internal/ubuntu jammy/main ppc64el libcrypt-dev ppc64el 1:4.4.27-1 [142 kB] 738s Get:9 http://ftpmaster.internal/ubuntu jammy/main ppc64el rpcsvc-proto ppc64el 1.4.2-0ubuntu6 [82.3 kB] 738s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtirpc-dev ppc64el 1.3.2-2ubuntu0.1 [223 kB] 738s Get:11 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnsl-dev ppc64el 1.3.0-2build2 [80.0 kB] 738s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc6-dev ppc64el 2.35-0ubuntu3.9 [2053 kB] 738s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11-base ppc64el 11.4.0-1ubuntu1~22.04 [20.3 kB] 738s Get:14 http://ftpmaster.internal/ubuntu jammy/main ppc64el libisl23 ppc64el 0.24-2build1 [833 kB] 738s Get:15 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmpc3 ppc64el 1.2.1-2build1 [52.2 kB] 738s Get:16 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el cpp-11 ppc64el 11.4.0-1ubuntu1~22.04 [8800 kB] 738s Get:17 http://ftpmaster.internal/ubuntu jammy/main ppc64el cpp ppc64el 4:11.2.0-1ubuntu1 [27.7 kB] 738s Get:18 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libcc1-0 ppc64el 12.3.0-1ubuntu1~22.04 [49.5 kB] 738s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgomp1 ppc64el 12.3.0-1ubuntu1~22.04 [140 kB] 738s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libitm1 ppc64el 12.3.0-1ubuntu1~22.04 [32.9 kB] 738s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libatomic1 ppc64el 12.3.0-1ubuntu1~22.04 [10.6 kB] 738s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libasan6 ppc64el 11.4.0-1ubuntu1~22.04 [2303 kB] 738s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el liblsan0 ppc64el 12.3.0-1ubuntu1~22.04 [1090 kB] 738s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtsan0 ppc64el 11.4.0-1ubuntu1~22.04 [2278 kB] 738s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libubsan1 ppc64el 12.3.0-1ubuntu1~22.04 [1001 kB] 738s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libquadmath0 ppc64el 12.3.0-1ubuntu1~22.04 [156 kB] 738s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgcc-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [1477 kB] 738s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11 ppc64el 11.4.0-1ubuntu1~22.04 [17.7 MB] 739s Get:29 http://ftpmaster.internal/ubuntu jammy/main ppc64el gcc ppc64el 4:11.2.0-1ubuntu1 [5152 B] 739s Get:30 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libstdc++-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [2197 kB] 739s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el g++-11 ppc64el 11.4.0-1ubuntu1~22.04 [10.2 MB] 739s Get:32 http://ftpmaster.internal/ubuntu jammy/main ppc64el g++ ppc64el 4:11.2.0-1ubuntu1 [1408 B] 739s Get:33 http://ftpmaster.internal/ubuntu jammy/main ppc64el build-essential ppc64el 12.9ubuntu3 [4752 B] 739s Get:34 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 739s Get:35 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtool all 2.4.6-15build2 [164 kB] 739s Get:36 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-autoreconf all 20 [16.1 kB] 739s Get:37 http://ftpmaster.internal/ubuntu jammy/main ppc64el libarchive-zip-perl all 1.68-1 [90.2 kB] 739s Get:38 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-override-perl all 0.09-2 [9532 B] 739s Get:39 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 739s Get:40 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-strip-nondeterminism all 1.13.0-1 [5344 B] 739s Get:41 http://ftpmaster.internal/ubuntu jammy/main ppc64el debugedit ppc64el 1:5.0-4build1 [51.6 kB] 739s Get:42 http://ftpmaster.internal/ubuntu jammy/main ppc64el dwz ppc64el 0.14-1build2 [124 kB] 739s Get:43 http://ftpmaster.internal/ubuntu jammy/main ppc64el gettext ppc64el 0.21-4ubuntu4 [976 kB] 739s Get:44 http://ftpmaster.internal/ubuntu jammy/main ppc64el intltool-debian all 0.35.0+20060710.5 [24.9 kB] 739s Get:45 http://ftpmaster.internal/ubuntu jammy/main ppc64el po-debconf all 1.0.21+nmu1 [233 kB] 739s Get:46 http://ftpmaster.internal/ubuntu jammy/main ppc64el debhelper all 13.6ubuntu1 [923 kB] 739s Get:47 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfakeroot ppc64el 1.28-1ubuntu1 [33.8 kB] 739s Get:48 http://ftpmaster.internal/ubuntu jammy/main ppc64el fakeroot ppc64el 1.28-1ubuntu1 [62.8 kB] 739s Get:49 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-dirlist-perl all 0.05-2 [7100 B] 739s Get:50 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-which-perl all 1.23-1 [13.8 kB] 739s Get:51 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-homedir-perl all 1.006-1 [38.3 kB] 739s Get:52 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-touch-perl all 0.12-1 [9024 B] 739s Get:53 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-pty-perl ppc64el 1:1.15-2build2 [35.3 kB] 739s Get:54 http://ftpmaster.internal/ubuntu jammy/main ppc64el libipc-run-perl all 20200505.0-1 [89.8 kB] 739s Get:55 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 739s Get:56 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-xsaccessor-perl ppc64el 1.19-3build9 [36.6 kB] 739s Get:57 http://ftpmaster.internal/ubuntu jammy/main ppc64el libb-hooks-op-check-perl ppc64el 0.22-1build5 [10.4 kB] 739s Get:58 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 739s Get:59 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdevel-callchecker-perl ppc64el 0.008-1ubuntu4 [14.7 kB] 739s Get:60 http://ftpmaster.internal/ubuntu jammy/main ppc64el libparams-classify-perl ppc64el 0.015-1build5 [23.9 kB] 739s Get:61 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmodule-runtime-perl all 0.016-1 [16.2 kB] 739s Get:62 http://ftpmaster.internal/ubuntu jammy/main ppc64el libimport-into-perl all 1.002005-1 [11.0 kB] 739s Get:63 http://ftpmaster.internal/ubuntu jammy/main ppc64el librole-tiny-perl all 2.002004-1 [16.3 kB] 739s Get:64 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-quote-perl all 2.006006-1 [19.5 kB] 739s Get:65 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmoo-perl all 2.005004-3 [48.0 kB] 739s Get:66 http://ftpmaster.internal/ubuntu jammy/main ppc64el libencode-locale-perl all 1.05-1.1 [11.8 kB] 739s Get:67 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtimedate-perl all 2.3300-2 [34.0 kB] 739s Get:68 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-date-perl all 6.05-1 [9920 B] 739s Get:69 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-listing-perl all 6.14-1 [11.2 kB] 739s Get:70 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tagset-perl all 3.20-4 [12.5 kB] 740s Get:71 http://ftpmaster.internal/ubuntu jammy/main ppc64el liburi-perl all 5.10-1 [78.8 kB] 740s Get:72 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-parser-perl ppc64el 3.76-1build2 [93.6 kB] 740s Get:73 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tree-perl all 5.07-2 [200 kB] 740s Get:74 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-html-perl all 1.004-2 [15.4 kB] 740s Get:75 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 740s Get:76 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-message-perl all 6.36-1 [76.8 kB] 740s Get:77 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-cookies-perl all 6.10-1 [18.4 kB] 740s Get:78 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-negotiate-perl all 6.01-1 [12.5 kB] 740s Get:79 http://ftpmaster.internal/ubuntu jammy/main ppc64el perl-openssl-defaults ppc64el 5build2 [7540 B] 740s Get:80 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-ssleay-perl ppc64el 1.92-1build2 [332 kB] 740s Get:81 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-socket-ssl-perl all 2.074-2 [192 kB] 740s Get:82 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-http-perl all 6.22-1 [23.2 kB] 740s Get:83 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 740s Get:84 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtry-tiny-perl all 0.31-1 [21.8 kB] 740s Get:85 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-robotrules-perl all 6.02-1 [12.6 kB] 740s Get:86 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-perl all 6.61-1 [141 kB] 740s Get:87 http://ftpmaster.internal/ubuntu jammy/main ppc64el patchutils ppc64el 0.4.2-1build2 [86.6 kB] 740s Get:88 http://ftpmaster.internal/ubuntu jammy/main ppc64el wdiff ppc64el 1.2.2-2build3 [29.5 kB] 740s Get:89 http://ftpmaster.internal/ubuntu jammy/main ppc64el devscripts ppc64el 2.22.1ubuntu1 [1058 kB] 740s Get:90 http://ftpmaster.internal/ubuntu jammy/main ppc64el liberror-perl all 0.17029-1 [26.5 kB] 740s Get:91 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 740s Get:92 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git ppc64el 1:2.34.1-1ubuntu1.12 [4143 kB] 740s Get:93 http://ftpmaster.internal/ubuntu jammy/main ppc64el python3-dateutil all 2.8.1-6 [78.4 kB] 740s Get:94 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-buildpackage all 0.9.25 [799 kB] 740s Get:95 http://ftpmaster.internal/ubuntu jammy/main ppc64el libexporter-tiny-perl all 1.002002-1 [36.2 kB] 740s Get:96 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-xs-perl ppc64el 0.430-2build2 [42.5 kB] 740s Get:97 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-perl all 0.430-2 [38.2 kB] 740s Get:98 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-debian all 0.1.43ubuntu1.1 [107 kB] 740s Get:99 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-gpg ppc64el 1.16.0-1.2ubuntu4.2 [227 kB] 740s Get:100 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el dput all 1.1.0ubuntu2.1 [44.7 kB] 740s Get:101 http://ftpmaster.internal/ubuntu jammy/main ppc64el libjson-perl all 4.04000-1 [81.8 kB] 740s Get:102 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtext-glob-perl all 0.11-2 [8042 B] 740s Get:103 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libwww-curl-perl ppc64el 4.17-7build2 [72.5 kB] 740s Get:104 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libtext-csv-perl all 2.01-1 [108 kB] 741s Get:105 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit all 9.15 [194 kB] 741s Get:106 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdbi-perl ppc64el 1.643-3build3 [748 kB] 741s Get:107 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libdbd-sqlite3-perl ppc64el 1.70-3build1 [172 kB] 741s Get:108 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el sqlite3 ppc64el 3.37.2-2ubuntu0.3 [880 kB] 741s Get:109 http://ftpmaster.internal/ubuntu jammy/universe ppc64el chiark-utils-bin ppc64el 6.1.2+nmu1 [55.7 kB] 741s Get:110 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit-infrastructure all 9.15 [40.8 kB] 741s Get:111 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfaketime ppc64el 0.9.8-9 [35.9 kB] 741s Get:112 http://ftpmaster.internal/ubuntu jammy/universe ppc64el faketime ppc64el 0.9.8-9 [10.3 kB] 741s Get:113 http://ftpmaster.internal/ubuntu jammy/universe ppc64el reprepro ppc64el 5.3.0-1.4 [562 kB] 742s Fetched 69.0 MB in 4s (17.8 MB/s) 742s Selecting previously unselected package m4. 742s (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 ... 101007 files and directories currently installed.) 742s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_ppc64el.deb ... 742s Unpacking m4 (1.4.18-5ubuntu2) ... 742s Selecting previously unselected package autoconf. 742s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 742s Unpacking autoconf (2.71-2) ... 742s Selecting previously unselected package autotools-dev. 742s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 742s Unpacking autotools-dev (20220109.1) ... 742s Selecting previously unselected package automake. 742s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 742s Unpacking automake (1:1.16.5-1.3) ... 742s Selecting previously unselected package autopoint. 742s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 742s Unpacking autopoint (0.21-4ubuntu4) ... 742s Selecting previously unselected package libc-dev-bin. 742s Preparing to unpack .../005-libc-dev-bin_2.35-0ubuntu3.9_ppc64el.deb ... 742s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 742s Selecting previously unselected package linux-libc-dev:ppc64el. 742s Preparing to unpack .../006-linux-libc-dev_5.15.0-136.147_ppc64el.deb ... 742s Unpacking linux-libc-dev:ppc64el (5.15.0-136.147) ... 742s Selecting previously unselected package libcrypt-dev:ppc64el. 742s Preparing to unpack .../007-libcrypt-dev_1%3a4.4.27-1_ppc64el.deb ... 742s Unpacking libcrypt-dev:ppc64el (1:4.4.27-1) ... 742s Selecting previously unselected package rpcsvc-proto. 742s Preparing to unpack .../008-rpcsvc-proto_1.4.2-0ubuntu6_ppc64el.deb ... 742s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 742s Selecting previously unselected package libtirpc-dev:ppc64el. 742s Preparing to unpack .../009-libtirpc-dev_1.3.2-2ubuntu0.1_ppc64el.deb ... 742s Unpacking libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 742s Selecting previously unselected package libnsl-dev:ppc64el. 742s Preparing to unpack .../010-libnsl-dev_1.3.0-2build2_ppc64el.deb ... 742s Unpacking libnsl-dev:ppc64el (1.3.0-2build2) ... 742s Selecting previously unselected package libc6-dev:ppc64el. 742s Preparing to unpack .../011-libc6-dev_2.35-0ubuntu3.9_ppc64el.deb ... 742s Unpacking libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 742s Selecting previously unselected package gcc-11-base:ppc64el. 743s Preparing to unpack .../012-gcc-11-base_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package libisl23:ppc64el. 743s Preparing to unpack .../013-libisl23_0.24-2build1_ppc64el.deb ... 743s Unpacking libisl23:ppc64el (0.24-2build1) ... 743s Selecting previously unselected package libmpc3:ppc64el. 743s Preparing to unpack .../014-libmpc3_1.2.1-2build1_ppc64el.deb ... 743s Unpacking libmpc3:ppc64el (1.2.1-2build1) ... 743s Selecting previously unselected package cpp-11. 743s Preparing to unpack .../015-cpp-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package cpp. 743s Preparing to unpack .../016-cpp_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 743s Unpacking cpp (4:11.2.0-1ubuntu1) ... 743s Selecting previously unselected package libcc1-0:ppc64el. 743s Preparing to unpack .../017-libcc1-0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package libgomp1:ppc64el. 743s Preparing to unpack .../018-libgomp1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package libitm1:ppc64el. 743s Preparing to unpack .../019-libitm1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package libatomic1:ppc64el. 743s Preparing to unpack .../020-libatomic1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package libasan6:ppc64el. 743s Preparing to unpack .../021-libasan6_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package liblsan0:ppc64el. 743s Preparing to unpack .../022-liblsan0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package libtsan0:ppc64el. 743s Preparing to unpack .../023-libtsan0_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package libubsan1:ppc64el. 743s Preparing to unpack .../024-libubsan1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package libquadmath0:ppc64el. 743s Preparing to unpack .../025-libquadmath0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package libgcc-11-dev:ppc64el. 743s Preparing to unpack .../026-libgcc-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package gcc-11. 743s Preparing to unpack .../027-gcc-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package gcc. 743s Preparing to unpack .../028-gcc_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 743s Unpacking gcc (4:11.2.0-1ubuntu1) ... 743s Selecting previously unselected package libstdc++-11-dev:ppc64el. 743s Preparing to unpack .../029-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 743s Selecting previously unselected package g++-11. 743s Preparing to unpack .../030-g++-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 743s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 744s Selecting previously unselected package g++. 744s Preparing to unpack .../031-g++_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 744s Unpacking g++ (4:11.2.0-1ubuntu1) ... 744s Selecting previously unselected package build-essential. 744s Preparing to unpack .../032-build-essential_12.9ubuntu3_ppc64el.deb ... 744s Unpacking build-essential (12.9ubuntu3) ... 744s Selecting previously unselected package libdebhelper-perl. 744s Preparing to unpack .../033-libdebhelper-perl_13.6ubuntu1_all.deb ... 744s Unpacking libdebhelper-perl (13.6ubuntu1) ... 744s Selecting previously unselected package libtool. 744s Preparing to unpack .../034-libtool_2.4.6-15build2_all.deb ... 744s Unpacking libtool (2.4.6-15build2) ... 744s Selecting previously unselected package dh-autoreconf. 744s Preparing to unpack .../035-dh-autoreconf_20_all.deb ... 744s Unpacking dh-autoreconf (20) ... 744s Selecting previously unselected package libarchive-zip-perl. 744s Preparing to unpack .../036-libarchive-zip-perl_1.68-1_all.deb ... 744s Unpacking libarchive-zip-perl (1.68-1) ... 744s Selecting previously unselected package libsub-override-perl. 744s Preparing to unpack .../037-libsub-override-perl_0.09-2_all.deb ... 744s Unpacking libsub-override-perl (0.09-2) ... 744s Selecting previously unselected package libfile-stripnondeterminism-perl. 744s Preparing to unpack .../038-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 744s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 744s Selecting previously unselected package dh-strip-nondeterminism. 744s Preparing to unpack .../039-dh-strip-nondeterminism_1.13.0-1_all.deb ... 744s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 744s Selecting previously unselected package debugedit. 744s Preparing to unpack .../040-debugedit_1%3a5.0-4build1_ppc64el.deb ... 744s Unpacking debugedit (1:5.0-4build1) ... 744s Selecting previously unselected package dwz. 744s Preparing to unpack .../041-dwz_0.14-1build2_ppc64el.deb ... 744s Unpacking dwz (0.14-1build2) ... 744s Selecting previously unselected package gettext. 744s Preparing to unpack .../042-gettext_0.21-4ubuntu4_ppc64el.deb ... 744s Unpacking gettext (0.21-4ubuntu4) ... 744s Selecting previously unselected package intltool-debian. 744s Preparing to unpack .../043-intltool-debian_0.35.0+20060710.5_all.deb ... 744s Unpacking intltool-debian (0.35.0+20060710.5) ... 744s Selecting previously unselected package po-debconf. 744s Preparing to unpack .../044-po-debconf_1.0.21+nmu1_all.deb ... 744s Unpacking po-debconf (1.0.21+nmu1) ... 744s Selecting previously unselected package debhelper. 744s Preparing to unpack .../045-debhelper_13.6ubuntu1_all.deb ... 744s Unpacking debhelper (13.6ubuntu1) ... 744s Selecting previously unselected package libfakeroot:ppc64el. 744s Preparing to unpack .../046-libfakeroot_1.28-1ubuntu1_ppc64el.deb ... 744s Unpacking libfakeroot:ppc64el (1.28-1ubuntu1) ... 744s Selecting previously unselected package fakeroot. 744s Preparing to unpack .../047-fakeroot_1.28-1ubuntu1_ppc64el.deb ... 744s Unpacking fakeroot (1.28-1ubuntu1) ... 744s Selecting previously unselected package libfile-dirlist-perl. 744s Preparing to unpack .../048-libfile-dirlist-perl_0.05-2_all.deb ... 744s Unpacking libfile-dirlist-perl (0.05-2) ... 744s Selecting previously unselected package libfile-which-perl. 744s Preparing to unpack .../049-libfile-which-perl_1.23-1_all.deb ... 744s Unpacking libfile-which-perl (1.23-1) ... 744s Selecting previously unselected package libfile-homedir-perl. 744s Preparing to unpack .../050-libfile-homedir-perl_1.006-1_all.deb ... 744s Unpacking libfile-homedir-perl (1.006-1) ... 744s Selecting previously unselected package libfile-touch-perl. 744s Preparing to unpack .../051-libfile-touch-perl_0.12-1_all.deb ... 744s Unpacking libfile-touch-perl (0.12-1) ... 744s Selecting previously unselected package libio-pty-perl. 744s Preparing to unpack .../052-libio-pty-perl_1%3a1.15-2build2_ppc64el.deb ... 744s Unpacking libio-pty-perl (1:1.15-2build2) ... 744s Selecting previously unselected package libipc-run-perl. 744s Preparing to unpack .../053-libipc-run-perl_20200505.0-1_all.deb ... 744s Unpacking libipc-run-perl (20200505.0-1) ... 744s Selecting previously unselected package libclass-method-modifiers-perl. 744s Preparing to unpack .../054-libclass-method-modifiers-perl_2.13-1_all.deb ... 744s Unpacking libclass-method-modifiers-perl (2.13-1) ... 744s Selecting previously unselected package libclass-xsaccessor-perl. 744s Preparing to unpack .../055-libclass-xsaccessor-perl_1.19-3build9_ppc64el.deb ... 744s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 744s Selecting previously unselected package libb-hooks-op-check-perl. 744s Preparing to unpack .../056-libb-hooks-op-check-perl_0.22-1build5_ppc64el.deb ... 744s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 744s Selecting previously unselected package libdynaloader-functions-perl. 744s Preparing to unpack .../057-libdynaloader-functions-perl_0.003-1.1_all.deb ... 744s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 744s Selecting previously unselected package libdevel-callchecker-perl. 744s Preparing to unpack .../058-libdevel-callchecker-perl_0.008-1ubuntu4_ppc64el.deb ... 744s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 744s Selecting previously unselected package libparams-classify-perl. 744s Preparing to unpack .../059-libparams-classify-perl_0.015-1build5_ppc64el.deb ... 744s Unpacking libparams-classify-perl (0.015-1build5) ... 744s Selecting previously unselected package libmodule-runtime-perl. 744s Preparing to unpack .../060-libmodule-runtime-perl_0.016-1_all.deb ... 744s Unpacking libmodule-runtime-perl (0.016-1) ... 744s Selecting previously unselected package libimport-into-perl. 744s Preparing to unpack .../061-libimport-into-perl_1.002005-1_all.deb ... 744s Unpacking libimport-into-perl (1.002005-1) ... 744s Selecting previously unselected package librole-tiny-perl. 744s Preparing to unpack .../062-librole-tiny-perl_2.002004-1_all.deb ... 744s Unpacking librole-tiny-perl (2.002004-1) ... 744s Selecting previously unselected package libsub-quote-perl. 744s Preparing to unpack .../063-libsub-quote-perl_2.006006-1_all.deb ... 744s Unpacking libsub-quote-perl (2.006006-1) ... 744s Selecting previously unselected package libmoo-perl. 744s Preparing to unpack .../064-libmoo-perl_2.005004-3_all.deb ... 744s Unpacking libmoo-perl (2.005004-3) ... 744s Selecting previously unselected package libencode-locale-perl. 744s Preparing to unpack .../065-libencode-locale-perl_1.05-1.1_all.deb ... 744s Unpacking libencode-locale-perl (1.05-1.1) ... 744s Selecting previously unselected package libtimedate-perl. 744s Preparing to unpack .../066-libtimedate-perl_2.3300-2_all.deb ... 744s Unpacking libtimedate-perl (2.3300-2) ... 744s Selecting previously unselected package libhttp-date-perl. 744s Preparing to unpack .../067-libhttp-date-perl_6.05-1_all.deb ... 744s Unpacking libhttp-date-perl (6.05-1) ... 744s Selecting previously unselected package libfile-listing-perl. 744s Preparing to unpack .../068-libfile-listing-perl_6.14-1_all.deb ... 744s Unpacking libfile-listing-perl (6.14-1) ... 744s Selecting previously unselected package libhtml-tagset-perl. 744s Preparing to unpack .../069-libhtml-tagset-perl_3.20-4_all.deb ... 744s Unpacking libhtml-tagset-perl (3.20-4) ... 744s Selecting previously unselected package liburi-perl. 744s Preparing to unpack .../070-liburi-perl_5.10-1_all.deb ... 744s Unpacking liburi-perl (5.10-1) ... 744s Selecting previously unselected package libhtml-parser-perl:ppc64el. 744s Preparing to unpack .../071-libhtml-parser-perl_3.76-1build2_ppc64el.deb ... 744s Unpacking libhtml-parser-perl:ppc64el (3.76-1build2) ... 744s Selecting previously unselected package libhtml-tree-perl. 744s Preparing to unpack .../072-libhtml-tree-perl_5.07-2_all.deb ... 744s Unpacking libhtml-tree-perl (5.07-2) ... 744s Selecting previously unselected package libio-html-perl. 744s Preparing to unpack .../073-libio-html-perl_1.004-2_all.deb ... 744s Unpacking libio-html-perl (1.004-2) ... 744s Selecting previously unselected package liblwp-mediatypes-perl. 744s Preparing to unpack .../074-liblwp-mediatypes-perl_6.04-1_all.deb ... 744s Unpacking liblwp-mediatypes-perl (6.04-1) ... 744s Selecting previously unselected package libhttp-message-perl. 744s Preparing to unpack .../075-libhttp-message-perl_6.36-1_all.deb ... 744s Unpacking libhttp-message-perl (6.36-1) ... 744s Selecting previously unselected package libhttp-cookies-perl. 744s Preparing to unpack .../076-libhttp-cookies-perl_6.10-1_all.deb ... 744s Unpacking libhttp-cookies-perl (6.10-1) ... 744s Selecting previously unselected package libhttp-negotiate-perl. 744s Preparing to unpack .../077-libhttp-negotiate-perl_6.01-1_all.deb ... 744s Unpacking libhttp-negotiate-perl (6.01-1) ... 744s Selecting previously unselected package perl-openssl-defaults:ppc64el. 744s Preparing to unpack .../078-perl-openssl-defaults_5build2_ppc64el.deb ... 744s Unpacking perl-openssl-defaults:ppc64el (5build2) ... 744s Selecting previously unselected package libnet-ssleay-perl:ppc64el. 744s Preparing to unpack .../079-libnet-ssleay-perl_1.92-1build2_ppc64el.deb ... 744s Unpacking libnet-ssleay-perl:ppc64el (1.92-1build2) ... 744s Selecting previously unselected package libio-socket-ssl-perl. 744s Preparing to unpack .../080-libio-socket-ssl-perl_2.074-2_all.deb ... 744s Unpacking libio-socket-ssl-perl (2.074-2) ... 744s Selecting previously unselected package libnet-http-perl. 744s Preparing to unpack .../081-libnet-http-perl_6.22-1_all.deb ... 744s Unpacking libnet-http-perl (6.22-1) ... 744s Selecting previously unselected package liblwp-protocol-https-perl. 744s Preparing to unpack .../082-liblwp-protocol-https-perl_6.10-1_all.deb ... 744s Unpacking liblwp-protocol-https-perl (6.10-1) ... 744s Selecting previously unselected package libtry-tiny-perl. 744s Preparing to unpack .../083-libtry-tiny-perl_0.31-1_all.deb ... 744s Unpacking libtry-tiny-perl (0.31-1) ... 744s Selecting previously unselected package libwww-robotrules-perl. 744s Preparing to unpack .../084-libwww-robotrules-perl_6.02-1_all.deb ... 744s Unpacking libwww-robotrules-perl (6.02-1) ... 744s Selecting previously unselected package libwww-perl. 744s Preparing to unpack .../085-libwww-perl_6.61-1_all.deb ... 744s Unpacking libwww-perl (6.61-1) ... 745s Selecting previously unselected package patchutils. 745s Preparing to unpack .../086-patchutils_0.4.2-1build2_ppc64el.deb ... 745s Unpacking patchutils (0.4.2-1build2) ... 745s Selecting previously unselected package wdiff. 745s Preparing to unpack .../087-wdiff_1.2.2-2build3_ppc64el.deb ... 745s Unpacking wdiff (1.2.2-2build3) ... 745s Selecting previously unselected package devscripts. 745s Preparing to unpack .../088-devscripts_2.22.1ubuntu1_ppc64el.deb ... 745s Unpacking devscripts (2.22.1ubuntu1) ... 745s Selecting previously unselected package liberror-perl. 745s Preparing to unpack .../089-liberror-perl_0.17029-1_all.deb ... 745s Unpacking liberror-perl (0.17029-1) ... 745s Selecting previously unselected package git-man. 745s Preparing to unpack .../090-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 745s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 745s Selecting previously unselected package git. 745s Preparing to unpack .../091-git_1%3a2.34.1-1ubuntu1.12_ppc64el.deb ... 745s Unpacking git (1:2.34.1-1ubuntu1.12) ... 745s Selecting previously unselected package python3-dateutil. 745s Preparing to unpack .../092-python3-dateutil_2.8.1-6_all.deb ... 745s Unpacking python3-dateutil (2.8.1-6) ... 745s Selecting previously unselected package git-buildpackage. 745s Preparing to unpack .../093-git-buildpackage_0.9.25_all.deb ... 745s Unpacking git-buildpackage (0.9.25) ... 745s Selecting previously unselected package libexporter-tiny-perl. 745s Preparing to unpack .../094-libexporter-tiny-perl_1.002002-1_all.deb ... 745s Unpacking libexporter-tiny-perl (1.002002-1) ... 745s Selecting previously unselected package liblist-moreutils-xs-perl. 745s Preparing to unpack .../095-liblist-moreutils-xs-perl_0.430-2build2_ppc64el.deb ... 745s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 745s Selecting previously unselected package liblist-moreutils-perl. 745s Preparing to unpack .../096-liblist-moreutils-perl_0.430-2_all.deb ... 745s Unpacking liblist-moreutils-perl (0.430-2) ... 745s Selecting previously unselected package python3-debian. 745s Preparing to unpack .../097-python3-debian_0.1.43ubuntu1.1_all.deb ... 745s Unpacking python3-debian (0.1.43ubuntu1.1) ... 745s Selecting previously unselected package python3-gpg. 745s Preparing to unpack .../098-python3-gpg_1.16.0-1.2ubuntu4.2_ppc64el.deb ... 745s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 745s Selecting previously unselected package dput. 745s Preparing to unpack .../099-dput_1.1.0ubuntu2.1_all.deb ... 745s Unpacking dput (1.1.0ubuntu2.1) ... 745s Selecting previously unselected package libjson-perl. 745s Preparing to unpack .../100-libjson-perl_4.04000-1_all.deb ... 745s Unpacking libjson-perl (4.04000-1) ... 745s Selecting previously unselected package libtext-glob-perl. 745s Preparing to unpack .../101-libtext-glob-perl_0.11-2_all.deb ... 745s Unpacking libtext-glob-perl (0.11-2) ... 745s Selecting previously unselected package libwww-curl-perl. 745s Preparing to unpack .../102-libwww-curl-perl_4.17-7build2_ppc64el.deb ... 745s Unpacking libwww-curl-perl (4.17-7build2) ... 745s Selecting previously unselected package libtext-csv-perl. 745s Preparing to unpack .../103-libtext-csv-perl_2.01-1_all.deb ... 745s Unpacking libtext-csv-perl (2.01-1) ... 745s Selecting previously unselected package dgit. 745s Preparing to unpack .../104-dgit_9.15_all.deb ... 745s Unpacking dgit (9.15) ... 745s Selecting previously unselected package libdbi-perl:ppc64el. 745s Preparing to unpack .../105-libdbi-perl_1.643-3build3_ppc64el.deb ... 745s Unpacking libdbi-perl:ppc64el (1.643-3build3) ... 745s Selecting previously unselected package libdbd-sqlite3-perl:ppc64el. 745s Preparing to unpack .../106-libdbd-sqlite3-perl_1.70-3build1_ppc64el.deb ... 745s Unpacking libdbd-sqlite3-perl:ppc64el (1.70-3build1) ... 745s Selecting previously unselected package sqlite3. 745s Preparing to unpack .../107-sqlite3_3.37.2-2ubuntu0.3_ppc64el.deb ... 745s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 745s Selecting previously unselected package chiark-utils-bin. 745s Preparing to unpack .../108-chiark-utils-bin_6.1.2+nmu1_ppc64el.deb ... 745s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 745s Selecting previously unselected package dgit-infrastructure. 745s Preparing to unpack .../109-dgit-infrastructure_9.15_all.deb ... 745s Unpacking dgit-infrastructure (9.15) ... 745s Selecting previously unselected package libfaketime:ppc64el. 745s Preparing to unpack .../110-libfaketime_0.9.8-9_ppc64el.deb ... 745s Unpacking libfaketime:ppc64el (0.9.8-9) ... 745s Selecting previously unselected package faketime. 745s Preparing to unpack .../111-faketime_0.9.8-9_ppc64el.deb ... 745s Unpacking faketime (0.9.8-9) ... 745s Selecting previously unselected package reprepro. 745s Preparing to unpack .../112-reprepro_5.3.0-1.4_ppc64el.deb ... 745s Unpacking reprepro (5.3.0-1.4) ... 745s Setting up wdiff (1.2.2-2build3) ... 745s Setting up gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 745s Setting up libfile-which-perl (1.23-1) ... 745s Setting up libdynaloader-functions-perl (0.003-1.1) ... 745s Setting up libtext-glob-perl (0.11-2) ... 745s Setting up libclass-method-modifiers-perl (2.13-1) ... 745s Setting up libio-pty-perl (1:1.15-2build2) ... 745s Setting up libarchive-zip-perl (1.68-1) ... 745s Setting up libhtml-tagset-perl (3.20-4) ... 745s Setting up libdebhelper-perl (13.6ubuntu1) ... 745s Setting up liblwp-mediatypes-perl (6.04-1) ... 745s Setting up libtry-tiny-perl (0.31-1) ... 745s Setting up perl-openssl-defaults:ppc64el (5build2) ... 745s Setting up linux-libc-dev:ppc64el (5.15.0-136.147) ... 745s Setting up m4 (1.4.18-5ubuntu2) ... 745s Setting up libwww-curl-perl (4.17-7build2) ... 745s Setting up libencode-locale-perl (1.05-1.1) ... 745s Setting up libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 745s Setting up libfakeroot:ppc64el (1.28-1ubuntu1) ... 745s Setting up libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 745s Setting up chiark-utils-bin (6.1.2+nmu1) ... 745s Setting up fakeroot (1.28-1ubuntu1) ... 745s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 745s Setting up liberror-perl (0.17029-1) ... 745s Setting up patchutils (0.4.2-1build2) ... 745s Setting up autotools-dev (20220109.1) ... 745s Setting up libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 745s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 745s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 746s Setting up python3-debian (0.1.43ubuntu1.1) ... 746s Setting up libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 746s Setting up libmpc3:ppc64el (1.2.1-2build1) ... 746s Setting up libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 746s Setting up libio-html-perl (1.004-2) ... 746s Setting up autopoint (0.21-4ubuntu4) ... 746s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 746s Setting up libipc-run-perl (20200505.0-1) ... 746s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 746s Setting up autoconf (2.71-2) ... 746s Setting up libtimedate-perl (2.3300-2) ... 746s Setting up libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 746s Setting up dwz (0.14-1build2) ... 746s Setting up libnsl-dev:ppc64el (1.3.0-2build2) ... 746s Setting up libcrypt-dev:ppc64el (1:4.4.27-1) ... 746s Setting up libjson-perl (4.04000-1) ... 746s Setting up librole-tiny-perl (2.002004-1) ... 746s Setting up debugedit (1:5.0-4build1) ... 746s Setting up libsub-override-perl (0.09-2) ... 746s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 746s Setting up python3-dateutil (2.8.1-6) ... 746s Setting up libsub-quote-perl (2.006006-1) ... 746s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 746s Setting up libexporter-tiny-perl (1.002002-1) ... 746s Setting up libfile-dirlist-perl (0.05-2) ... 746s Setting up libisl23:ppc64el (0.24-2build1) ... 746s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 746s Setting up reprepro (5.3.0-1.4) ... 746s Setting up libfile-homedir-perl (1.006-1) ... 746s Setting up libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 746s Setting up liburi-perl (5.10-1) ... 746s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 746s Setting up libfile-touch-perl (0.12-1) ... 746s Setting up libdbi-perl:ppc64el (1.643-3build3) ... 746s Setting up liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 746s Setting up libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 746s Setting up libfaketime:ppc64el (0.9.8-9) ... 746s Setting up libtext-csv-perl (2.01-1) ... 746s Setting up libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 746s Setting up libnet-ssleay-perl:ppc64el (1.92-1build2) ... 746s Setting up automake (1:1.16.5-1.3) ... 746s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 746s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 746s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 746s Setting up faketime (0.9.8-9) ... 746s Setting up libhttp-date-perl (6.05-1) ... 746s Setting up gettext (0.21-4ubuntu4) ... 746s Setting up libfile-listing-perl (6.14-1) ... 746s Setting up liblist-moreutils-perl (0.430-2) ... 746s Setting up libnet-http-perl (6.22-1) ... 746s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 746s Setting up dput (1.1.0ubuntu2.1) ... 746s Setting up intltool-debian (0.35.0+20060710.5) ... 746s Setting up git (1:2.34.1-1ubuntu1.12) ... 746s Setting up dh-strip-nondeterminism (1.13.0-1) ... 746s Setting up libwww-robotrules-perl (6.02-1) ... 746s Setting up libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 746s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 746s Setting up cpp (4:11.2.0-1ubuntu1) ... 746s Setting up libhtml-parser-perl:ppc64el (3.76-1build2) ... 746s Setting up libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 746s Setting up libdbd-sqlite3-perl:ppc64el (1.70-3build1) ... 746s Setting up libio-socket-ssl-perl (2.074-2) ... 746s Setting up libhttp-message-perl (6.36-1) ... 746s Setting up libhttp-negotiate-perl (6.01-1) ... 746s Setting up libhttp-cookies-perl (6.10-1) ... 746s Setting up libtool (2.4.6-15build2) ... 746s Setting up po-debconf (1.0.21+nmu1) ... 746s Setting up libhtml-tree-perl (5.07-2) ... 746s Setting up libparams-classify-perl (0.015-1build5) ... 746s Setting up gcc (4:11.2.0-1ubuntu1) ... 746s Setting up dh-autoreconf (20) ... 746s Setting up libmodule-runtime-perl (0.016-1) ... 746s Setting up libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 746s Setting up dgit-infrastructure (9.15) ... 746s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 746s Setting up libimport-into-perl (1.002005-1) ... 746s Setting up libmoo-perl (2.005004-3) ... 746s Setting up debhelper (13.6ubuntu1) ... 746s Setting up g++ (4:11.2.0-1ubuntu1) ... 746s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 746s Setting up build-essential (12.9ubuntu3) ... 746s Setting up liblwp-protocol-https-perl (6.10-1) ... 746s Setting up libwww-perl (6.61-1) ... 746s Setting up devscripts (2.22.1ubuntu1) ... 746s Setting up git-buildpackage (0.9.25) ... 746s Setting up dgit (9.15) ... 746s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 746s Processing triggers for man-db (2.10.2-1) ... 747s Processing triggers for install-info (6.8-4build1) ... 750s autopkgtest [22:59:40]: test clone-reprepro: [----------------------- 750s ++ set -o pipefail 750s ++ . tests/lib-core 750s ++ . tests/lib-restricts 750s ++ trap ' 750s rc=$? 750s set +x 750s test $rc = 0 || echo " 750s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 750s 750s Most relevant logs are just before assignment rc=$rc 750s Will now do cleanup etc. 750s " 750s set -x 750s set +e 750s pwd 750s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 750s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 750s set -e 750s test $rc = 0 || t-report-failure 750s ' EXIT 750s ++ t-filter-out-git-hyphen-dir 750s ++ local pathent 750s +++ type -p git-rev-parse 750s +++ : 750s ++ pathent= 750s ++ case "$pathent" in 750s ++ return 750s ++ t-set-intree 750s ++ '[' x = x ']' 750s ++ return 750s ++ : -D 750s ++ export DGIT_TEST_DEBUG 750s ++ : x 750s ++ export DGIT_TEST_DEBPUSH_DEBUG 750s ++ : 750s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 750s ++ GIT_COMMITTER_DATE='1530000000 +0100' 750s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 750s ++ GIT_AUTHOR_DATE='1530000000 +0100' 750s ++ export LC_CTYPE=C.UTF-8 750s ++ LC_CTYPE=C.UTF-8 750s ++ unset CDPATH 750s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 750s ++ FILTER_BRANCH_SQUELCH_WARNING=1 750s +++ pwd 750s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 750s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 750s ++ testname=clone-reprepro 750s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 750s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 750s ++ bpd=.. 750s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 750s ++ '[' x '!=' x ']' 750s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s +++ pwd 750s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ t-set-using-tmp 750s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 750s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 750s ++ export 'DEBFULLNAME=dgit test git user' 750s ++ DEBFULLNAME='dgit test git user' 750s ++ git config --global user.email dgit-test@debian.example.net 750s ++ git config --global user.name 'dgit test git user' 750s ++ git config --global protocol.ext.allow always 750s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 750s ++ env -0 750s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 750s ++ export DEBCHANGE_VENDOR=dpkg 750s ++ DEBCHANGE_VENDOR=dpkg 750s ++ unset VISUAL 750s ++ unset GIT_EDITOR 750s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 750s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 750s ++ cat 750s ++ schroot=build 750s ++ : aq 750s ++ : archive/test-dummy 750s ++ : sid:unstable 750s ++ t-git-config dgit.default.old-dsc-distro test-dummy 750s ++ git config --global dgit.default.old-dsc-distro test-dummy 750s ++ for import in ${autoimport-gnupg} 750s ++ case "$0" in 750s ++ t-setup-import gnupg 750s ++ local setupname=gnupg 750s ++ local setupsrc 750s ++ local lock 750s ++ '[' x = x ']' 750s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 750s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 750s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 750s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 750s cd "$1"; shift 750s setupname="$1"; shift 750s simport="$1"; shift 750s if [ -e "$simport" ]; then exit 0; fi 750s env - "$@" \ 750s "tests/setup/$setupname" 750s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 750s + cd /tmp/autopkgtest.XK8uun/build.980/src 750s + shift 750s + setupname=gnupg 750s + shift 750s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 750s + shift 750s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 750s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/clone-reprepro-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/clone-reprepro-stderr --stdout=/tmp/autopkgtest.XK8uun/clone-reprepro-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/clone-reprepro -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/clone-reprepro' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/clone-reprepro-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 750s ++ set -o pipefail 750s ++ . tests/lib-core 750s ++ . tests/lib-restricts 750s ++ trap ' 750s rc=$? 750s set +x 750s test $rc = 0 || echo " 750s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 750s 750s Most relevant logs are just before assignment rc=$rc 750s Will now do cleanup etc. 750s " 750s set -x 750s set +e 750s pwd 750s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 750s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 750s set -e 750s test $rc = 0 || t-report-failure 750s ' EXIT 750s ++ t-filter-out-git-hyphen-dir 750s ++ local pathent 750s +++ type -p git-rev-parse 750s +++ : 750s ++ pathent= 750s ++ case "$pathent" in 750s ++ return 750s ++ t-set-intree 750s ++ '[' x = x ']' 750s ++ return 750s ++ : -D 750s ++ export DGIT_TEST_DEBUG 750s ++ : x 750s ++ export DGIT_TEST_DEBPUSH_DEBUG 750s ++ : 750s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 750s ++ GIT_COMMITTER_DATE='1530000000 +0100' 750s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 750s ++ GIT_AUTHOR_DATE='1530000000 +0100' 750s ++ export LC_CTYPE=C.UTF-8 750s ++ LC_CTYPE=C.UTF-8 750s ++ unset CDPATH 750s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 750s ++ FILTER_BRANCH_SQUELCH_WARNING=1 750s +++ pwd 750s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 750s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 750s ++ testname=gnupg 750s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 750s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 750s ++ bpd=.. 750s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 750s ++ '[' x '!=' x ']' 750s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s +++ pwd 750s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ t-set-using-tmp 750s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 750s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 750s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 750s ++ export 'DEBFULLNAME=dgit test git user' 750s ++ DEBFULLNAME='dgit test git user' 750s ++ git config --global user.email dgit-test@debian.example.net 750s ++ git config --global user.name 'dgit test git user' 750s ++ git config --global protocol.ext.allow always 750s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 750s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 750s ++ export DEBCHANGE_VENDOR=dpkg 750s ++ DEBCHANGE_VENDOR=dpkg 750s ++ unset VISUAL 750s ++ unset GIT_EDITOR 750s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 750s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 750s ++ cat 750s ++ schroot=build 750s ++ : aq 750s ++ : archive/test-dummy 750s ++ : sid:unstable 750s ++ t-git-config dgit.default.old-dsc-distro test-dummy 750s ++ git config --global dgit.default.old-dsc-distro test-dummy 750s ++ for import in ${autoimport-gnupg} 750s ++ case "$0" in 750s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 750s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 750s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 750s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 750s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 750s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 750s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 750s + setup=' 750s export GNUPGHOME=$tmp/gnupg 750s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 750s 750s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 750s ssb rsa2048 2013-11-17 [E] 750s 750s sec rsa2048 2014-01-26 [SC] 750s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 750s uid [ultimate] Populus Romanus (test key) 750s ssb rsa2048 2014-01-26 [E] 750s 750s sec rsa2048 2014-01-26 [SC] 750s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 750s uid [ unknown] Hannibal (test key) 750s ssb rsa2048 2014-01-26 [E] 750s 750s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 750s export GNUPGHOME=$tmp/gnupg 750s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 750s 750s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < `0' 752s + git init -q 752s | git config -z --get-regexp --local '.*' 752s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 752s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 752s + git config user.name 'dgit test git user' 752s is_gitattrs_setup: found nothing 752s starting new git history 752s + git config remote.dgit.skipdefaultupdate true 752s | apt-cache -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' showsrc example 752s => `Package: example'... 752s + sh -ec 'cd "$1"/source; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget apt-get -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' --download-only --only-source source example 752s Reading package lists... 752s Need to get 0 B/2908 B of source archives. 752s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror unstable/main example 1.0-1 (dsc) [999 B] 752s Get:2 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror unstable/main example 1.0-1 (tar) [236 B] 752s Get:3 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror unstable/main example 1.0-1 (tar) [373 B] 752s Get:4 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror unstable/main example 1.0-1 (diff) [1300 B] 752s Download complete and in download only mode 752s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.0-1.dsc... 752s get_archive_dsc: Version 1.0-1 752s last upload to archive: NO git hash 752s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 752s => `' 752s previous reference hash= 752s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 752s => `' 752s fetch_from_archive: lastfetch= 752s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 752s considering reusing example_1.0.orig-docs.tar.gz: (No such file or directory) (No such file or directory) absent. 752s ./example_1.0.orig-docs.tar.gz does not exist, need to fetch 752s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig-docs.tar.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.0.orig-docs.tar.gz 752s % Total % Received % Xferd Average Speed Time Time Time Current 752s Dload Upload Total Spent Left Speed 752s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 236 100 236 0 0 2776k 0 --:--:-- --:--:-- --:--:-- 2776k 752s considering saving example_1.0.orig-docs.tar.gz: linked. 752s considering reusing example_1.0.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 752s ./example_1.0.orig.tar.gz does not exist, need to fetch 752s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig.tar.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.0.orig.tar.gz 752s % Total % Received % Xferd Average Speed Time Time Time Current 752s Dload Upload Total Spent Left Speed 752s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 373 100 373 0 0 4442k 0 --:--:-- --:--:-- --:--:-- 4442k 752s considering saving example_1.0.orig.tar.gz: linked. 752s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) (No such file or directory) absent. 752s ./example_1.0-1.debian.tar.xz does not exist, need to fetch 752s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0-1.debian.tar.xz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.0-1.debian.tar.xz 752s % Total % Received % Xferd Average Speed Time Time Time Current 752s Dload Upload Total Spent Left Speed 752s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 1300 100 1300 0 0 18.2M 0 --:--:-- --:--:-- --:--:-- 18.2M 752s considering saving example_1.0-1.debian.tar.xz: linked. 752s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 752s + chmod -R '+rwX' _unpack-tar 752s CD _unpack-tar 752s | find -name .git -prune -print0 752s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 752s + git add -Af . 752s | git write-tree 752s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 752s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 752s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 752s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 752s CD .. 752s import considering example_1.0.orig.tar.gz Y .gz orig 752s + chmod -R '+rwX' _unpack-tar 752s CD _unpack-tar 752s | find -name .git -prune -print0 752s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 752s + git add -Af . 752s | git write-tree 752s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 752s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 752s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 752s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 752s CD .. 752s import considering example_1.0-1.debian.tar.xz Y .xz (none) 752s + chmod -R '+rwX' _unpack-tar 752s CD _unpack-tar 752s | find -name .git -prune -print0 752s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 752s + git add -Af . 752s | git write-tree 752s => `2e32e7dba6662d7204cb623f0685496d9e18ed39' 752s | git ls-tree -z 2e32e7dba6662d7204cb623f0685496d9e18ed39 752s => `040000 tree 4fdcc744fa631b40c7178eee72a6f59c8ca72600\x09debian\x00' 752s one subtree 4fdcc744fa631b40c7178eee72a6f59c8ca72600 752s CD .. 752s + dpkg-source --skip-patches -x -- example.dsc 752s dpkg-source: warning: extracting unsigned source package (example.dsc) 752s dpkg-source: info: extracting example in example-1.0 752s dpkg-source: info: unpacking example_1.0.orig.tar.gz 752s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 752s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 752s CD example-1.0 752s | find -name .git -prune -print0 752s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 752s + git add -Af . 752s | git write-tree 752s => `faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4' 752s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 752s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 752s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 752s + 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 753s | git rev-parse 'HEAD~0' 753s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 753s | git rev-parse HEAD: 753s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 753s synthesised git commit from .dsc 1.0-1 753s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 753s fetch mergeinfos: 753s commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 Import of source package 753s fetch hash=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s | git log -n2 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s => `commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6'... 753s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s => `' 753s + git reset --hard refs/remotes/dgit/dgit/sid 753s HEAD is now at 9af62d3 Update .gitignore from Debian packaging branch 753s + bash -ec ' set -o pipefail 753s git ls-tree -r --name-only -z HEAD | '\\' 753s xargs -0r touch -h -r . -- 753s ' 753s dgit ok: ready for work in example 753s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 753s del_lrfetchrefs... 753s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 753s ' 753s + cd example 753s + t-cloned-fetched-good 753s + t-diff-nogit ../extract/example-1.0 . 753s + diff --exclude=.git --exclude=.pc -ruN ../extract/example-1.0 . 753s + t-clean-on-branch dgit/sid 753s + t-output '## dgit/sid' git status -b --porcelain 753s + printf '%s\n' '## dgit/sid' 753s + shift 753s + git status -b --porcelain 753s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 753s + t-refs-same-start 753s + unset t_ref_val 753s + t_ref_names=() 753s + t-refs-same refs/heads/dgit/sid refs/remotes/dgit/dgit/sid 753s + local g 753s + for g in $* 753s + t-ref-same refs/heads/dgit/sid 753s + local name=refs/heads/dgit/sid 753s + local val 753s ++ t-git-get-ref refs/heads/dgit/sid 753s ++ local ref=refs/heads/dgit/sid 753s ++ case "$ref" in 753s ++ git show-ref -d refs/heads/dgit/sid 753s ++ perl -ne ' 753s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 753s END { print "$x\n" if length $x; } 753s ' 753s + val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s + t-ref-same-val refs/heads/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s + local name=refs/heads/dgit/sid 753s + local val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s + case "${t_ref_val-unset}" in 753s + t_ref_val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s + t_ref_names+=("$name") 753s + for g in $* 753s + t-ref-same refs/remotes/dgit/dgit/sid 753s + local name=refs/remotes/dgit/dgit/sid 753s + local val 753s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 753s ++ local ref=refs/remotes/dgit/dgit/sid 753s ++ case "$ref" in 753s ++ git show-ref -d refs/remotes/dgit/dgit/sid 753s ++ perl -ne ' 753s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 753s END { print "$x\n" if length $x; } 753s ' 753s + val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s + t-ref-same-val refs/remotes/dgit/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s + local name=refs/remotes/dgit/dgit/sid 753s + local val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s + case "${t_ref_val-unset}" in 753s + t_ref_val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s + t_ref_names+=("$name") 753s + t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable 753s + local val 753s + for g in $* 753s ++ t-git-get-ref refs/dgit/unstable 753s ++ local ref=refs/dgit/unstable 753s ++ case "$ref" in 753s ++ git show-ref -d refs/dgit/unstable 753s ++ perl -ne ' 753s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 753s END { print "$x\n" if length $x; } 753s ' 753s ++ test 1 = 1 753s + val= 753s + '[' x '!=' x ']' 753s + for g in $* 753s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 753s ++ local ref=refs/remotes/dgit/dgit/unstable 753s ++ case "$ref" in 753s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 753s ++ perl -ne ' 753s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 753s END { print "$x\n" if length $x; } 753s ' 753s ++ test 1 = 1 753s + val= 753s + '[' x '!=' x ']' 753s + add_pari 753s + local p 753s + local v 753s + local suite=stable 753s + t-archive pari-extra 3-1 753s + t-archive-none pari-extra 753s + t-select-package pari-extra 753s + p=pari-extra 753s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 753s + t-archive-none-reprepro 753s + t-reprepro-setup 753s + local rrinst= 753s + local mir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror 753s + local rrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/conf 753s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/conf 753s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 753s + exec 753s + local arch 753s ++ dpkg --print-architecture 753s + arch=ppc64el 753s + for suitespec in $suitespecs 753s + local suite=sid 753s + local sname=unstable 753s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/dists 753s + '[' unstable '!=' sid ']' 753s + rm -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/dists/unstable 753s + ln -s sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/dists/unstable 753s + cat 753s + for suitespec in $suitespecs 753s + local suite=stable 753s + local sname=stable 753s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/dists 753s + '[' stable '!=' stable ']' 753s + cat 753s + t-reprepro-regen 753s + local rrinst= 753s + t-reprepro--run export 753s + local mir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror 753s + reprepro --outdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror --basedir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror export 753s + local rrinst= 753s + v=3-1 753s + local dscf=pari-extra_3-1.dsc 753s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/pari-extra_*' 753s + ln -s /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-1.diff.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 753s + t-archive-query stable 753s + local suite=stable 753s + local dscf=main/pari-extra_3-1.dsc 753s + t-archive-query-reprepro stable pari-extra 3-1 main/pari-extra_3-1.dsc 753s + local suite=stable 753s + local p=pari-extra 753s + local v=3-1 753s + local dscf=main/pari-extra_3-1.dsc 753s + local rrinst= 753s + t-reprepro-includedsc stable /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/pari-extra_3-1.dsc '' 753s + local suite=stable 753s + local dscf=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/pari-extra_3-1.dsc 753s + local rrinst= 753s + t-reprepro--run includedsc stable /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/pari-extra_3-1.dsc 753s + local mir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror 753s + reprepro --outdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror --basedir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror includedsc stable /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/pari-extra_3-1.dsc 753s Exporting indices... 753s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 753s + mkdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 753s + set -e 753s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 753s + dpkg-source -x ../mirror/pool/main/pari-extra_3-1.dsc 753s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/pari-extra_3-1.dsc) 753s dpkg-source: info: extracting pari-extra in pari-extra-3 753s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 753s dpkg-source: info: applying pari-extra_3-1.diff.gz 753s + t-dgit fetch unstable,stable 753s + local dgit=dgit 753s + pwd 753s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 753s + : ' 753s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 753s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch unstable,stable 753s | git rev-parse --show-toplevel 753s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 753s | git config -z --get-regexp --local '.*' 753s | git config -z --get-regexp --local '.*' 753s | git config -z --get-regexp --global '.*' 753s | git config -z --get-regexp --system '.*' 753s fork_for_multisuite: unstable stable 753s fetching unstable... 753s + sh -ec 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget 753s + apt-get -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' update 753s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror unstable InRelease [2103 B] 753s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror unstable InRelease [2103 B] 753s Reading package lists... 753s W: file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/dists/unstable/InRelease: Key is stored in legacy trusted.gpg keyring (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/etc-apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details. 753s release file Codename: sid 753s canonical suite name for unstable is sid 753s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 753s => `0' 753s | apt-cache -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' showsrc example 753s => `Package: example'... 753s + sh -ec 'cd "$1"/source; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget apt-get -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' --download-only --only-source source example 753s Reading package lists... 753s Skipping already downloaded file 'example_1.0.orig-docs.tar.gz' 753s Skipping already downloaded file 'example_1.0.orig.tar.gz' 753s Skipping already downloaded file 'example_1.0-1.debian.tar.xz' 753s Need to get 0 B/999 B of source archives. 753s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror unstable/main example 1.0-1 (dsc) [999 B] 753s Download complete and in download only mode 753s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.0-1.dsc... 753s get_archive_dsc: Version 1.0-1 753s last upload to archive: NO git hash 753s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 753s => `' 753s previous reference hash= 753s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 753s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 753s fetch_from_archive: lastfetch=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 753s considering reusing example_1.0.orig-docs.tar.gz: (No such file or directory) linked. 753s using existing example_1.0.orig-docs.tar.gz 753s considering saving example_1.0.orig-docs.tar.gz: (File exists) no need. 753s considering reusing example_1.0.orig.tar.gz: (No such file or directory) linked. 753s using existing example_1.0.orig.tar.gz 753s considering saving example_1.0.orig.tar.gz: (File exists) no need. 753s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) linked. 753s using existing example_1.0-1.debian.tar.xz 753s considering saving example_1.0-1.debian.tar.xz: (File exists) no need. 753s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 753s + chmod -R '+rwX' _unpack-tar 753s CD _unpack-tar 753s | find -name .git -prune -print0 753s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 753s + git add -Af . 753s | git write-tree 753s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 753s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 753s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 753s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 753s CD .. 753s import considering example_1.0.orig.tar.gz Y .gz orig 753s + chmod -R '+rwX' _unpack-tar 753s CD _unpack-tar 753s | find -name .git -prune -print0 753s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 753s + git add -Af . 753s | git write-tree 753s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 753s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 753s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 753s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 753s CD .. 753s import considering example_1.0-1.debian.tar.xz Y .xz (none) 753s + chmod -R '+rwX' _unpack-tar 753s CD _unpack-tar 753s | find -name .git -prune -print0 753s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 753s + git add -Af . 753s | git write-tree 753s => `2e32e7dba6662d7204cb623f0685496d9e18ed39' 753s | git ls-tree -z 2e32e7dba6662d7204cb623f0685496d9e18ed39 753s => `040000 tree 4fdcc744fa631b40c7178eee72a6f59c8ca72600\x09debian\x00' 753s one subtree 4fdcc744fa631b40c7178eee72a6f59c8ca72600 753s CD .. 753s + dpkg-source --skip-patches -x -- example.dsc 754s dpkg-source: warning: extracting unsigned source package (example.dsc) 754s dpkg-source: info: extracting example in example-1.0 754s dpkg-source: info: unpacking example_1.0.orig.tar.gz 754s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 754s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 754s CD example-1.0 754s | find -name .git -prune -print0 754s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 754s + git add -Af . 754s | git write-tree 754s => `faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4' 754s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 754s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 754s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 754s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 754s + git add -Af . 754s | git write-tree 754s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 754s import clog search... 754s | dpkg-parsechangelog --format rfc822 --all 754s import clog 1.0-1 package changelog, entry no.1... 754s import clog 1.0-1 vs 1.0... 754s import clog 1.0-1 becomes r1 754s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 754s => `1431548802 +0000' 754s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 754s => `1431548802 +0000' 754s import tartrees authline Ian Jackson 1431548802 +0000 754s import tartrees r1authline Ian Jackson 1431548802 +0000 754s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 754s | git hash-object -w -t commit --stdin 754s => 94c010931d011cbd6c1861bb9d453aa12d826298 754s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 754s | git hash-object -w -t commit --stdin 754s => a5bb1f49c872a76a5d703570fd5352e424719bda 754s import tartree example_1.0-1.debian.tar.xz 4fdcc744fa631b40c7178eee72a6f59c8ca72600 754s | git hash-object -w -t commit --stdin 754s => c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 754s import main commit 754s | git hash-object -w -t commit ../commit.tmp 754s => `1d9c1ab6696b5b0b297493e1cce63577b4834b04' 754s import apply patches... 754s | git hash-object -w -t commit --stdin 754s => 8a6a176760396ad6e2e096974469aa6cf7671956 754s + git checkout -q -b dapplied 8a6a176760396ad6e2e096974469aa6cf7671956 754s + git checkout -q -b unpa 1d9c1ab6696b5b0b297493e1cce63577b4834b04 754s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 754s => `1431548802 +0000' 754s + git checkout -q unpa 754s + git update-ref -d refs/heads/patch-queue/unpa 754s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 754s | git rev-parse 'HEAD~0' 754s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 754s | git rev-parse HEAD: 754s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 754s synthesised git commit from .dsc 1.0-1 754s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 754s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6:debian/changelog 754s | git merge-base 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 754s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 754s | git rev-parse '9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6~0' 754s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 754s | git rev-parse '9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6~0' 754s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 754s fetch mergeinfos: 754s commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 dgit client's archive history view 754s fetch hash=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 754s | git merge-base 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 754s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 754s | git rev-parse '9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6~0' 754s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 754s | git rev-parse '9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6~0' 754s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 754s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 754s | git log -n2 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 754s => `commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6'... 754s dgit [unstable] ok: fetched into refs/remotes/dgit/dgit/sid 754s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 754s del_lrfetchrefs... 754s multisuite unstable ok (canon=sid) 754s fetching stable... 754s + sh -ec 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget 754s + apt-get -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' update 754s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror stable InRelease [2104 B] 754s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror stable InRelease [2104 B] 754s Get:2 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror stable/main Sources [572 B] 754s Reading package lists... 754s W: file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/dists/stable/InRelease: Key is stored in legacy trusted.gpg keyring (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/etc-apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details. 754s release file Codename: stable 754s canonical suite name is stable 754s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 754s => `0' 754s | apt-cache -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' showsrc example 754s W: Unable to locate package example 754s => `' 754s get_archive_dsc: nothing in archive, returning undef 754s no version available from the archive 754s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/stable' 754s => `' 754s previous reference hash= 754s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/stable' 754s => `' 754s fetch_from_archive: lastfetch= 754s nothing found! 754s dgit [stable]: source package example does not exist in suite stable 754s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 754s del_lrfetchrefs... 754s multisuite stable missing 754s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 754s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 754s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid,stable' 754s => `' 754s multisuite merge check sid 754s multisuite merge this-needed 754s + git update-ref -m 'dgit fetch sid,stable' DGIT_ARCHIVE 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 754s | git log -n2 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 754s => `commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6'... 754s | git update-ref -m 'dgit fetch' 'refs/remotes/dgit/dgit/sid,stable' 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 754s => `' 754s calculated combined tracking suite sid,stable 754s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 754s ' 754s + t-refs-same-start 754s + unset t_ref_val 754s + t_ref_names=() 754s + t-refs-same refs/remotes/dgit/sid,stable refs/remotes/dgit/sid 754s + local g 754s + for g in $* 754s + t-ref-same refs/remotes/dgit/sid,stable 754s + local name=refs/remotes/dgit/sid,stable 754s + local val 754s ++ t-git-get-ref refs/remotes/dgit/sid,stable 754s ++ local ref=refs/remotes/dgit/sid,stable 754s ++ case "$ref" in 754s ++ perl -ne ' 754s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/sid,stable\E(?:\^\{\})?$#; 754s END { print "$x\n" if length $x; } 754s ' 754s ++ git show-ref -d refs/remotes/dgit/sid,stable 754s ++ test 1 = 1 754s + val= 754s + t-ref-same-val refs/remotes/dgit/sid,stable 754s + local name=refs/remotes/dgit/sid,stable 754s + local val= 754s + case "${t_ref_val-unset}" in 754s + t_ref_val= 754s + t_ref_names+=("$name") 754s + for g in $* 754s + t-ref-same refs/remotes/dgit/sid 754s + local name=refs/remotes/dgit/sid 754s + local val 754s ++ t-git-get-ref refs/remotes/dgit/sid 754s ++ local ref=refs/remotes/dgit/sid 754s ++ case "$ref" in 754s ++ git show-ref -d refs/remotes/dgit/sid 754s ++ perl -ne ' 754s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/sid\E(?:\^\{\})?$#; 754s END { print "$x\n" if length $x; } 754s ' 754s ++ test 1 = 1 754s + val= 754s + t-ref-same-val refs/remotes/dgit/sid 754s + local name=refs/remotes/dgit/sid 754s + local val= 754s + case "${t_ref_val-unset}" in 754s + t_ref_val= 754s + t_ref_names+=("$name") 754s + t-ok 754s + : ======================================== 754s + t-check-only-bpd 754s + '[' .. = .. ']' 754s + return 754s + t-fscks 754s + shopt -s nullglob 754s + for d in $tmp/*/.git $tmp/git/*.git 754s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 754s + t-git-fsck 754s ++ git rev-parse --git-dir 754s + local fsckerrs=.git/dgit-test-fsck.errs 754s + set +e 754s + tee .git/dgit-test-fsck.errs 754s + LC_MESSAGES=C 754s + git fsck --no-dangling --strict 754s + ps='0 0' 754s + set -e 754s + local pats 754s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 754s + test '0 0' = '0 0' 754s + pats+=(-e 'notice: HEAD points to an unborn branch') 754s + pats+=(-e 'notice: No default references') 754s + set +e 754s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 754s + rc=1 754s + set -e 754s + case $rc in 754s + t-save-artifacts 754s + artifacts=/tmp/autopkgtest.XK8uun/clone-reprepro-artifacts 754s + '[' x/tmp/autopkgtest.XK8uun/clone-reprepro-artifacts = x ']' 754s + '[' xtmp = x ']' 754s + GZIP=-1v 754s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/clone-reprepro-artifacts/clone-reprepro.tar.gz '--exclude=*.tar' . 754s gzip: warning: GZIP environment variable is deprecated; use an alias or script 754s 92.6% 754s + echo ok. 754s ok. 754s + rc=0 754s + set +x 754s + set +e 754s + pwd 754s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 754s + '[' x '!=' x ']' 754s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 754s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 754s + set -e 754s + test 0 = 0 754s autopkgtest [22:59:44]: test clone-reprepro: -----------------------] 755s clone-reprepro PASS 755s autopkgtest [22:59:45]: test clone-reprepro: - - - - - - - - - - results - - - - - - - - - - 756s autopkgtest [22:59:46]: test downstream-gitless: preparing testbed 756s Reading package lists... 756s Building dependency tree... 756s Reading state information... 756s Starting pkgProblemResolver with broken count: 0 756s Starting 2 pkgProblemResolver with broken count: 0 756s Done 756s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 757s autopkgtest [22:59:47]: test downstream-gitless: [----------------------- 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.XK8uun/build.980/src 757s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 757s ++ testname=downstream-gitless 757s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 757s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 757s ++ bpd=.. 757s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 757s ++ '[' x '!=' x ']' 757s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s +++ pwd 757s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ t-set-using-tmp 757s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 757s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/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.XK8uun/autopkgtest_tmp/.save-env 757s ++ env -0 757s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/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.XK8uun/autopkgtest_tmp/must-clean 757s ++ mkdir -p /tmp/autopkgtest.XK8uun/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 ++ for import in ${autoimport-gnupg} 757s ++ case "$0" in 757s ++ t-setup-import gnupg 757s ++ local setupname=gnupg 757s ++ local setupsrc 757s ++ local lock 757s ++ '[' x = x ']' 757s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 757s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 757s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 757s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 757s cd "$1"; shift 757s setupname="$1"; shift 757s simport="$1"; shift 757s if [ -e "$simport" ]; then exit 0; fi 757s env - "$@" \ 757s "tests/setup/$setupname" 757s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 757s + cd /tmp/autopkgtest.XK8uun/build.980/src 757s + shift 757s + setupname=gnupg 757s + shift 757s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 757s + shift 757s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 757s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/downstream-gitless-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/downstream-gitless-stderr --stdout=/tmp/autopkgtest.XK8uun/downstream-gitless-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/downstream-gitless -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/downstream-gitless' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/downstream-gitless-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 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.XK8uun/build.980/src 757s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 757s ++ testname=gnupg 757s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 757s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 757s ++ bpd=.. 757s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 757s ++ '[' x '!=' x ']' 757s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s +++ pwd 757s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ t-set-using-tmp 757s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 757s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 757s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/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.XK8uun/autopkgtest_tmp/.save-env 757s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/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.XK8uun/autopkgtest_tmp/must-clean 757s ++ mkdir -p /tmp/autopkgtest.XK8uun/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 ++ for import in ${autoimport-gnupg} 757s ++ case "$0" in 757s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 757s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 757s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 757s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 757s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 757s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 757s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 757s + setup=' 757s export GNUPGHOME=$tmp/gnupg 757s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 757s 757s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 758s ssb rsa2048 2013-11-17 [E] 758s 758s sec rsa2048 2014-01-26 [SC] 758s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 758s uid [ultimate] Populus Romanus (test key) 758s ssb rsa2048 2014-01-26 [E] 758s 758s sec rsa2048 2014-01-26 [SC] 758s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 758s uid [ unknown] Hannibal (test key) 758s ssb rsa2048 2014-01-26 [E] 758s 758s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 758s export GNUPGHOME=$tmp/gnupg 758s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 758s 758s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 758s "sha256sum" => "$2", 758s "component" => "$3", 758s "filename" => "$4", 758s }; 758s END { 758s my $json = JSON->new->canonical(); 758s print $json->encode(\@v) or die $!; 758s } 758s ' 758s + t-aq-archive-updated new example 758s + local suite=new 758s + local p=example 758s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 758s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 758s + perl -wne ' 758s use JSON; 758s use strict; 758s our @v; 758s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 758s push @v, { 758s "version" => "$1", 758s "sha256sum" => "$2", 758s "component" => "$3", 758s "filename" => "$4", 758s }; 758s END { 758s my $json = JSON->new->canonical(); 758s print $json->encode(\@v) or die $!; 758s } 758s ' 758s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 758s + cat 758s + jsondelim=' },' 758s + for suitespec in $suitespecs 758s + local suite=stable 758s + local sname=stable 758s + t-aq-archive-updated stable example 758s + local suite=stable 758s + local p=example 758s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 758s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 758s + perl -wne ' 758s use JSON; 758s use strict; 758s our @v; 758s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 758s push @v, { 758s "version" => "$1", 758s "sha256sum" => "$2", 758s "component" => "$3", 758s "filename" => "$4", 758s }; 758s END { 758s my $json = JSON->new->canonical(); 758s print $json->encode(\@v) or die $!; 758s } 758s ' 758s + t-aq-archive-updated new example 758s + local suite=new 758s + local p=example 758s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 758s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 758s + perl -wne ' 758s use JSON; 758s use strict; 758s our @v; 758s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 758s push @v, { 758s "version" => "$1", 758s "sha256sum" => "$2", 758s "component" => "$3", 758s "filename" => "$4", 758s }; 758s END { 758s my $json = JSON->new->canonical(); 758s print $json->encode(\@v) or die $!; 758s } 758s ' 758s + ln -sf stable /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 758s + cat 758s + jsondelim=' },' 758s + for suitespec in $suitespecs 758s + local suite=testing 758s + local sname=testing 758s + t-aq-archive-updated testing example 758s + local suite=testing 758s + local p=example 758s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/testing 758s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/testing 758s + perl -wne ' 758s use JSON; 758s use strict; 758s our @v; 758s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 758s push @v, { 758s "version" => "$1", 758s "sha256sum" => "$2", 758s "component" => "$3", 758s "filename" => "$4", 758s }; 758s END { 758s my $json = JSON->new->canonical(); 758s print $json->encode(\@v) or die $!; 758s } 758s ' 758s + t-aq-archive-updated new example 758s + local suite=new 758s + local p=example 758s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 758s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 758s + perl -wne ' 758s use JSON; 758s use strict; 758s our @v; 758s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 758s push @v, { 758s "version" => "$1", 758s "sha256sum" => "$2", 758s "component" => "$3", 758s "filename" => "$4", 758s }; 758s END { 758s my $json = JSON->new->canonical(); 758s print $json->encode(\@v) or die $!; 758s } 758s ' 758s + ln -sf testing /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/testing 758s + cat 758s + jsondelim=' },' 758s + cat 758s + t-git-none 758s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 758s + set -e 758s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 758s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 758s + t-worktree 1.0 758s + rm -rf example 758s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0 758s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.tar 758s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.edit 758s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.edit 758s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.tar 758s + cd example 758s + git show-ref --verify --quiet refs/heads/master 758s + cd .. 758s + cd example 758s + revision=1 758s + echo ancestor 758s + git add which 758s + t-commit Ancestor '' stable 758s + local msg=Ancestor 758s + v=1.1 758s + t-debchange --force-distribution -v1.1 --distribution stable Ancestor 758s + DEBEMAIL=dgit-tests@example.org 758s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v1.1 --distribution stable Ancestor 758s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v1.1 --distribution stable Ancestor 758s debchange warning: Unable to determine if stable is a valid Ubuntu release. 758s libdistro-info-perl is not installed, Debian release names are not known. 758s libdistro-info-perl is not installed, Ubuntu release names are not known. 758s + git add debian/changelog 758s + debcommit 758s git commit -m Ancestor 758s [master 6ede489] Ancestor 758s 2 files changed, 7 insertions(+) 758s create mode 100644 which 758s + revision=2 758s + push-to master stable 758s + t-refs-same-start 758s + unset t_ref_val 758s + t_ref_names=() 758s + t-ref-head 758s + local val 758s ++ git rev-parse HEAD 758s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 758s + t-ref-same-val HEAD 6ede489d12a09dd148d1f78c3a2179afddf29843 758s + local name=HEAD 758s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 758s + case "${t_ref_val-unset}" in 758s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 758s + t_ref_names+=("$name") 758s + t-dgit build 758s + local dgit=dgit 758s + pwd 758s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 758s + : ' 758s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 758s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 758s | git rev-parse --show-toplevel 758s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 758s | git config -z --get-regexp --local '.*' 758s | git config -z --get-regexp --local '.*' 758s | git config -z --get-regexp --global '.*' 758s | git config -z --get-regexp --system '.*' 758s format , quilt mode linear 758s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 758s warning: could not open directory 'debian/source/': No such file or directory 758s => `' 758s + git diff --quiet HEAD 758s massage split -F. 758s massage done 3 -b. 758s format , quilt mode linear 758s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 758s warning: could not open directory 'debian/source/': No such file or directory 758s => `' 758s + git diff --quiet HEAD 758s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 758s dpkg-buildpackage: info: source package example 758s dpkg-buildpackage: info: source version 1.1 758s dpkg-buildpackage: info: source distribution stable 758s dpkg-buildpackage: info: source changed by dgit test git user 759s fakeroot debian/rules clean 759s EXAMPLE RULES TARGET clean 759s dh_clean 759s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 759s | git clean -dn 759s => `' 759s | git rev-parse 'HEAD~0' 759s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 759s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 759s CD work 759s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 759s + git reset -q --hard 6ede489d12a09dd148d1f78c3a2179afddf29843 759s CD .. 759s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 759s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 759s dpkg-source: warning: source directory 'work' is not - 'example-1.1' 759s dpkg-source: info: using source format '1.0' 759s dpkg-source: info: building example in example_1.1.tar.gz 759s dpkg-source: info: building example in example_1.1.dsc 759s CD work 759s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 759s package seems new, not specifying -v 759s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.1_source.changes dpkg-genchanges -S 759s dpkg-genchanges: info: including full source code in upload 759s CD .. 759s moving example_1.1.dsc, example_1.1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 759s renaming (Files) example_1.1.tar.gz 759s renaming (dsc) example_1.1.dsc 759s renaming (changes) example_1.1_source.changes 759s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 759s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b 759s dpkg-buildpackage: info: source package example 759s dpkg-buildpackage: info: source version 1.1 759s dpkg-buildpackage: info: source distribution stable 759s dpkg-buildpackage: info: source changed by dgit test git user 759s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 759s dpkg-buildpackage: info: host architecture ppc64el 759s debian/rules build 759s EXAMPLE RULES TARGET build 759s fakeroot debian/rules binary 759s EXAMPLE RULES TARGET binary 759s dh_install 759s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 759s dh_gencontrol 759s dh_builddeb 759s dpkg-deb: building package 'example' in '../example_1.1_all.deb'. 759s dpkg-genbuildinfo --build=binary -O../example_1.1_ppc64el.buildinfo 760s dpkg-genchanges --build=binary -O../example_1.1_ppc64el.changes 760s dpkg-genchanges: info: binary-only upload (no source code included) 760s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 760s dpkg-buildpackage: info: binary-only upload (no source included) 760s CD .. 760s + mergechanges -f example_1.1_source.changes example_1.1_ppc64el.changes 760s dgit ok: build successful, results in example_1.1_multi.changes 760s 760s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 760s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 760s ' 760s + t-dgit push --new stable 760s + local dgit=dgit 760s + pwd 760s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 760s + : ' 760s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 760s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new stable 760s | git rev-parse --show-toplevel 760s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 760s | git config -z --get-regexp --local '.*' 760s | git config -z --get-regexp --local '.*' 760s | git config -z --get-regexp --global '.*' 760s | git config -z --get-regexp --system '.*' 760s format , quilt mode linear 760s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 760s warning: could not open directory 'debian/source/': No such file or directory 760s => `' 760s + git diff --quiet HEAD 760s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 760s canonical suite name is stable 760s actually entering push 760s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 760s => `0' 760s + git config remote.dgit.skipdefaultupdate true 760s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 760s get_archive_dsc: nothing in archive, returning undef 760s no version available from the archive 760s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/stable' 760s => `' 760s previous reference hash= 760s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/stable' 760s => `' 760s fetch_from_archive: lastfetch= 761s nothing found! 761s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 761s + git check-ref-format archive/test-dummy/1.1 761s | git symbolic-ref -q HEAD 761s => `refs/heads/master' 761s | git rev-parse 'HEAD~0' 761s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 761s ffq_prev_branchinfo branch current refs/heads/master 761s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 761s => `' 761s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 761s => `' 761s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 761s warning: could not open directory 'debian/source/': No such file or directory 761s => `' 761s + git diff --quiet HEAD 761s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.1' 761s => `' 761s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 761s checking that example_1.1.dsc corresponds to HEAD 761s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.1.dsc 761s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.1.dsc) 761s dpkg-source: info: extracting example in example-1.1 761s dpkg-source: info: unpacking example_1.1.tar.gz 761s CD example-1.1 761s | find -name .git -prune -print0 761s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 add -Af . 761s | git write-tree 761s => `f903521c6c60a705864da4c6c6716f8fbff08fcf' 761s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 761s + git diff --quiet f903521c6c60a705864da4c6c6716f8fbff08fcf 6ede489d12a09dd148d1f78c3a2179afddf29843 761s files_compare_inputs example_1.1.dsc 761s files_compare_inputs example_1.1.dsc Checksums-Sha256 761s files_compare_inputs example_1.1.dsc Checksums-Sha256 example_1.1.tar.gz 761s files_compare_inputs example_1.1.dsc Checksums-Sha1 761s files_compare_inputs example_1.1.dsc Checksums-Sha1 example_1.1.tar.gz 761s files_compare_inputs example_1.1.dsc Files 761s files_compare_inputs example_1.1.dsc Files example_1.1.tar.gz 761s files_compare_inputs example_1.1_multi.changes 761s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 761s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1.dsc 761s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1.tar.gz 761s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1_all.deb 761s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1_ppc64el.buildinfo 761s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 761s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1.dsc 761s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1.tar.gz 761s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1_all.deb 761s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1_ppc64el.buildinfo 761s files_compare_inputs example_1.1_multi.changes Files 761s files_compare_inputs example_1.1_multi.changes Files example_1.1.dsc 761s files_compare_inputs example_1.1_multi.changes Files example_1.1.tar.gz 761s files_compare_inputs example_1.1_multi.changes Files example_1.1_all.deb 761s files_compare_inputs example_1.1_multi.changes Files example_1.1_ppc64el.buildinfo 761s checking origs needed (1.1)... 761s checking origs needed placement 'devel extra'... 761s origs example_1.1.tar.gz | 34b381ab0da452e877e28d6c39cc00da 758 example_1.1.tar.gz 761s ../example_1.1_multi.changes already has appropriate .orig(s) (if any) 761s push_tagwants: $VAR1 = [ 761s '1.1', 761s '6ede489d12a09dd148d1f78c3a2179afddf29843', 761s undef, 761s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 761s ]; 761s $VAR2 = [ 761s { 761s 'Objid' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 761s 'TfSuffix' => '', 761s 'Tfn' => sub { "DUMMY" }, 761s 'View' => 'dgit', 761s 'Tag' => 'archive/test-dummy/1.1', 761s 'TagFn' => sub { "DUMMY" } 761s }, 761s { 761s 'TagFn' => sub { "DUMMY" }, 761s 'Tag' => 'test-dummy/1.1', 761s 'View' => 'dgit', 761s 'Objid' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 761s 'TfSuffix' => '-dgit', 761s 'Tfn' => sub { "DUMMY" } 761s } 761s ]; 761s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 761s => `1530000000 +0000' 761s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 761s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 761s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 761s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 761s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 761s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 761s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 761s => `280a7c982bdb127de0b2e4256d7782d0c575814a' 761s + git verify-tag 280a7c982bdb127de0b2e4256d7782d0c575814a 761s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 761s gpg: Signature made Mon Mar 31 22:59:51 2025 UTC 761s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 761s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 761s gpg: WARNING: This key is not certified with a trusted signature! 761s gpg: There is no indication that the signature belongs to the owner. 761s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 761s + git update-ref refs/tags/archive/test-dummy/1.1 280a7c982bdb127de0b2e4256d7782d0c575814a 761s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 761s => `b72bef0085ccfa9ea57106345a1b0bc3b4e52269' 761s + git verify-tag b72bef0085ccfa9ea57106345a1b0bc3b4e52269 761s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 761s gpg: Signature made Mon Mar 31 22:59:51 2025 UTC 761s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 761s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 761s gpg: WARNING: This key is not certified with a trusted signature! 761s gpg: There is no indication that the signature belongs to the owner. 761s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 761s + git update-ref refs/tags/test-dummy/1.1 b72bef0085ccfa9ea57106345a1b0bc3b4e52269 761s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 761s => `0' 761s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 761s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 6ede489d12a09dd148d1f78c3a2179afddf29843:refs/dgit/stable refs/tags/archive/test-dummy/1.1 refs/tags/test-dummy/1.1 761s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 761s * [new reference] 6ede489d12a09dd148d1f78c3a2179afddf29843 -> refs/dgit/stable 761s * [new tag] archive/test-dummy/1.1 -> archive/test-dummy/1.1 761s * [new tag] test-dummy/1.1 -> test-dummy/1.1 761s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 761s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.1_multi.changes 761s signfile dsc ../example_1.1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 761s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 761s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 761s 761s signfile buildinfo ../example_1.1_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 761s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 761s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 761s 761s fixup_changes dsc ../example_1.1.dsc ../example_1.1_multi.changes 761s fixup_changes buildinfo ../example_1.1_ppc64el.buildinfo ../example_1.1_multi.changes 761s signfile changes ../example_1.1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 762s 762s Successfully signed dsc, buildinfo, changes files 762s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_1.1_multi.changes 762s gpg: ../example_1.1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 762s gpg: ../example_1.1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 762s D: Setting host argument. 762s Checking signature on .changes 762s Checking signature on .dsc 762s Uploading to test-dummy (via local to localhost): 762s Successfully uploaded packages. 762s dgit ok: pushed and uploaded 1.1 762s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 762s del_lrfetchrefs... 762s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 762s ' 762s + t-pushed-good master stable 762s + local branch=master 762s + local suite=stable 762s + t-refs-same refs/heads/master 762s + local g 762s + for g in $* 762s + t-ref-same refs/heads/master 762s + local name=refs/heads/master 762s + local val 762s ++ t-git-get-ref refs/heads/master 762s ++ local ref=refs/heads/master 762s ++ case "$ref" in 762s ++ perl -ne ' 762s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 762s END { print "$x\n" if length $x; } 762s ' 762s ++ git show-ref -d refs/heads/master 762s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t-ref-same-val refs/heads/master 6ede489d12a09dd148d1f78c3a2179afddf29843 762s + local name=refs/heads/master 762s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + case "${t_ref_val-unset}" in 762s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t_ref_names+=("$name") 762s + t-pushed-good-core 762s + t-ref-dsc-dgit 762s + t-incoming-dsc 762s + local dsc=example_1.1.dsc 762s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc 762s + local val 762s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc Dgit 762s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc 762s ++ local field=Dgit 762s ++ perl -e ' 762s use Dpkg::Control::Hash; 762s my $h = new Dpkg::Control::Hash allow_pgp=>1; 762s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc"); 762s my $val = $h->{"Dgit"},"\n"; 762s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc Dgit" unless defined $val; 762s print $val,"\n"; 762s ' 762s + val='6ede489d12a09dd148d1f78c3a2179afddf29843 test-dummy archive/test-dummy/1.1 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 762s ++ perl -e ' 762s $_=shift @ARGV; 762s die "Dgit $_ ?" unless m/^\w+\b/; 762s print $&,"\n" or die $!; 762s ' '6ede489d12a09dd148d1f78c3a2179afddf29843 test-dummy archive/test-dummy/1.1 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 762s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc 6ede489d12a09dd148d1f78c3a2179afddf29843 762s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc 762s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + case "${t_ref_val-unset}" in 762s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t_ref_names+=("$name") 762s ++ t-v-tag 762s ++ echo refs/tags/archive/test-dummy/1.1 762s + t-refs-same refs/tags/archive/test-dummy/1.1 refs/remotes/dgit/dgit/stable 762s + local g 762s + for g in $* 762s + t-ref-same refs/tags/archive/test-dummy/1.1 762s + local name=refs/tags/archive/test-dummy/1.1 762s + local val 762s ++ t-git-get-ref refs/tags/archive/test-dummy/1.1 762s ++ local ref=refs/tags/archive/test-dummy/1.1 762s ++ case "$ref" in 762s ++ perl -ne ' 762s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.1\E(?:\^\{\})?$#; 762s END { print "$x\n" if length $x; } 762s ' 762s ++ git show-ref -d refs/tags/archive/test-dummy/1.1 762s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t-ref-same-val refs/tags/archive/test-dummy/1.1 6ede489d12a09dd148d1f78c3a2179afddf29843 762s + local name=refs/tags/archive/test-dummy/1.1 762s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + case "${t_ref_val-unset}" in 762s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t_ref_names+=("$name") 762s + for g in $* 762s + t-ref-same refs/remotes/dgit/dgit/stable 762s + local name=refs/remotes/dgit/dgit/stable 762s + local val 762s ++ t-git-get-ref refs/remotes/dgit/dgit/stable 762s ++ local ref=refs/remotes/dgit/dgit/stable 762s ++ case "$ref" in 762s ++ perl -ne ' 762s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/stable\E(?:\^\{\})?$#; 762s END { print "$x\n" if length $x; } 762s ' 762s ++ git show-ref -d refs/remotes/dgit/dgit/stable 762s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t-ref-same-val refs/remotes/dgit/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 762s + local name=refs/remotes/dgit/dgit/stable 762s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + case "${t_ref_val-unset}" in 762s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t_ref_names+=("$name") 762s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 762s + local val 762s + for g in $* 762s ++ t-git-get-ref refs/heads/dgit/unstable 762s ++ local ref=refs/heads/dgit/unstable 762s ++ case "$ref" in 762s ++ git show-ref -d refs/heads/dgit/unstable 762s ++ perl -ne ' 762s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 762s END { print "$x\n" if length $x; } 762s ' 762s ++ test 1 = 1 762s + val= 762s + '[' x '!=' x ']' 762s + for g in $* 762s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 762s ++ local ref=refs/remotes/dgit/dgit/unstable 762s ++ case "$ref" in 762s ++ perl -ne ' 762s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 762s END { print "$x\n" if length $x; } 762s ' 762s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 762s ++ test 1 = 1 762s + val= 762s + '[' x '!=' x ']' 762s + set -e 762s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 762s ++ t-v-tag 762s ++ echo refs/tags/archive/test-dummy/1.1 762s + t-refs-same refs/dgit/stable refs/tags/archive/test-dummy/1.1 762s + local g 762s + for g in $* 762s + t-ref-same refs/dgit/stable 762s + local name=refs/dgit/stable 762s + local val 762s ++ t-git-get-ref refs/dgit/stable 762s ++ local ref=refs/dgit/stable 762s ++ case "$ref" in 762s ++ git show-ref -d refs/dgit/stable 762s ++ perl -ne ' 762s $x = $1 if m#^(\w+) \Qrefs/dgit/stable\E(?:\^\{\})?$#; 762s END { print "$x\n" if length $x; } 762s ' 762s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t-ref-same-val refs/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 762s + local name=refs/dgit/stable 762s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + case "${t_ref_val-unset}" in 762s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t_ref_names+=("$name") 762s + for g in $* 762s + t-ref-same refs/tags/archive/test-dummy/1.1 762s + local name=refs/tags/archive/test-dummy/1.1 762s + local val 762s ++ t-git-get-ref refs/tags/archive/test-dummy/1.1 762s ++ local ref=refs/tags/archive/test-dummy/1.1 762s ++ case "$ref" in 762s ++ perl -ne ' 762s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.1\E(?:\^\{\})?$#; 762s END { print "$x\n" if length $x; } 762s ' 762s ++ git show-ref -d refs/tags/archive/test-dummy/1.1 762s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t-ref-same-val refs/tags/archive/test-dummy/1.1 6ede489d12a09dd148d1f78c3a2179afddf29843 762s + local name=refs/tags/archive/test-dummy/1.1 762s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + case "${t_ref_val-unset}" in 762s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 762s + t_ref_names+=("$name") 762s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 762s + t-refs-notexist refs/dgit/unstable 762s + local val 762s + for g in $* 762s ++ t-git-get-ref refs/dgit/unstable 762s ++ local ref=refs/dgit/unstable 762s ++ case "$ref" in 762s ++ perl -ne ' 762s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 762s END { print "$x\n" if length $x; } 762s ' 762s ++ git show-ref -d refs/dgit/unstable 762s ++ test 1 = 1 762s + val= 762s + '[' x '!=' x ']' 762s ++ t-v-tag 762s ++ echo refs/tags/archive/test-dummy/1.1 762s + git verify-tag refs/tags/archive/test-dummy/1.1 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 762s gpg: Signature made Mon Mar 31 22:59:51 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 + t-archive-process-incoming stable 762s + local suite=stable 762s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1_all.deb /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1_multi.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1_ppc64el.buildinfo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 762s + t-archive-query stable 762s + local suite=stable 762s + local dscf=main/example_1.1.dsc 762s + t-archive-query-aq stable example 1.1 main/example_1.1.dsc 762s + local suite=stable 762s + local p=example 762s + local v=1.1 762s + local dscf=main/example_1.1.dsc 762s + local sha 762s ++ sha256sum 762s + sha='e8e8f134ec6c6177577fc4ae9c1142bf46d82842bf052315050b317f7364ca19 -' 762s + echo '1.1 e8e8f134ec6c6177577fc4ae9c1142bf46d82842bf052315050b317f7364ca19 main/example_1.1.dsc' 762s + t-aq-archive-updated stable example 762s + local suite=stable 762s + local p=example 762s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 762s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 762s + perl -wne ' 762s use JSON; 762s use strict; 762s our @v; 762s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 762s push @v, { 762s "version" => "$1", 762s "sha256sum" => "$2", 762s "component" => "$3", 762s "filename" => "$4", 762s }; 762s END { 762s my $json = JSON->new->canonical(); 762s print $json->encode(\@v) or die $!; 762s } 762s ' 762s + git checkout -b stable 762s Switched to a new branch 'stable' 762s + echo stable 762s + git add which 762s + t-commit Stable '' stable 762s + local msg=Stable 762s + v=1.2 762s + t-debchange --force-distribution -v1.2 --distribution stable Stable 762s + DEBEMAIL=dgit-tests@example.org 762s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v1.2 --distribution stable Stable 762s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v1.2 --distribution stable Stable 762s debchange warning: Unable to determine if stable is a valid Ubuntu release. 762s libdistro-info-perl is not installed, Debian release names are not known. 762s libdistro-info-perl is not installed, Ubuntu release names are not known. 762s + git add debian/changelog 762s + debcommit 762s git commit -m Stable 762s [stable d5060e0] Stable 762s 2 files changed, 7 insertions(+), 1 deletion(-) 762s + revision=3 762s + push-to stable stable 762s + t-refs-same-start 762s + unset t_ref_val 762s + t_ref_names=() 762s + t-ref-head 762s + local val 762s ++ git rev-parse HEAD 762s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 762s + t-ref-same-val HEAD d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 762s + local name=HEAD 762s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 762s + case "${t_ref_val-unset}" in 762s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 762s + t_ref_names+=("$name") 762s + t-dgit build 762s + local dgit=dgit 762s + pwd 762s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 762s + : ' 762s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 762s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 762s | git rev-parse --show-toplevel 762s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 762s | git config -z --get-regexp --local '.*' 762s | git config -z --get-regexp --local '.*' 762s | git config -z --get-regexp --global '.*' 762s | git config -z --get-regexp --system '.*' 762s format , quilt mode linear 762s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 762s warning: could not open directory 'debian/source/': No such file or directory 762s => `' 762s + git diff --quiet HEAD 762s massage split -F. 762s massage done 3 -b. 762s format , quilt mode linear 762s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 762s warning: could not open directory 'debian/source/': No such file or directory 762s => `' 762s + git diff --quiet HEAD 762s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 763s dpkg-buildpackage: info: source package example 763s dpkg-buildpackage: info: source version 1.2 763s dpkg-buildpackage: info: source distribution stable 763s dpkg-buildpackage: info: source changed by dgit test git user 763s fakeroot debian/rules clean 763s EXAMPLE RULES TARGET clean 763s dh_clean 763s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 763s | git clean -dn 763s => `' 763s | git rev-parse 'HEAD~0' 763s => `d5060e0b2c66d5369fd8d88a498efa3d9f2706e0' 763s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 763s CD work 763s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 763s + git reset -q --hard d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 763s CD .. 763s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 763s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 763s dpkg-source: warning: source directory 'work' is not - 'example-1.2' 763s dpkg-source: info: using source format '1.0' 763s dpkg-source: info: building example in example_1.2.tar.gz 763s dpkg-source: info: building example in example_1.2.dsc 763s CD work 763s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 763s changelog will contain changes since 1.1 763s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.2_source.changes dpkg-genchanges -S -v1.1 763s dpkg-genchanges: info: including full source code in upload 763s CD .. 763s moving example_1.2.dsc, example_1.2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 763s renaming (Files) example_1.2.tar.gz 763s renaming (dsc) example_1.2.dsc 763s renaming (changes) example_1.2_source.changes 763s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 763s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b -v1.1 763s dpkg-buildpackage: info: source package example 763s dpkg-buildpackage: info: source version 1.2 763s dpkg-buildpackage: info: source distribution stable 763s dpkg-buildpackage: info: source changed by dgit test git user 763s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 763s dpkg-buildpackage: info: host architecture ppc64el 763s debian/rules build 763s EXAMPLE RULES TARGET build 763s fakeroot debian/rules binary 763s EXAMPLE RULES TARGET binary 763s dh_install 763s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 763s dh_gencontrol 763s dh_builddeb 763s dpkg-deb: building package 'example' in '../example_1.2_all.deb'. 764s dpkg-genbuildinfo --build=binary -O../example_1.2_ppc64el.buildinfo 764s dpkg-genchanges --build=binary -v1.1 -O../example_1.2_ppc64el.changes 764s dpkg-genchanges: info: binary-only upload (no source code included) 764s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 764s dpkg-buildpackage: info: binary-only upload (no source included) 764s CD .. 764s + mergechanges -f example_1.2_source.changes example_1.2_ppc64el.changes 764s dgit ok: build successful, results in example_1.2_multi.changes 764s 764s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 764s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 764s ' 764s + t-dgit push --new stable 764s + local dgit=dgit 764s + pwd 764s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 764s + : ' 764s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 764s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new stable 765s | git rev-parse --show-toplevel 765s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 765s | git config -z --get-regexp --local '.*' 765s | git config -z --get-regexp --local '.*' 765s | git config -z --get-regexp --global '.*' 765s | git config -z --get-regexp --system '.*' 765s format , quilt mode linear 765s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 765s warning: could not open directory 'debian/source/': No such file or directory 765s => `' 765s + git diff --quiet HEAD 765s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 765s canonical suite name is stable 765s actually entering push 765s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 765s => `1' 765s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/stable dgit-rewrite/map 765s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/stable)|(?:refs/dgit\-rewrite\/map) 765s git_lrfetch_sane iteration 0 765s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/stable refs/dgit-rewrite/map 765s => 6ede489d12a09dd148d1f78c3a2179afddf29843 refs/dgit/stable 765s => 280a7c982bdb127de0b2e4256d7782d0c575814a refs/tags/archive/test-dummy/1.1 765s => b72bef0085ccfa9ea57106345a1b0bc3b4e52269 refs/tags/test-dummy/1.1 765s 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 765s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 765s | git for-each-ref refs/dgit-fetch/test-dummy 765s |> 6ede489d12a09dd148d1f78c3a2179afddf29843 commit refs/dgit-fetch/test-dummy/dgit/stable 765s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 765s |> b72bef0085ccfa9ea57106345a1b0bc3b4e52269 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 765s git_lrfetch_sane: tidying any old suite lrfetchrefs 765s | git for-each-ref refs/dgit-fetch/stable 765s git_lrfetch_sane: git fetch --no-insane emulation complete 765s $VAR1 = { 765s 'refs/dgit-fetch/test-dummy/dgit/stable' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 765s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'b72bef0085ccfa9ea57106345a1b0bc3b4e52269', 765s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '280a7c982bdb127de0b2e4256d7782d0c575814a' 765s }; 765s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 765s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/tags/archive/test-dummy/1.1 765s currently refs/tags/archive/test-dummy/1.1=280a7c982bdb127de0b2e4256d7782d0c575814a 765s |> b72bef0085ccfa9ea57106345a1b0bc3b4e52269 tag refs/tags/test-dummy/1.1 765s currently refs/tags/test-dummy/1.1=b72bef0085ccfa9ea57106345a1b0bc3b4e52269 765s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 765s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 765s offered refs/tags/archive/test-dummy/1.1=280a7c982bdb127de0b2e4256d7782d0c575814a 765s |> b72bef0085ccfa9ea57106345a1b0bc3b4e52269 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 765s offered refs/tags/test-dummy/1.1=b72bef0085ccfa9ea57106345a1b0bc3b4e52269 765s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 765s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_1.1.dsc... 765s get_archive_dsc: Version 1.1 765s last upload to archive: specified git info (test-dummy) 765s GCF| git cat-file --batch 765s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 765s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 765s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 765s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255 765s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/stable' 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s previous reference hash=6ede489d12a09dd148d1f78c3a2179afddf29843 765s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/stable' 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s fetch_from_archive: lastfetch=6ede489d12a09dd148d1f78c3a2179afddf29843 765s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s fetch mergeinfos: 765s commit 6ede489d12a09dd148d1f78c3a2179afddf29843 Dgit field in .dsc from archive 765s fetch hash=6ede489d12a09dd148d1f78c3a2179afddf29843 765s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s + git update-ref -m 'dgit fetch stable' DGIT_ARCHIVE 6ede489d12a09dd148d1f78c3a2179afddf29843 765s | git log -n2 6ede489d12a09dd148d1f78c3a2179afddf29843 765s => `commit 6ede489d12a09dd148d1f78c3a2179afddf29843'... 765s | git ls-tree -lrz -- 6ede489d12a09dd148d1f78c3a2179afddf29843: 765s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 765s + git check-ref-format archive/test-dummy/1.2 765s | git symbolic-ref -q HEAD 765s => `refs/heads/stable' 765s | git rev-parse 'HEAD~0' 765s => `d5060e0b2c66d5369fd8d88a498efa3d9f2706e0' 765s ffq_prev_branchinfo branch current refs/heads/stable 765s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/stable' 765s => `' 765s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/stable' 765s => `' 765s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 765s warning: could not open directory 'debian/source/': No such file or directory 765s => `' 765s + git diff --quiet HEAD 765s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 765s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 765s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.2' 765s => `' 765s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 765s checking that example_1.2.dsc corresponds to HEAD 765s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.2.dsc 765s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.2.dsc) 765s dpkg-source: info: extracting example in example-1.2 765s dpkg-source: info: unpacking example_1.2.tar.gz 765s CD example-1.2 765s | find -name .git -prune -print0 765s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 => `04b91662ca770360f547964817f3b334b327a676' 765s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 765s + git diff --quiet 04b91662ca770360f547964817f3b334b327a676 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 765s files_compare_inputs example_1.2.dsc 765s files_compare_inputs example_1.2.dsc Checksums-Sha256 765s files_compare_inputs example_1.2.dsc Checksums-Sha256 example_1.2.tar.gz 765s files_compare_inputs example_1.2.dsc Checksums-Sha1 765s files_compare_inputs example_1.2.dsc Checksums-Sha1 example_1.2.tar.gz 765s files_compare_inputs example_1.2.dsc Files 765s files_compare_inputs example_1.2.dsc Files example_1.2.tar.gz 765s files_compare_inputs example_1.2_multi.changes 765s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 765s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2.dsc 765s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2.tar.gz 765s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2_all.deb 765s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2_ppc64el.buildinfo 765s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 765s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2.dsc 765s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2.tar.gz 765s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2_all.deb 765s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2_ppc64el.buildinfo 765s files_compare_inputs example_1.2_multi.changes Files 765s files_compare_inputs example_1.2_multi.changes Files example_1.2.dsc 765s files_compare_inputs example_1.2_multi.changes Files example_1.2.tar.gz 765s files_compare_inputs example_1.2_multi.changes Files example_1.2_all.deb 765s files_compare_inputs example_1.2_multi.changes Files example_1.2_ppc64el.buildinfo 765s checking origs needed (1.2)... 765s checking origs needed placement 'devel extra'... 765s origs example_1.2.tar.gz | 22390cb6d6349ce2058dce0e096ce3c4 765 example_1.2.tar.gz 765s ../example_1.2_multi.changes already has appropriate .orig(s) (if any) 765s push_tagwants: $VAR1 = [ 765s '1.2', 765s 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 765s undef, 765s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 765s ]; 765s $VAR2 = [ 765s { 765s 'TfSuffix' => '', 765s 'TagFn' => sub { "DUMMY" }, 765s 'Objid' => 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 765s 'View' => 'dgit', 765s 'Tfn' => sub { "DUMMY" }, 765s 'Tag' => 'archive/test-dummy/1.2' 765s }, 765s { 765s 'Tag' => 'test-dummy/1.2', 765s 'Tfn' => sub { "DUMMY" }, 765s 'Objid' => 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 765s 'View' => 'dgit', 765s 'TfSuffix' => '-dgit', 765s 'TagFn' => sub { "DUMMY" } 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.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 765s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 765s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 765s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 765s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 765s => `d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3' 765s + git verify-tag d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 765s gpg: Signature made Mon Mar 31 22:59:55 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/1.2 d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 765s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 765s => `bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904' 765s + git verify-tag bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 765s gpg: Signature made Mon Mar 31 22:59:55 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/1.2 bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 765s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/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.XK8uun/autopkgtest_tmp/git/example.git d5060e0b2c66d5369fd8d88a498efa3d9f2706e0:refs/dgit/stable refs/tags/archive/test-dummy/1.2 refs/tags/test-dummy/1.2 765s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 765s 6ede489..d5060e0 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 -> refs/dgit/stable 765s * [new tag] archive/test-dummy/1.2 -> archive/test-dummy/1.2 765s * [new tag] test-dummy/1.2 -> test-dummy/1.2 765s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 765s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.2_multi.changes 765s signfile dsc ../example_1.2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 765s 765s signfile buildinfo ../example_1.2_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 766s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 766s 766s fixup_changes dsc ../example_1.2.dsc ../example_1.2_multi.changes 766s fixup_changes buildinfo ../example_1.2_ppc64el.buildinfo ../example_1.2_multi.changes 766s signfile changes ../example_1.2_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 766s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 766s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 766s 766s Successfully signed dsc, buildinfo, changes files 766s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_1.2_multi.changes 766s gpg: ../example_1.2_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 766s gpg: ../example_1.2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 766s D: Setting host argument. 766s Checking signature on .changes 766s Checking signature on .dsc 766s Uploading to test-dummy (via local to localhost): 766s Successfully uploaded packages. 766s dgit ok: pushed and uploaded 1.2 766s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 766s del_lrfetchrefs... 766s del_lrfetchrefs: 6ede489d12a09dd148d1f78c3a2179afddf29843 refs/dgit-fetch/test-dummy/dgit/stable 766s del_lrfetchrefs: 280a7c982bdb127de0b2e4256d7782d0c575814a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 766s del_lrfetchrefs: b72bef0085ccfa9ea57106345a1b0bc3b4e52269 refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 766s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 766s ' 766s + t-pushed-good stable stable 766s + local branch=stable 766s + local suite=stable 766s + t-refs-same refs/heads/stable 766s + local g 766s + for g in $* 766s + t-ref-same refs/heads/stable 766s + local name=refs/heads/stable 766s + local val 766s ++ t-git-get-ref refs/heads/stable 766s ++ local ref=refs/heads/stable 766s ++ case "$ref" in 766s ++ perl -ne ' 766s $x = $1 if m#^(\w+) \Qrefs/heads/stable\E(?:\^\{\})?$#; 766s END { print "$x\n" if length $x; } 766s ' 766s ++ git show-ref -d refs/heads/stable 766s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t-ref-same-val refs/heads/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + local name=refs/heads/stable 766s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + case "${t_ref_val-unset}" in 766s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t_ref_names+=("$name") 766s + t-pushed-good-core 766s + t-ref-dsc-dgit 766s + t-incoming-dsc 766s + local dsc=example_1.2.dsc 766s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc 766s + local val 766s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc Dgit 766s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc 766s ++ local field=Dgit 766s ++ perl -e ' 766s use Dpkg::Control::Hash; 766s my $h = new Dpkg::Control::Hash allow_pgp=>1; 766s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc"); 766s my $val = $h->{"Dgit"},"\n"; 766s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc Dgit" unless defined $val; 766s print $val,"\n"; 766s ' 766s + val='d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 test-dummy archive/test-dummy/1.2 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 766s ++ perl -e ' 766s $_=shift @ARGV; 766s die "Dgit $_ ?" unless m/^\w+\b/; 766s print $&,"\n" or die $!; 766s ' 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0 test-dummy archive/test-dummy/1.2 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 766s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc 766s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + case "${t_ref_val-unset}" in 766s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t_ref_names+=("$name") 766s ++ t-v-tag 766s ++ echo refs/tags/archive/test-dummy/1.2 766s + t-refs-same refs/tags/archive/test-dummy/1.2 refs/remotes/dgit/dgit/stable 766s + local g 766s + for g in $* 766s + t-ref-same refs/tags/archive/test-dummy/1.2 766s + local name=refs/tags/archive/test-dummy/1.2 766s + local val 766s ++ t-git-get-ref refs/tags/archive/test-dummy/1.2 766s ++ local ref=refs/tags/archive/test-dummy/1.2 766s ++ case "$ref" in 766s ++ perl -ne ' 766s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.2\E(?:\^\{\})?$#; 766s END { print "$x\n" if length $x; } 766s ++ git show-ref -d refs/tags/archive/test-dummy/1.2 766s ' 766s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t-ref-same-val refs/tags/archive/test-dummy/1.2 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + local name=refs/tags/archive/test-dummy/1.2 766s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + case "${t_ref_val-unset}" in 766s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t_ref_names+=("$name") 766s + for g in $* 766s + t-ref-same refs/remotes/dgit/dgit/stable 766s + local name=refs/remotes/dgit/dgit/stable 766s + local val 766s ++ t-git-get-ref refs/remotes/dgit/dgit/stable 766s ++ local ref=refs/remotes/dgit/dgit/stable 766s ++ case "$ref" in 766s ++ perl -ne ' 766s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/stable\E(?:\^\{\})?$#; 766s END { print "$x\n" if length $x; } 766s ' 766s ++ git show-ref -d refs/remotes/dgit/dgit/stable 766s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t-ref-same-val refs/remotes/dgit/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + local name=refs/remotes/dgit/dgit/stable 766s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + case "${t_ref_val-unset}" in 766s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t_ref_names+=("$name") 766s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 766s + local val 766s + for g in $* 766s ++ t-git-get-ref refs/heads/dgit/unstable 766s ++ local ref=refs/heads/dgit/unstable 766s ++ case "$ref" in 766s ++ git show-ref -d refs/heads/dgit/unstable 766s ++ perl -ne ' 766s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 766s END { print "$x\n" if length $x; } 766s ' 766s ++ test 1 = 1 766s + val= 766s + '[' x '!=' x ']' 766s + for g in $* 766s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 766s ++ local ref=refs/remotes/dgit/dgit/unstable 766s ++ case "$ref" in 766s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 766s ++ perl -ne ' 766s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 766s END { print "$x\n" if length $x; } 766s ' 766s ++ test 1 = 1 766s + val= 766s + '[' x '!=' x ']' 766s + set -e 766s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 766s ++ t-v-tag 766s ++ echo refs/tags/archive/test-dummy/1.2 766s + t-refs-same refs/dgit/stable refs/tags/archive/test-dummy/1.2 766s + local g 766s + for g in $* 766s + t-ref-same refs/dgit/stable 766s + local name=refs/dgit/stable 766s + local val 766s ++ t-git-get-ref refs/dgit/stable 766s ++ local ref=refs/dgit/stable 766s ++ case "$ref" in 766s ++ git show-ref -d refs/dgit/stable 766s ++ perl -ne ' 766s $x = $1 if m#^(\w+) \Qrefs/dgit/stable\E(?:\^\{\})?$#; 766s END { print "$x\n" if length $x; } 766s ' 766s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t-ref-same-val refs/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + local name=refs/dgit/stable 766s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + case "${t_ref_val-unset}" in 766s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t_ref_names+=("$name") 766s + for g in $* 766s + t-ref-same refs/tags/archive/test-dummy/1.2 766s + local name=refs/tags/archive/test-dummy/1.2 766s + local val 766s ++ t-git-get-ref refs/tags/archive/test-dummy/1.2 766s ++ local ref=refs/tags/archive/test-dummy/1.2 766s ++ case "$ref" in 766s ++ git show-ref -d refs/tags/archive/test-dummy/1.2 766s ++ perl -ne ' 766s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.2\E(?:\^\{\})?$#; 766s END { print "$x\n" if length $x; } 766s ' 766s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t-ref-same-val refs/tags/archive/test-dummy/1.2 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + local name=refs/tags/archive/test-dummy/1.2 766s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + case "${t_ref_val-unset}" in 766s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 766s + t_ref_names+=("$name") 766s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 766s + t-refs-notexist refs/dgit/unstable 766s + local val 766s + for g in $* 766s ++ t-git-get-ref refs/dgit/unstable 766s ++ local ref=refs/dgit/unstable 766s ++ case "$ref" in 766s ++ git show-ref -d refs/dgit/unstable 766s ++ perl -ne ' 766s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 766s END { print "$x\n" if length $x; } 766s ' 766s ++ test 1 = 1 766s + val= 766s + '[' x '!=' x ']' 766s ++ t-v-tag 766s ++ echo refs/tags/archive/test-dummy/1.2 766s + git verify-tag refs/tags/archive/test-dummy/1.2 766s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 766s gpg: Signature made Mon Mar 31 22:59:55 2025 UTC 766s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 766s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 766s gpg: WARNING: This key is not certified with a trusted signature! 766s gpg: There is no indication that the signature belongs to the owner. 766s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 766s + t-archive-process-incoming stable 766s + local suite=stable 766s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2_all.deb /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2_multi.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2_ppc64el.buildinfo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 766s + t-archive-query stable 766s + local suite=stable 766s + local dscf=main/example_1.2.dsc 766s + t-archive-query-aq stable example 1.2 main/example_1.2.dsc 766s + local suite=stable 766s + local p=example 766s + local v=1.2 766s + local dscf=main/example_1.2.dsc 766s + local sha 766s ++ sha256sum 766s + sha='d64d77f71e68c8951bc2ce4712c8b0d01f25b990d4f9ff43d8ddbfee8f3f021b -' 766s + echo '1.2 d64d77f71e68c8951bc2ce4712c8b0d01f25b990d4f9ff43d8ddbfee8f3f021b main/example_1.2.dsc' 766s + t-aq-archive-updated stable example 766s + local suite=stable 766s + local p=example 766s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 766s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 766s + perl -wne ' 766s use JSON; 766s use strict; 766s our @v; 766s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 766s push @v, { 766s "version" => "$1", 766s "sha256sum" => "$2", 766s "component" => "$3", 766s "filename" => "$4", 766s }; 766s END { 766s my $json = JSON->new->canonical(); 766s print $json->encode(\@v) or die $!; 766s } 766s ' 766s + git checkout master 766s Switched to branch 'master' 766s + majorv=2 766s + revision=0 766s + echo sid 766s + git add which 766s + t-commit Sid 766s + local msg=Sid 766s + v=2.0 766s + t-debchange --force-distribution -v2.0 --distribution unstable Sid 766s + DEBEMAIL=dgit-tests@example.org 766s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v2.0 --distribution unstable Sid 766s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v2.0 --distribution unstable Sid 766s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 766s libdistro-info-perl is not installed, Debian release names are not known. 766s libdistro-info-perl is not installed, Ubuntu release names are not known. 766s + git add debian/changelog 766s + debcommit 766s git commit -m Sid 766s [master 1c97ddd] Sid 766s 2 files changed, 7 insertions(+), 1 deletion(-) 766s + revision=1 766s + push-to master sid 766s + t-refs-same-start 766s + unset t_ref_val 766s + t_ref_names=() 766s + t-ref-head 766s + local val 766s ++ git rev-parse HEAD 766s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 766s + t-ref-same-val HEAD 1c97ddd6759afae0eea88cf10027c6cba8866ea1 766s + local name=HEAD 766s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 766s + case "${t_ref_val-unset}" in 766s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 766s + t_ref_names+=("$name") 766s + t-dgit build 766s + local dgit=dgit 766s + pwd 766s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 766s + : ' 766s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 766s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 767s | git rev-parse --show-toplevel 767s => `/tmp/autopkgtest.XK8uun/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 , quilt mode linear 767s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 767s warning: could not open directory 'debian/source/': No such file or directory 767s => `' 767s + git diff --quiet HEAD 767s massage split -F. 767s massage done 3 -b. 767s format , quilt mode linear 767s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 767s warning: could not open directory 'debian/source/': No such file or directory 767s => `' 767s + git diff --quiet HEAD 767s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 767s dpkg-buildpackage: info: source package example 767s dpkg-buildpackage: info: source version 2.0 767s dpkg-buildpackage: info: source distribution unstable 767s dpkg-buildpackage: info: source changed by dgit test git user 767s fakeroot debian/rules clean 767s EXAMPLE RULES TARGET clean 767s dh_clean 767s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 767s | git clean -dn 767s => `' 767s | git rev-parse 'HEAD~0' 767s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 767s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 767s CD work 767s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 1c97ddd6759afae0eea88cf10027c6cba8866ea1 767s CD .. 767s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 767s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 767s dpkg-source: warning: source directory 'work' is not - 'example-2.0' 767s dpkg-source: info: using source format '1.0' 767s dpkg-source: info: building example in example_2.0.tar.gz 767s dpkg-source: info: building example in example_2.0.dsc 767s CD work 767s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 767s package seems new, not specifying -v 767s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0_source.changes dpkg-genchanges -S 767s dpkg-genchanges: info: including full source code in upload 767s CD .. 767s moving example_2.0.dsc, example_2.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 767s renaming (Files) example_2.0.tar.gz 767s renaming (dsc) example_2.0.dsc 767s renaming (changes) example_2.0_source.changes 767s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 767s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b 767s dpkg-buildpackage: info: source package example 767s dpkg-buildpackage: info: source version 2.0 767s dpkg-buildpackage: info: source distribution unstable 767s dpkg-buildpackage: info: source changed by dgit test git user 767s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 767s dpkg-buildpackage: info: host architecture ppc64el 767s debian/rules build 767s EXAMPLE RULES TARGET build 767s fakeroot debian/rules binary 767s EXAMPLE RULES TARGET binary 767s dh_install 767s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 767s dh_gencontrol 768s dh_builddeb 768s dpkg-deb: building package 'example' in '../example_2.0_all.deb'. 768s dpkg-genbuildinfo --build=binary -O../example_2.0_ppc64el.buildinfo 768s dpkg-genchanges --build=binary -O../example_2.0_ppc64el.changes 768s dpkg-genchanges: info: binary-only upload (no source code included) 768s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 768s dpkg-buildpackage: info: binary-only upload (no source included) 768s CD .. 768s + mergechanges -f example_2.0_source.changes example_2.0_ppc64el.changes 769s dgit ok: build successful, results in example_2.0_multi.changes 769s 769s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 769s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 769s ' 769s + t-dgit push --new sid 769s + local dgit=dgit 769s + pwd 769s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 769s + : ' 769s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 769s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new sid 769s | git rev-parse --show-toplevel 769s => `/tmp/autopkgtest.XK8uun/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 , quilt mode linear 769s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 769s warning: could not open directory 'debian/source/': No such file or directory 769s => `' 769s + git diff --quiet HEAD 769s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 769s canonical suite name for unstable is sid 769s actually entering push 769s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 769s => `1' 769s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 769s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 769s git_lrfetch_sane iteration 0 769s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 769s => 280a7c982bdb127de0b2e4256d7782d0c575814a refs/tags/archive/test-dummy/1.1 769s => d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 refs/tags/archive/test-dummy/1.2 769s => b72bef0085ccfa9ea57106345a1b0bc3b4e52269 refs/tags/test-dummy/1.1 769s => bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 refs/tags/test-dummy/1.2 769s 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/* 769s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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/*' 769s | git for-each-ref refs/dgit-fetch/test-dummy 769s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 769s |> d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 769s |> b72bef0085ccfa9ea57106345a1b0bc3b4e52269 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 769s |> bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 769s git_lrfetch_sane: tidying any old suite lrfetchrefs 769s | git for-each-ref refs/dgit-fetch/sid 769s git_lrfetch_sane: git fetch --no-insane emulation complete 769s $VAR1 = { 769s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => 'd5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3', 769s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '280a7c982bdb127de0b2e4256d7782d0c575814a', 769s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => 'bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904', 769s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'b72bef0085ccfa9ea57106345a1b0bc3b4e52269' 769s }; 769s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 769s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/tags/archive/test-dummy/1.1 769s currently refs/tags/archive/test-dummy/1.1=280a7c982bdb127de0b2e4256d7782d0c575814a 769s |> d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 tag refs/tags/archive/test-dummy/1.2 769s currently refs/tags/archive/test-dummy/1.2=d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 769s |> b72bef0085ccfa9ea57106345a1b0bc3b4e52269 tag refs/tags/test-dummy/1.1 769s currently refs/tags/test-dummy/1.1=b72bef0085ccfa9ea57106345a1b0bc3b4e52269 769s |> bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 tag refs/tags/test-dummy/1.2 769s currently refs/tags/test-dummy/1.2=bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 769s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 769s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 769s offered refs/tags/archive/test-dummy/1.1=280a7c982bdb127de0b2e4256d7782d0c575814a 769s |> d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 769s offered refs/tags/archive/test-dummy/1.2=d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 769s |> b72bef0085ccfa9ea57106345a1b0bc3b4e52269 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 769s offered refs/tags/test-dummy/1.1=b72bef0085ccfa9ea57106345a1b0bc3b4e52269 769s |> bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 769s offered refs/tags/test-dummy/1.2=bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 769s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 769s get_archive_dsc: nothing in archive, returning undef 769s no version available from the archive 769s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 769s => `' 769s previous reference hash= 769s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 769s => `' 769s fetch_from_archive: lastfetch= 769s nothing found! 769s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 769s + git check-ref-format archive/test-dummy/2.0 769s | git symbolic-ref -q HEAD 769s => `refs/heads/master' 769s | git rev-parse 'HEAD~0' 769s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 769s ffq_prev_branchinfo branch current refs/heads/master 769s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 769s => `' 769s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 769s => `' 769s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 769s warning: could not open directory 'debian/source/': No such file or directory 769s => `' 769s + git diff --quiet HEAD 769s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0' 769s => `' 769s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 769s checking that example_2.0.dsc corresponds to HEAD 769s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.dsc 769s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.dsc) 769s dpkg-source: info: extracting example in example-2.0 769s dpkg-source: info: unpacking example_2.0.tar.gz 769s CD example-2.0 769s | find -name .git -prune -print0 769s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 add -Af . 769s | git write-tree 769s => `18c935f7d9e9d6f4e8c714dba79cea37f4a6c413' 769s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 769s + git diff --quiet 18c935f7d9e9d6f4e8c714dba79cea37f4a6c413 1c97ddd6759afae0eea88cf10027c6cba8866ea1 769s files_compare_inputs example_2.0.dsc 769s files_compare_inputs example_2.0.dsc Checksums-Sha256 769s files_compare_inputs example_2.0.dsc Checksums-Sha256 example_2.0.tar.gz 769s files_compare_inputs example_2.0.dsc Checksums-Sha1 769s files_compare_inputs example_2.0.dsc Checksums-Sha1 example_2.0.tar.gz 769s files_compare_inputs example_2.0.dsc Files 769s files_compare_inputs example_2.0.dsc Files example_2.0.tar.gz 769s files_compare_inputs example_2.0_multi.changes 769s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 769s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0.dsc 769s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0.tar.gz 769s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0_all.deb 769s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0_ppc64el.buildinfo 769s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 769s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0.dsc 769s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0.tar.gz 769s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0_all.deb 769s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0_ppc64el.buildinfo 769s files_compare_inputs example_2.0_multi.changes Files 769s files_compare_inputs example_2.0_multi.changes Files example_2.0.dsc 769s files_compare_inputs example_2.0_multi.changes Files example_2.0.tar.gz 769s files_compare_inputs example_2.0_multi.changes Files example_2.0_all.deb 769s files_compare_inputs example_2.0_multi.changes Files example_2.0_ppc64el.buildinfo 769s checking origs needed (2.0)... 769s checking origs needed placement 'devel extra'... 769s origs example_2.0.tar.gz | e99199f6be70638923c1fd68d14d7f9c 763 example_2.0.tar.gz 769s ../example_2.0_multi.changes already has appropriate .orig(s) (if any) 769s push_tagwants: $VAR1 = [ 769s '2.0', 769s '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 769s undef, 769s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 769s ]; 769s $VAR2 = [ 769s { 769s 'Objid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 769s 'TfSuffix' => '', 769s 'View' => 'dgit', 769s 'Tag' => 'archive/test-dummy/2.0', 769s 'TagFn' => sub { "DUMMY" }, 769s 'Tfn' => sub { "DUMMY" } 769s }, 769s { 769s 'Tag' => 'test-dummy/2.0', 769s 'TagFn' => sub { "DUMMY" }, 769s 'Tfn' => sub { "DUMMY" }, 769s 'Objid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 769s 'View' => 'dgit', 769s 'TfSuffix' => '-dgit' 769s } 769s ]; 769s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 769s => `1530000000 +0000' 769s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 769s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 769s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 769s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 769s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 769s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 769s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 769s => `5f9c047129e1de624bc197c2927e491cf23a38b6' 769s + git verify-tag 5f9c047129e1de624bc197c2927e491cf23a38b6 769s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 769s gpg: Signature made Mon Mar 31 22:59:59 2025 UTC 769s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 769s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 769s gpg: WARNING: This key is not certified with a trusted signature! 769s gpg: There is no indication that the signature belongs to the owner. 769s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 769s + git update-ref refs/tags/archive/test-dummy/2.0 5f9c047129e1de624bc197c2927e491cf23a38b6 769s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 769s => `9fde358ff5050a264aa10f33e6e4ae84852cbf46' 769s + git verify-tag 9fde358ff5050a264aa10f33e6e4ae84852cbf46 769s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 769s gpg: Signature made Mon Mar 31 22:59:59 2025 UTC 769s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 769s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 769s gpg: WARNING: This key is not certified with a trusted signature! 769s gpg: There is no indication that the signature belongs to the owner. 769s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 769s + git update-ref refs/tags/test-dummy/2.0 9fde358ff5050a264aa10f33e6e4ae84852cbf46 769s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 769s => `1' 769s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1c97ddd6759afae0eea88cf10027c6cba8866ea1:refs/dgit/sid refs/tags/archive/test-dummy/2.0 refs/tags/test-dummy/2.0 769s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 769s * [new reference] 1c97ddd6759afae0eea88cf10027c6cba8866ea1 -> refs/dgit/sid 769s * [new tag] archive/test-dummy/2.0 -> archive/test-dummy/2.0 769s * [new tag] test-dummy/2.0 -> test-dummy/2.0 769s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 769s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0_multi.changes 769s signfile dsc ../example_2.0.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 769s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 769s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 770s 770s signfile buildinfo ../example_2.0_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 770s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 770s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 770s 770s fixup_changes dsc ../example_2.0.dsc ../example_2.0_multi.changes 770s fixup_changes buildinfo ../example_2.0_ppc64el.buildinfo ../example_2.0_multi.changes 770s signfile changes ../example_2.0_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 770s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 770s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 770s 770s Successfully signed dsc, buildinfo, changes files 770s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0_multi.changes 770s gpg: ../example_2.0_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 770s gpg: ../example_2.0.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 770s D: Setting host argument. 770s Checking signature on .changes 770s Checking signature on .dsc 770s Uploading to test-dummy (via local to localhost): 770s Successfully uploaded packages. 770s dgit ok: pushed and uploaded 2.0 770s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 770s del_lrfetchrefs... 770s del_lrfetchrefs: 280a7c982bdb127de0b2e4256d7782d0c575814a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 770s del_lrfetchrefs: d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 770s del_lrfetchrefs: b72bef0085ccfa9ea57106345a1b0bc3b4e52269 refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 770s del_lrfetchrefs: bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 770s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 770s ' 770s + t-pushed-good master sid 770s + local branch=master 770s + local suite=sid 770s + t-refs-same refs/heads/master 770s + local g 770s + for g in $* 770s + t-ref-same refs/heads/master 770s + local name=refs/heads/master 770s + local val 770s ++ t-git-get-ref refs/heads/master 770s ++ local ref=refs/heads/master 770s ++ case "$ref" in 770s ++ git show-ref -d refs/heads/master 770s ++ perl -ne ' 770s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 770s END { print "$x\n" if length $x; } 770s ' 770s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t-ref-same-val refs/heads/master 1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + local name=refs/heads/master 770s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + case "${t_ref_val-unset}" in 770s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t_ref_names+=("$name") 770s + t-pushed-good-core 770s + t-ref-dsc-dgit 770s + t-incoming-dsc 770s + local dsc=example_2.0.dsc 770s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc 770s + local val 770s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc Dgit 770s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc 770s ++ local field=Dgit 770s ++ perl -e ' 770s use Dpkg::Control::Hash; 770s my $h = new Dpkg::Control::Hash allow_pgp=>1; 770s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc"); 770s my $val = $h->{"Dgit"},"\n"; 770s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc Dgit" unless defined $val; 770s print $val,"\n"; 770s ' 770s + val='1c97ddd6759afae0eea88cf10027c6cba8866ea1 test-dummy archive/test-dummy/2.0 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 770s ++ perl -e ' 770s $_=shift @ARGV; 770s die "Dgit $_ ?" unless m/^\w+\b/; 770s print $&,"\n" or die $!; 770s ' '1c97ddd6759afae0eea88cf10027c6cba8866ea1 test-dummy archive/test-dummy/2.0 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 770s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc 1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc 770s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + case "${t_ref_val-unset}" in 770s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t_ref_names+=("$name") 770s ++ t-v-tag 770s ++ echo refs/tags/archive/test-dummy/2.0 770s + t-refs-same refs/tags/archive/test-dummy/2.0 refs/remotes/dgit/dgit/sid 770s + local g 770s + for g in $* 770s + t-ref-same refs/tags/archive/test-dummy/2.0 770s + local name=refs/tags/archive/test-dummy/2.0 770s + local val 770s ++ t-git-get-ref refs/tags/archive/test-dummy/2.0 770s ++ local ref=refs/tags/archive/test-dummy/2.0 770s ++ case "$ref" in 770s ++ git show-ref -d refs/tags/archive/test-dummy/2.0 770s ++ perl -ne ' 770s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.0\E(?:\^\{\})?$#; 770s END { print "$x\n" if length $x; } 770s ' 770s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t-ref-same-val refs/tags/archive/test-dummy/2.0 1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + local name=refs/tags/archive/test-dummy/2.0 770s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + case "${t_ref_val-unset}" in 770s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t_ref_names+=("$name") 770s + for g in $* 770s + t-ref-same refs/remotes/dgit/dgit/sid 770s + local name=refs/remotes/dgit/dgit/sid 770s + local val 770s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 770s ++ local ref=refs/remotes/dgit/dgit/sid 770s ++ case "$ref" in 770s ++ git show-ref -d refs/remotes/dgit/dgit/sid 770s ++ perl -ne ' 770s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 770s END { print "$x\n" if length $x; } 770s ' 770s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t-ref-same-val refs/remotes/dgit/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + local name=refs/remotes/dgit/dgit/sid 770s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + case "${t_ref_val-unset}" in 770s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t_ref_names+=("$name") 770s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 770s + local val 770s + for g in $* 770s ++ t-git-get-ref refs/heads/dgit/unstable 770s ++ local ref=refs/heads/dgit/unstable 770s ++ case "$ref" in 770s ++ git show-ref -d refs/heads/dgit/unstable 770s ++ perl -ne ' 770s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 770s END { print "$x\n" if length $x; } 770s ' 770s ++ test 1 = 1 770s + val= 770s + '[' x '!=' x ']' 770s + for g in $* 770s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 770s ++ local ref=refs/remotes/dgit/dgit/unstable 770s ++ case "$ref" in 770s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 770s ++ perl -ne ' 770s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 770s END { print "$x\n" if length $x; } 770s ' 770s ++ test 1 = 1 770s + val= 770s + '[' x '!=' x ']' 770s + set -e 770s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 770s ++ t-v-tag 770s ++ echo refs/tags/archive/test-dummy/2.0 770s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/2.0 770s + local g 770s + for g in $* 770s + t-ref-same refs/dgit/sid 770s + local name=refs/dgit/sid 770s + local val 770s ++ t-git-get-ref refs/dgit/sid 770s ++ local ref=refs/dgit/sid 770s ++ case "$ref" in 770s ++ git show-ref -d refs/dgit/sid 770s ++ perl -ne ' 770s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 770s END { print "$x\n" if length $x; } 770s ' 770s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t-ref-same-val refs/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + local name=refs/dgit/sid 770s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + case "${t_ref_val-unset}" in 770s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t_ref_names+=("$name") 770s + for g in $* 770s + t-ref-same refs/tags/archive/test-dummy/2.0 770s + local name=refs/tags/archive/test-dummy/2.0 770s + local val 770s ++ t-git-get-ref refs/tags/archive/test-dummy/2.0 770s ++ local ref=refs/tags/archive/test-dummy/2.0 770s ++ case "$ref" in 770s ++ git show-ref -d refs/tags/archive/test-dummy/2.0 770s ++ perl -ne ' 770s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.0\E(?:\^\{\})?$#; 770s END { print "$x\n" if length $x; } 770s ' 770s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t-ref-same-val refs/tags/archive/test-dummy/2.0 1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + local name=refs/tags/archive/test-dummy/2.0 770s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + case "${t_ref_val-unset}" in 770s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 770s + t_ref_names+=("$name") 770s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 770s + t-refs-notexist refs/dgit/unstable 770s + local val 770s + for g in $* 770s ++ t-git-get-ref refs/dgit/unstable 770s ++ local ref=refs/dgit/unstable 770s ++ case "$ref" in 770s ++ git show-ref -d refs/dgit/unstable 770s ++ perl -ne ' 770s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 770s END { print "$x\n" if length $x; } 770s ' 770s ++ test 1 = 1 770s + val= 770s + '[' x '!=' x ']' 770s ++ t-v-tag 770s ++ echo refs/tags/archive/test-dummy/2.0 770s + git verify-tag refs/tags/archive/test-dummy/2.0 770s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 770s gpg: Signature made Mon Mar 31 22:59:59 2025 UTC 770s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 770s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 770s gpg: WARNING: This key is not certified with a trusted signature! 770s gpg: There is no indication that the signature belongs to the owner. 770s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 770s + t-archive-process-incoming sid 770s + local suite=sid 770s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0_all.deb /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0_multi.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0_ppc64el.buildinfo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 770s + t-archive-query sid 770s + local suite=sid 770s + local dscf=main/example_2.0.dsc 770s + t-archive-query-aq sid example 2.0 main/example_2.0.dsc 770s + local suite=sid 770s + local p=example 770s + local v=2.0 770s + local dscf=main/example_2.0.dsc 770s + local sha 770s ++ sha256sum 770s + sha='bef2809a8cca04bf6b147325c5b80e8e99f4750588995c6fac3cef980de22acc -' 770s + echo '2.0 bef2809a8cca04bf6b147325c5b80e8e99f4750588995c6fac3cef980de22acc main/example_2.0.dsc' 770s + t-aq-archive-updated sid example 770s + local suite=sid 770s + local p=example 770s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 770s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 770s + perl -wne ' 770s use JSON; 770s use strict; 770s our @v; 770s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 770s push @v, { 770s "version" => "$1", 770s "sha256sum" => "$2", 770s "component" => "$3", 770s "filename" => "$4", 770s }; 770s END { 770s my $json = JSON->new->canonical(); 770s print $json->encode(\@v) or die $!; 770s } 770s ' 770s + echo sid-again 770s + git add which 770s + t-commit Sid 770s + local msg=Sid 770s + v=2.1 770s + t-debchange --force-distribution -v2.1 --distribution unstable Sid 770s + DEBEMAIL=dgit-tests@example.org 770s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v2.1 --distribution unstable Sid 770s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v2.1 --distribution unstable Sid 770s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 770s libdistro-info-perl is not installed, Debian release names are not known. 770s libdistro-info-perl is not installed, Ubuntu release names are not known. 770s + git add debian/changelog 770s + debcommit 770s git commit -m Sid 770s [master d5d72bd] Sid 770s 2 files changed, 7 insertions(+) 770s + revision=2 770s + push-to master sid 770s + t-refs-same-start 770s + unset t_ref_val 770s + t_ref_names=() 770s + t-ref-head 770s + local val 770s ++ git rev-parse HEAD 770s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 770s + t-ref-same-val HEAD d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 770s + local name=HEAD 770s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 770s + case "${t_ref_val-unset}" in 770s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 770s + t_ref_names+=("$name") 770s + t-dgit build 770s + local dgit=dgit 770s + pwd 770s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 770s + : ' 770s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 770s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 771s | git rev-parse --show-toplevel 771s => `/tmp/autopkgtest.XK8uun/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 , quilt mode linear 771s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 771s warning: could not open directory 'debian/source/': No such file or directory 771s => `' 771s + git diff --quiet HEAD 771s massage split -F. 771s massage done 3 -b. 771s format , quilt mode linear 771s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 771s warning: could not open directory 'debian/source/': No such file or directory 771s => `' 771s + git diff --quiet HEAD 771s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 771s dpkg-buildpackage: info: source package example 771s dpkg-buildpackage: info: source version 2.1 771s dpkg-buildpackage: info: source distribution unstable 771s dpkg-buildpackage: info: source changed by dgit test git user 771s fakeroot debian/rules clean 771s EXAMPLE RULES TARGET clean 771s dh_clean 771s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 771s | git clean -dn 771s => `' 771s | git rev-parse 'HEAD~0' 771s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 771s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 771s CD work 771s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 771s CD .. 771s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 771s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 771s dpkg-source: warning: source directory 'work' is not - 'example-2.1' 771s dpkg-source: info: using source format '1.0' 771s dpkg-source: info: building example in example_2.1.tar.gz 771s dpkg-source: info: building example in example_2.1.dsc 771s CD work 771s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 771s changelog will contain changes since 2.0 771s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.1_source.changes dpkg-genchanges -S -v2.0 771s dpkg-genchanges: info: including full source code in upload 771s CD .. 771s moving example_2.1.dsc, example_2.1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 771s renaming (Files) example_2.1.tar.gz 771s renaming (dsc) example_2.1.dsc 771s renaming (changes) example_2.1_source.changes 771s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 771s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b -v2.0 771s dpkg-buildpackage: info: source package example 771s dpkg-buildpackage: info: source version 2.1 771s dpkg-buildpackage: info: source distribution unstable 771s dpkg-buildpackage: info: source changed by dgit test git user 771s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 771s dpkg-buildpackage: info: host architecture ppc64el 771s debian/rules build 771s EXAMPLE RULES TARGET build 771s fakeroot debian/rules binary 771s EXAMPLE RULES TARGET binary 771s dh_install 772s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 772s dh_gencontrol 772s dh_builddeb 772s dpkg-deb: building package 'example' in '../example_2.1_all.deb'. 772s dpkg-genbuildinfo --build=binary -O../example_2.1_ppc64el.buildinfo 772s dpkg-genchanges --build=binary -v2.0 -O../example_2.1_ppc64el.changes 772s dpkg-genchanges: info: binary-only upload (no source code included) 772s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 772s dpkg-buildpackage: info: binary-only upload (no source included) 772s CD .. 772s + mergechanges -f example_2.1_source.changes example_2.1_ppc64el.changes 773s dgit ok: build successful, results in example_2.1_multi.changes 773s 773s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 773s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 773s ' 773s + t-dgit push --new sid 773s + local dgit=dgit 773s + pwd 773s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 773s + : ' 773s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 773s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new sid 773s | git rev-parse --show-toplevel 773s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 773s | git config -z --get-regexp --local '.*' 773s | git config -z --get-regexp --local '.*' 773s | git config -z --get-regexp --global '.*' 773s | git config -z --get-regexp --system '.*' 773s format , quilt mode linear 773s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 773s warning: could not open directory 'debian/source/': No such file or directory 773s => `' 773s + git diff --quiet HEAD 773s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 773s canonical suite name for unstable is sid 773s actually entering push 773s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 773s => `1' 773s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 773s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 773s git_lrfetch_sane iteration 0 773s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 773s => 1c97ddd6759afae0eea88cf10027c6cba8866ea1 refs/dgit/sid 773s => 280a7c982bdb127de0b2e4256d7782d0c575814a refs/tags/archive/test-dummy/1.1 773s => d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 refs/tags/archive/test-dummy/1.2 773s => 5f9c047129e1de624bc197c2927e491cf23a38b6 refs/tags/archive/test-dummy/2.0 773s => b72bef0085ccfa9ea57106345a1b0bc3b4e52269 refs/tags/test-dummy/1.1 773s => bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 refs/tags/test-dummy/1.2 773s => 9fde358ff5050a264aa10f33e6e4ae84852cbf46 refs/tags/test-dummy/2.0 773s 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 773s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 773s | git for-each-ref refs/dgit-fetch/test-dummy 773s |> 1c97ddd6759afae0eea88cf10027c6cba8866ea1 commit refs/dgit-fetch/test-dummy/dgit/sid 773s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 773s |> d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 773s |> 5f9c047129e1de624bc197c2927e491cf23a38b6 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 773s |> b72bef0085ccfa9ea57106345a1b0bc3b4e52269 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 773s |> bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 773s |> 9fde358ff5050a264aa10f33e6e4ae84852cbf46 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 773s git_lrfetch_sane: tidying any old suite lrfetchrefs 773s | git for-each-ref refs/dgit-fetch/sid 773s git_lrfetch_sane: git fetch --no-insane emulation complete 773s $VAR1 = { 773s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0' => '9fde358ff5050a264aa10f33e6e4ae84852cbf46', 773s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0' => '5f9c047129e1de624bc197c2927e491cf23a38b6', 773s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '280a7c982bdb127de0b2e4256d7782d0c575814a', 773s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => 'd5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3', 773s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'b72bef0085ccfa9ea57106345a1b0bc3b4e52269', 773s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => 'bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904', 773s 'refs/dgit-fetch/test-dummy/dgit/sid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s }; 773s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 773s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/tags/archive/test-dummy/1.1 773s currently refs/tags/archive/test-dummy/1.1=280a7c982bdb127de0b2e4256d7782d0c575814a 773s |> d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 tag refs/tags/archive/test-dummy/1.2 773s currently refs/tags/archive/test-dummy/1.2=d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 773s |> 5f9c047129e1de624bc197c2927e491cf23a38b6 tag refs/tags/archive/test-dummy/2.0 773s currently refs/tags/archive/test-dummy/2.0=5f9c047129e1de624bc197c2927e491cf23a38b6 773s |> b72bef0085ccfa9ea57106345a1b0bc3b4e52269 tag refs/tags/test-dummy/1.1 773s currently refs/tags/test-dummy/1.1=b72bef0085ccfa9ea57106345a1b0bc3b4e52269 773s |> bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 tag refs/tags/test-dummy/1.2 773s currently refs/tags/test-dummy/1.2=bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 773s |> 9fde358ff5050a264aa10f33e6e4ae84852cbf46 tag refs/tags/test-dummy/2.0 773s currently refs/tags/test-dummy/2.0=9fde358ff5050a264aa10f33e6e4ae84852cbf46 773s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 773s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 773s offered refs/tags/archive/test-dummy/1.1=280a7c982bdb127de0b2e4256d7782d0c575814a 773s |> d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 773s offered refs/tags/archive/test-dummy/1.2=d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 773s |> 5f9c047129e1de624bc197c2927e491cf23a38b6 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 773s offered refs/tags/archive/test-dummy/2.0=5f9c047129e1de624bc197c2927e491cf23a38b6 773s |> b72bef0085ccfa9ea57106345a1b0bc3b4e52269 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 773s offered refs/tags/test-dummy/1.1=b72bef0085ccfa9ea57106345a1b0bc3b4e52269 773s |> bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 773s offered refs/tags/test-dummy/1.2=bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 773s |> 9fde358ff5050a264aa10f33e6e4ae84852cbf46 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 773s offered refs/tags/test-dummy/2.0=9fde358ff5050a264aa10f33e6e4ae84852cbf46 773s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 773s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.0.dsc... 773s get_archive_dsc: Version 2.0 773s last upload to archive: specified git info (test-dummy) 773s GCF| git cat-file --batch 773s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 773s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 773s GCF>| 1c97ddd6759afae0eea88cf10027c6cba8866ea1 773s GCF<| 1c97ddd6759afae0eea88cf10027c6cba8866ea1 commit 250 773s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s previous reference hash=1c97ddd6759afae0eea88cf10027c6cba8866ea1 773s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s fetch_from_archive: lastfetch=1c97ddd6759afae0eea88cf10027c6cba8866ea1 773s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s fetch mergeinfos: 773s commit 1c97ddd6759afae0eea88cf10027c6cba8866ea1 Dgit field in .dsc from archive 773s fetch hash=1c97ddd6759afae0eea88cf10027c6cba8866ea1 773s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 1c97ddd6759afae0eea88cf10027c6cba8866ea1 773s | git log -n2 1c97ddd6759afae0eea88cf10027c6cba8866ea1 773s => `commit 1c97ddd6759afae0eea88cf10027c6cba8866ea1'... 773s | git ls-tree -lrz -- 1c97ddd6759afae0eea88cf10027c6cba8866ea1: 773s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 773s + git check-ref-format archive/test-dummy/2.1 773s | git symbolic-ref -q HEAD 773s => `refs/heads/master' 773s | git rev-parse 'HEAD~0' 773s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 773s ffq_prev_branchinfo branch current refs/heads/master 773s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 773s => `' 773s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 773s => `' 773s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 773s warning: could not open directory 'debian/source/': No such file or directory 773s => `' 773s + git diff --quiet HEAD 773s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 773s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 773s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.1' 773s => `' 773s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 773s checking that example_2.1.dsc corresponds to HEAD 773s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.dsc 773s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.dsc) 773s dpkg-source: info: extracting example in example-2.1 773s dpkg-source: info: unpacking example_2.1.tar.gz 773s CD example-2.1 773s | find -name .git -prune -print0 773s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 773s + git add -Af . 773s | git write-tree 773s => `0a454783758b3963f285d311a15fe86e962c54d4' 773s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 773s + git diff --quiet 0a454783758b3963f285d311a15fe86e962c54d4 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 773s files_compare_inputs example_2.1.dsc 773s files_compare_inputs example_2.1.dsc Checksums-Sha256 773s files_compare_inputs example_2.1.dsc Checksums-Sha256 example_2.1.tar.gz 773s files_compare_inputs example_2.1.dsc Checksums-Sha1 773s files_compare_inputs example_2.1.dsc Checksums-Sha1 example_2.1.tar.gz 773s files_compare_inputs example_2.1.dsc Files 773s files_compare_inputs example_2.1.dsc Files example_2.1.tar.gz 773s files_compare_inputs example_2.1_multi.changes 773s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 773s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1.dsc 773s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1.tar.gz 773s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1_all.deb 773s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1_ppc64el.buildinfo 773s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 773s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1.dsc 773s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1.tar.gz 773s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1_all.deb 773s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1_ppc64el.buildinfo 773s files_compare_inputs example_2.1_multi.changes Files 773s files_compare_inputs example_2.1_multi.changes Files example_2.1.dsc 773s files_compare_inputs example_2.1_multi.changes Files example_2.1.tar.gz 773s files_compare_inputs example_2.1_multi.changes Files example_2.1_all.deb 773s files_compare_inputs example_2.1_multi.changes Files example_2.1_ppc64el.buildinfo 773s checking origs needed (2.1)... 773s checking origs needed placement 'devel extra'... 773s origs example_2.1.tar.gz | 3c579320ad06b5c818289baa3f0ecb96 1021 example_2.1.tar.gz 773s ../example_2.1_multi.changes already has appropriate .orig(s) (if any) 773s push_tagwants: $VAR1 = [ 773s '2.1', 773s 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 773s undef, 773s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 773s ]; 773s $VAR2 = [ 773s { 773s 'Tfn' => sub { "DUMMY" }, 773s 'TfSuffix' => '', 773s 'View' => 'dgit', 773s 'TagFn' => sub { "DUMMY" }, 773s 'Tag' => 'archive/test-dummy/2.1', 773s 'Objid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 773s }, 773s { 773s 'Objid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 773s 'TagFn' => sub { "DUMMY" }, 773s 'Tag' => 'test-dummy/2.1', 773s 'View' => 'dgit', 773s 'TfSuffix' => '-dgit', 773s 'Tfn' => sub { "DUMMY" } 773s } 773s ]; 773s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 773s => `1530000000 +0000' 773s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 773s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 773s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 773s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 773s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 773s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 773s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 773s => `56a8d199c5f7d061dbb5b9c89844f9bbdae691c3' 773s + git verify-tag 56a8d199c5f7d061dbb5b9c89844f9bbdae691c3 773s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 773s gpg: Signature made Mon Mar 31 23:00:03 2025 UTC 773s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 773s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 773s gpg: WARNING: This key is not certified with a trusted signature! 773s gpg: There is no indication that the signature belongs to the owner. 773s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 773s + git update-ref refs/tags/archive/test-dummy/2.1 56a8d199c5f7d061dbb5b9c89844f9bbdae691c3 773s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 773s => `c18fdf3c9229271308688323b2dfa9a42b7219ad' 773s + git verify-tag c18fdf3c9229271308688323b2dfa9a42b7219ad 773s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 773s gpg: Signature made Mon Mar 31 23:00:03 2025 UTC 773s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 773s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 773s gpg: WARNING: This key is not certified with a trusted signature! 773s gpg: There is no indication that the signature belongs to the owner. 773s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 773s + git update-ref refs/tags/test-dummy/2.1 c18fdf3c9229271308688323b2dfa9a42b7219ad 773s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 773s => `1' 773s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git d5d72bd268117528fdb90dd8ee4f0f2fe5432b61:refs/dgit/sid refs/tags/archive/test-dummy/2.1 refs/tags/test-dummy/2.1 773s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 773s 1c97ddd..d5d72bd d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> refs/dgit/sid 773s * [new tag] archive/test-dummy/2.1 -> archive/test-dummy/2.1 773s * [new tag] test-dummy/2.1 -> test-dummy/2.1 773s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 773s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.1_multi.changes 773s signfile dsc ../example_2.1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 774s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 774s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 774s 774s signfile buildinfo ../example_2.1_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 774s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 774s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 774s 774s fixup_changes dsc ../example_2.1.dsc ../example_2.1_multi.changes 774s fixup_changes buildinfo ../example_2.1_ppc64el.buildinfo ../example_2.1_multi.changes 774s signfile changes ../example_2.1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 774s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 774s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 774s 774s Successfully signed dsc, buildinfo, changes files 774s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.1_multi.changes 774s gpg: ../example_2.1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 774s gpg: ../example_2.1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 774s D: Setting host argument. 774s Checking signature on .changes 774s Checking signature on .dsc 774s Uploading to test-dummy (via local to localhost): 774s Successfully uploaded packages. 774s dgit ok: pushed and uploaded 2.1 774s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 774s del_lrfetchrefs... 774s del_lrfetchrefs: 1c97ddd6759afae0eea88cf10027c6cba8866ea1 refs/dgit-fetch/test-dummy/dgit/sid 774s del_lrfetchrefs: 280a7c982bdb127de0b2e4256d7782d0c575814a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 774s del_lrfetchrefs: d5ebb0aa0acf929dfdebaba1e7448efa3dfbabd3 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 774s del_lrfetchrefs: 5f9c047129e1de624bc197c2927e491cf23a38b6 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 774s del_lrfetchrefs: b72bef0085ccfa9ea57106345a1b0bc3b4e52269 refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 774s del_lrfetchrefs: bcb35bbbd0dd3db7cf0c95a9e238ce1f06ec7904 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 774s del_lrfetchrefs: 9fde358ff5050a264aa10f33e6e4ae84852cbf46 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 774s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 774s ' 774s + t-pushed-good master sid 774s + local branch=master 774s + local suite=sid 774s + t-refs-same refs/heads/master 774s + local g 774s + for g in $* 774s + t-ref-same refs/heads/master 774s + local name=refs/heads/master 774s + local val 774s ++ t-git-get-ref refs/heads/master 774s ++ local ref=refs/heads/master 774s ++ case "$ref" in 774s ++ git show-ref -d refs/heads/master 774s ++ perl -ne ' 774s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 774s END { print "$x\n" if length $x; } 774s ' 774s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t-ref-same-val refs/heads/master d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + local name=refs/heads/master 774s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + case "${t_ref_val-unset}" in 774s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t_ref_names+=("$name") 774s + t-pushed-good-core 774s + t-ref-dsc-dgit 774s + t-incoming-dsc 774s + local dsc=example_2.1.dsc 774s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc 774s + local val 774s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc Dgit 774s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc 774s ++ local field=Dgit 774s ++ perl -e ' 774s use Dpkg::Control::Hash; 774s my $h = new Dpkg::Control::Hash allow_pgp=>1; 774s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc"); 774s my $val = $h->{"Dgit"},"\n"; 774s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc Dgit" unless defined $val; 774s print $val,"\n"; 774s ' 774s + val='d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 test-dummy archive/test-dummy/2.1 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 774s ++ perl -e ' 774s $_=shift @ARGV; 774s die "Dgit $_ ?" unless m/^\w+\b/; 774s print $&,"\n" or die $!; 774s ' 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61 test-dummy archive/test-dummy/2.1 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 774s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc 774s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + case "${t_ref_val-unset}" in 774s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t_ref_names+=("$name") 774s ++ t-v-tag 774s ++ echo refs/tags/archive/test-dummy/2.1 774s + t-refs-same refs/tags/archive/test-dummy/2.1 refs/remotes/dgit/dgit/sid 774s + local g 774s + for g in $* 774s + t-ref-same refs/tags/archive/test-dummy/2.1 774s + local name=refs/tags/archive/test-dummy/2.1 774s + local val 774s ++ t-git-get-ref refs/tags/archive/test-dummy/2.1 774s ++ local ref=refs/tags/archive/test-dummy/2.1 774s ++ case "$ref" in 774s ++ git show-ref -d refs/tags/archive/test-dummy/2.1 774s ++ perl -ne ' 774s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.1\E(?:\^\{\})?$#; 774s END { print "$x\n" if length $x; } 774s ' 774s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t-ref-same-val refs/tags/archive/test-dummy/2.1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + local name=refs/tags/archive/test-dummy/2.1 774s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + case "${t_ref_val-unset}" in 774s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t_ref_names+=("$name") 774s + for g in $* 774s + t-ref-same refs/remotes/dgit/dgit/sid 774s + local name=refs/remotes/dgit/dgit/sid 774s + local val 774s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 774s ++ local ref=refs/remotes/dgit/dgit/sid 774s ++ case "$ref" in 774s ++ git show-ref -d refs/remotes/dgit/dgit/sid 774s ++ perl -ne ' 774s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 774s END { print "$x\n" if length $x; } 774s ' 774s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t-ref-same-val refs/remotes/dgit/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + local name=refs/remotes/dgit/dgit/sid 774s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + case "${t_ref_val-unset}" in 774s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t_ref_names+=("$name") 774s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 774s + local val 774s + for g in $* 774s ++ t-git-get-ref refs/heads/dgit/unstable 774s ++ local ref=refs/heads/dgit/unstable 774s ++ case "$ref" in 774s ++ git show-ref -d refs/heads/dgit/unstable 774s ++ perl -ne ' 774s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 774s END { print "$x\n" if length $x; } 774s ' 774s ++ test 1 = 1 774s + val= 774s + '[' x '!=' x ']' 774s + for g in $* 774s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 774s ++ local ref=refs/remotes/dgit/dgit/unstable 774s ++ case "$ref" in 774s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 774s ++ perl -ne ' 774s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 774s END { print "$x\n" if length $x; } 774s ' 774s ++ test 1 = 1 774s + val= 774s + '[' x '!=' x ']' 774s + set -e 774s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 774s ++ t-v-tag 774s ++ echo refs/tags/archive/test-dummy/2.1 774s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/2.1 774s + local g 774s + for g in $* 774s + t-ref-same refs/dgit/sid 774s + local name=refs/dgit/sid 774s + local val 774s ++ t-git-get-ref refs/dgit/sid 774s ++ local ref=refs/dgit/sid 774s ++ case "$ref" in 774s ++ git show-ref -d refs/dgit/sid 774s ++ perl -ne ' 774s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 774s END { print "$x\n" if length $x; } 774s ' 774s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t-ref-same-val refs/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + local name=refs/dgit/sid 774s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + case "${t_ref_val-unset}" in 774s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t_ref_names+=("$name") 774s + for g in $* 774s + t-ref-same refs/tags/archive/test-dummy/2.1 774s + local name=refs/tags/archive/test-dummy/2.1 774s + local val 774s ++ t-git-get-ref refs/tags/archive/test-dummy/2.1 774s ++ local ref=refs/tags/archive/test-dummy/2.1 774s ++ case "$ref" in 774s ++ git show-ref -d refs/tags/archive/test-dummy/2.1 774s ++ perl -ne ' 774s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.1\E(?:\^\{\})?$#; 774s END { print "$x\n" if length $x; } 774s ' 774s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t-ref-same-val refs/tags/archive/test-dummy/2.1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + local name=refs/tags/archive/test-dummy/2.1 774s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + case "${t_ref_val-unset}" in 774s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 774s + t_ref_names+=("$name") 774s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 774s + t-refs-notexist refs/dgit/unstable 774s + local val 774s + for g in $* 774s ++ t-git-get-ref refs/dgit/unstable 774s ++ local ref=refs/dgit/unstable 774s ++ case "$ref" in 774s ++ git show-ref -d refs/dgit/unstable 774s ++ perl -ne ' 774s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 774s END { print "$x\n" if length $x; } 774s ' 774s ++ test 1 = 1 774s + val= 774s + '[' x '!=' x ']' 774s ++ t-v-tag 774s ++ echo refs/tags/archive/test-dummy/2.1 774s + git verify-tag refs/tags/archive/test-dummy/2.1 774s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 774s gpg: Signature made Mon Mar 31 23:00:03 2025 UTC 774s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 774s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 774s gpg: WARNING: This key is not certified with a trusted signature! 774s gpg: There is no indication that the signature belongs to the owner. 774s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 774s + t-archive-process-incoming sid 774s + local suite=sid 774s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1_all.deb /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1_multi.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1_ppc64el.buildinfo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 774s + t-archive-query sid 774s + local suite=sid 774s + local dscf=main/example_2.1.dsc 774s + t-archive-query-aq sid example 2.1 main/example_2.1.dsc 774s + local suite=sid 774s + local p=example 774s + local v=2.1 774s + local dscf=main/example_2.1.dsc 774s + local sha 774s ++ sha256sum 774s + sha='4c871861f89724226423139aaaeed416e4c1be5aecb9a86881e42acdf5223c3f -' 774s + echo '2.1 4c871861f89724226423139aaaeed416e4c1be5aecb9a86881e42acdf5223c3f main/example_2.1.dsc' 774s + t-aq-archive-updated sid example 774s + local suite=sid 774s + local p=example 774s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 774s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 774s + perl -wne ' 774s use JSON; 774s use strict; 774s our @v; 774s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 774s push @v, { 774s "version" => "$1", 774s "sha256sum" => "$2", 774s "component" => "$3", 774s "filename" => "$4", 774s }; 774s END { 774s my $json = JSON->new->canonical(); 774s print $json->encode(\@v) or die $!; 774s } 774s ' 774s + git clean -xdff 774s Removing debian/.debhelper/ 774s Removing debian/example.debhelper.log 774s Removing debian/example.substvars 774s Removing debian/example/ 774s Removing debian/files 774s + t-setup-done 'v suitespecs majorv revision' 'aq git mirror example' ' 774s t-select-package example 774s ' 774s + local 'savevars=v suitespecs majorv revision' 774s + local 'savedirs=aq git mirror example' 774s + local 'importeval= 774s t-select-package example 774s ' 774s + local import=IMPORT.examplegit 774s + exec 774s + local vn 774s + for vn in $savevars 774s ++ eval 'printf '\''%s\n'\'' "$v"' 774s +++ printf '%s\n' 2.1 774s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -e ' 774s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 774s ' v 2.1 774s + for vn in $savevars 774s ++ eval 'printf '\''%s\n'\'' "$suitespecs"' 774s +++ printf '%s\n' 'sid:unstable stable testing' 774s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -e ' 774s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 774s ' suitespecs 'sid:unstable stable testing' 775s + for vn in $savevars 775s ++ eval 'printf '\''%s\n'\'' "$majorv"' 775s +++ printf '%s\n' 2 775s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -e ' 775s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 775s ' majorv 2 775s + for vn in $savevars 775s ++ eval 'printf '\''%s\n'\'' "$revision"' 775s +++ printf '%s\n' 2 775s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -e ' 775s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 775s ' revision 2 775s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 775s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 775s print STDERR "saving-exporting $vn\n"; 775s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 775s or die $!; 775s } 775s ' 775s saving-exporting DGIT_TEST_REAL_GPG_AGENT 775s saving-exporting DGIT_TEST_REAL_GPG 775s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 775s + set -e 775s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 775s + tar cf IMPORT.examplegit.tar aq git mirror example 775s + printf '\n%s\n' ' 775s t-select-package example 775s ' 775s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.examplegit.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.examplegit 775s + rc=0 775s + set +x 775s + set +e 775s + pwd 775s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 775s + '[' x '!=' x ']' 775s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 775s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 775s + set -e 775s + test 0 = 0 775s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 775s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 775s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.examplegit 775s ++ v=2.1 775s ++ suitespecs='sid:unstable stable testing' 775s ++ majorv=2 775s ++ revision=2 775s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 775s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 775s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 775s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 775s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 775s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 775s ++ t-select-package example 775s ++ p=example 775s ++ dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 775s + t-tstunt-parsechangelog 775s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 775s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 775s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 775s + local var=PATH 775s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 775s + eval ' 775s case "$PATH" in 775s "$tstunt:"*) ;; 775s *":$tstunt:"*) ;; 775s "") PATH="$tstunt" ;; 775s *) PATH="$tstunt:$PATH" ;; 775s esac 775s export PATH 775s ' 775s ++ case "$PATH" in 775s ++ export PATH 775s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 775s + local var=PERLLIB 775s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 775s + eval ' 775s case "$PERLLIB" in 775s "$tstunt:"*) ;; 775s *":$tstunt:"*) ;; 775s "") PERLLIB="$tstunt" ;; 775s *) PERLLIB="$tstunt:$PERLLIB" ;; 775s esac 775s export PERLLIB 775s ' 775s ++ case "$PERLLIB" in 775s ++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 775s ++ export PERLLIB 775s + local f 775s + for f in "$@" 775s + t-tstunt--save-real dpkg-parsechangelog 775s + local f=dpkg-parsechangelog 775s + case "$f" in 775s + local rc 775s + local real 775s + set +e 775s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 775s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 775s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 775s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 775s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 775s ++ type -p dpkg-parsechangelog 775s + real=/usr/bin/dpkg-parsechangelog 775s + rc=0 775s + set -e 775s + case $rc in 775s + local varname=dpkg_parsechangelog 775s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 775s + eval ' 775s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 775s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 775s ' 775s ++ : /usr/bin/dpkg-parsechangelog 775s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 775s + f=./dpkg-parsechangelog 775s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 775s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 775s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 775s + for f in "$@" 775s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 775s + local f=Dpkg/Changelog/Parse.pm 775s + case "$f" in 775s + return 775s + f=./Dpkg/Changelog/Parse.pm 775s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 775s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 775s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 775s + mkdir map 775s + cd map 775s + git init 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.XK8uun/autopkgtest_tmp/map/.git/ 775s + cd .. 775s + cd example 775s + filter refs/heads/master refs/remotes/dgit/dgit/sid 775s + 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 775s Rewrite d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 (1/1) (0 seconds passed, remaining 0 predicted) 775s Ref 'refs/heads/master' was rewritten 775s Ref 'refs/remotes/dgit/dgit/sid' was rewritten 775s archive/test-dummy/2.1 -> archive/test-dummy/2.1 (d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> 607a66789db97a80a676b4ffbf45275c5b7fe795) 775s gpg signature stripped from tag object 56a8d199c5f7d061dbb5b9c89844f9bbdae691c3 775s test-dummy/2.1 -> test-dummy/2.1 (d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> 607a66789db97a80a676b4ffbf45275c5b7fe795) 775s gpg signature stripped from tag object c18fdf3c9229271308688323b2dfa9a42b7219ad 775s + for r in "$@" 775s + record-map refs/heads/master 775s ++ t-git-get-ref-exact refs/original/refs/heads/master 775s ++ local ref=refs/original/refs/heads/master 775s ++ case "$ref" in 775s ++ git for-each-ref '--format=%(objectname)' '[r]efs/original/refs/heads/master' 775s + old=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 775s ++ t-git-get-ref-exact refs/heads/master 775s ++ local ref=refs/heads/master 775s ++ case "$ref" in 775s ++ git for-each-ref '--format=%(objectname)' '[r]efs/heads/master' 775s + new=607a66789db97a80a676b4ffbf45275c5b7fe795 775s + '[' d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 = 607a66789db97a80a676b4ffbf45275c5b7fe795 ']' 775s + echo 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61 607a66789db97a80a676b4ffbf45275c5b7fe795' 775s + for r in "$@" 775s + record-map refs/remotes/dgit/dgit/sid 775s ++ t-git-get-ref-exact refs/original/refs/remotes/dgit/dgit/sid 775s ++ local ref=refs/original/refs/remotes/dgit/dgit/sid 775s ++ case "$ref" in 775s ++ git for-each-ref '--format=%(objectname)' '[r]efs/original/refs/remotes/dgit/dgit/sid' 775s + old=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 775s ++ t-git-get-ref-exact refs/remotes/dgit/dgit/sid 775s ++ local ref=refs/remotes/dgit/dgit/sid 775s ++ case "$ref" in 775s ++ git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 775s + new=607a66789db97a80a676b4ffbf45275c5b7fe795 775s + '[' d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 = 607a66789db97a80a676b4ffbf45275c5b7fe795 ']' 775s + echo 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61 607a66789db97a80a676b4ffbf45275c5b7fe795' 775s + t-ref-head 775s + local val 775s ++ git rev-parse HEAD 775s + val=607a66789db97a80a676b4ffbf45275c5b7fe795 775s + t-ref-same-val HEAD 607a66789db97a80a676b4ffbf45275c5b7fe795 775s + local name=HEAD 775s + local val=607a66789db97a80a676b4ffbf45275c5b7fe795 775s + case "${t_ref_val-unset}" in 775s + t_ref_val=607a66789db97a80a676b4ffbf45275c5b7fe795 775s + t_ref_names+=("$name") 775s + cd ../git/example.git 775s + filter refs/dgit/sid 775s + git filter-branch --msg-filter 'sed s/Sid/Spong/' --tag-name-filter cat '^archive/test-dummy/2.0' refs/dgit/sid 775s Rewrite d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 (1/1) (0 seconds passed, remaining 0 predicted) 775s Ref 'refs/dgit/sid' was rewritten 775s archive/test-dummy/2.1 -> archive/test-dummy/2.1 (d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> 607a66789db97a80a676b4ffbf45275c5b7fe795) 775s gpg signature stripped from tag object 56a8d199c5f7d061dbb5b9c89844f9bbdae691c3 775s test-dummy/2.1 -> test-dummy/2.1 (d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> 607a66789db97a80a676b4ffbf45275c5b7fe795) 775s gpg signature stripped from tag object c18fdf3c9229271308688323b2dfa9a42b7219ad 775s + for r in "$@" 775s + record-map refs/dgit/sid 775s ++ t-git-get-ref-exact refs/original/refs/dgit/sid 775s ++ local ref=refs/original/refs/dgit/sid 775s ++ case "$ref" in 775s ++ git for-each-ref '--format=%(objectname)' '[r]efs/original/refs/dgit/sid' 775s + old=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 775s ++ t-git-get-ref-exact refs/dgit/sid 775s ++ local ref=refs/dgit/sid 775s ++ case "$ref" in 775s ++ git for-each-ref '--format=%(objectname)' '[r]efs/dgit/sid' 775s + new=607a66789db97a80a676b4ffbf45275c5b7fe795 775s + '[' d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 = 607a66789db97a80a676b4ffbf45275c5b7fe795 ']' 775s + echo 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61 607a66789db97a80a676b4ffbf45275c5b7fe795' 775s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/map 775s + git add map 775s + git commit -m 'by test suite' 775s [master (root-commit) 3b495a6] by test suite 775s 1 file changed, 3 insertions(+) 775s create mode 100644 map 775s + git push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git master:refs/dgit-rewrite/map 775s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 775s * [new reference] master -> refs/dgit-rewrite/map 775s + cd .. 775s + suitespecs=avon 775s + t-reprepro-cfg ds- downstream 775s + local rrinst=ds- 775s + local rrdistro=downstream 775s + local etcapt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt 775s + local mir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror 775s + t-git-config dgit-distro.downstream.archive-query aptget: 775s + git config --global dgit-distro.downstream.archive-query aptget: 775s + t-git-config dgit-distro.downstream.mirror file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror/ 775s + git config --global dgit-distro.downstream.mirror file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror/ 775s + mkdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt 775s + cat 775s + export APT_CONFIG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/conf 775s + APT_CONFIG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/conf 775s + gpg --export Hannibal 775s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 775s + fakeroot apt-key add 775s W: Unable to read /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 775s W: Unable to read /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 775s W: Unable to read /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 775s W: Unable to read /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 775s W: Unable to read /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 775s W: Unable to read /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 775s W: Unable to read /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 775s Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d instead (see apt-key(8)). 775s W: Unable to read /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 775s W: Unable to read /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 776s W: Unable to read /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 776s OK 776s + mkdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/apt.conf.d 776s + t-reprepro-setup ds- 776s + local rrinst=ds- 776s + local mir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror 776s + local rrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror/conf 776s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror/conf 776s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror/pool/main 776s + exec 776s + local arch 776s ++ dpkg --print-architecture 776s + arch=ppc64el 776s + for suitespec in $suitespecs 776s + local suite=avon 776s + local sname=avon 776s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror/dists 776s + '[' avon '!=' avon ']' 776s + cat 776s + distro= 776s + dscf=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 776s + t-reprepro-includedsc avon /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc ds- 776s + local suite=avon 776s + local dscf=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 776s + local rrinst=ds- 776s + t-reprepro--run includedsc avon /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 776s + local mir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror 776s + reprepro --outdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror --basedir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror includedsc avon /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 776s Exporting indices... 776s + t-reprepro-regen ds- 776s + local rrinst=ds- 776s + t-reprepro--run export 776s + local mir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror 776s + reprepro --outdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror --basedir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror export 776s + mkdir example.import 776s + cd example.import 776s + git init 776s hint: Using 'master' as the name for the initial branch. This default branch name 776s hint: is subject to change. To configure the initial branch name to use in all 776s hint: of your new repositories, which will suppress this warning, call: 776s hint: 776s hint: git config --global init.defaultBranch 776s hint: 776s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 776s hint: 'development'. The just-created branch can be renamed via this command: 776s hint: 776s hint: git branch -m 776s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import/.git/ 776s + t-dgit import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc x 776s + local dgit=dgit 776s + pwd 776s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import 776s + : ' 776s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 776s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc x 776s | git rev-parse --show-toplevel 776s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import' 776s | git config -z --get-regexp --local '.*' 776s | git config -z --get-regexp --local '.*' 776s | git config -z --get-regexp --global '.*' 776s | git config -z --get-regexp --system '.*' 776s | git check-ref-format --normalize refs/heads/x 776s => `refs/heads/x' 776s | git symbolic-ref -q HEAD 776s => `refs/heads/master' 776s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/x' 776s => `' 776s gpgv: Signature made Mon Mar 31 22:59:51 2025 UTC 776s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 776s gpgv: Can't check signature: No public key 776s dgit: warning: cannot verify signature /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 776s Dgit metadata in .dsc: specified git info (test-dummy) 776s dgit: import-dsc of .dsc with Dgit field, using git hash 776s .dsc names distro test-dummy: fetching rewrite map 776s git_lrfetch_sane suppl=1 specs dgit-rewrite/map 776s git_lrfetch_sane specre=(?:refs/dgit\-rewrite\/map) 776s git_lrfetch_sane iteration 0 776s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git refs/dgit-rewrite/map 776s => 3b495a6e749025fce4348080e1b3a30e1e640c90 refs/dgit-rewrite/map 776s git_lrfetch_sane fspecs +refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map 776s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git '+refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map' 776s | git for-each-ref refs/dgit-fetch/test-dummy 776s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 776s git_lrfetch_sane: git fetch --no-insane emulation complete 776s $VAR1 = { 776s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90' 776s }; 776s GCF| git cat-file --batch 776s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 776s GCF<| 51516389792c0bbd1377a84700d0d6916c8cde22 blob 246 776s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 776s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 missing 776s .dsc names distro test-dummy: fetching additional commits 776s git_lrfetch_sane suppl=1 specs tags/archive/test-dummy/1.1 776s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/1\.1) 776s git_lrfetch_sane iteration 0 776s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git refs/tags/archive/test-dummy/1.1 776s => 280a7c982bdb127de0b2e4256d7782d0c575814a refs/tags/archive/test-dummy/1.1 776s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/1.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 776s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/1.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' 776s | git for-each-ref refs/dgit-fetch/test-dummy 776s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 776s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 776s git_lrfetch_sane: git fetch --no-insane emulation complete 776s $VAR1 = { 776s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90', 776s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '280a7c982bdb127de0b2e4256d7782d0c575814a' 776s }; 776s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 776s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255 776s | sh -ec 'echo 6ede489d12a09dd148d1f78c3a2179afddf29843 | git cat-file --batch-check' 776s => `6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255' 776s + git update-ref -m 'dgit import-dsc (Dgit): /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc' refs/heads/x 6ede489d12a09dd148d1f78c3a2179afddf29843 776s | git ls-tree -lrz -- 6ede489d12a09dd148d1f78c3a2179afddf29843: 776s dgit: import-dsc: updated git ref refs/heads/x 776s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 776s ' 776s + cd .. 776s + t-git-config dgit-suite.avon.distro downstream 776s + git config --global dgit-suite.avon.distro downstream 776s + t-git-config dgit-distro.downstream.git-check false 776s + git config --global dgit-distro.downstream.git-check false 776s + t-dgit clone example avon example.avon 776s + local dgit=dgit 776s + pwd 776s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 776s + : ' 776s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 776s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone example avon example.avon 776s | git config -z --get-regexp --global '.*' 776s | git config -z --get-regexp --system '.*' 776s clone main body 776s CD example.avon 776s + sh -ec 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget 776s + apt-get -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' update 776s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror avon InRelease [2097 B] 776s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror avon InRelease [2097 B] 776s Get:2 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror avon/main Sources [551 B] 776s Reading package lists... 776s W: file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror/dists/avon/InRelease: Key is stored in legacy trusted.gpg keyring (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details. 776s release file Codename: avon 776s canonical suite name is avon 776s + git init -q 776s | git config -z --get-regexp --local '.*' 776s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 776s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 776s + git config user.name 'dgit test git user' 776s is_gitattrs_setup: found nothing 776s starting new git history 776s + git config remote.dgit.skipdefaultupdate true 776s | apt-cache -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' showsrc example 776s => `Package: example'... 776s + sh -ec 'cd "$1"/source; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget apt-get -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' --download-only --only-source source example 776s Reading package lists... 776s Need to get 0 B/1925 B of source archives. 776s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror avon/main example 1.1 (dsc) [1167 B] 776s Get:2 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror avon/main example 1.1 (tar) [758 B] 776s Download complete and in download only mode 776s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.1.dsc... 776s get_archive_dsc: Version 1.1 776s last upload to archive: specified git info (test-dummy) 776s .dsc names distro test-dummy: fetching rewrite map 776s git_lrfetch_sane suppl=1 specs dgit-rewrite/map 776s git_lrfetch_sane specre=(?:refs/dgit\-rewrite\/map) 776s git_lrfetch_sane iteration 0 776s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git refs/dgit-rewrite/map 776s => 3b495a6e749025fce4348080e1b3a30e1e640c90 refs/dgit-rewrite/map 776s git_lrfetch_sane fspecs +refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map 776s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git '+refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map' 776s | git for-each-ref refs/dgit-fetch/test-dummy 776s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 776s git_lrfetch_sane: tidying any old suite lrfetchrefs 776s | git for-each-ref refs/dgit-fetch/avon 776s git_lrfetch_sane: git fetch --no-insane emulation complete 776s $VAR1 = { 776s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90' 776s }; 776s GCF| git cat-file --batch 776s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 776s GCF<| 51516389792c0bbd1377a84700d0d6916c8cde22 blob 246 776s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 776s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 missing 776s .dsc names distro test-dummy: fetching additional commits 776s git_lrfetch_sane suppl=1 specs tags/archive/test-dummy/1.1 776s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/1\.1) 776s git_lrfetch_sane iteration 0 776s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git refs/tags/archive/test-dummy/1.1 776s => 280a7c982bdb127de0b2e4256d7782d0c575814a refs/tags/archive/test-dummy/1.1 776s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/1.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 776s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/1.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' 777s | git for-each-ref refs/dgit-fetch/test-dummy 777s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 777s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 777s git_lrfetch_sane: tidying any old suite lrfetchrefs 777s | git for-each-ref refs/dgit-fetch/avon 777s git_lrfetch_sane: git fetch --no-insane emulation complete 777s $VAR1 = { 777s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90', 777s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '280a7c982bdb127de0b2e4256d7782d0c575814a' 777s }; 777s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 777s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255 777s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/downstream/dgit/avon' 777s => `' 777s previous reference hash= 777s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/avon' 777s => `' 777s fetch_from_archive: lastfetch= 777s fetch mergeinfos: 777s commit 6ede489d12a09dd148d1f78c3a2179afddf29843 Dgit field in .dsc from archive 777s fetch hash=6ede489d12a09dd148d1f78c3a2179afddf29843 777s + git update-ref -m 'dgit fetch avon' DGIT_ARCHIVE 6ede489d12a09dd148d1f78c3a2179afddf29843 777s | git log -n2 6ede489d12a09dd148d1f78c3a2179afddf29843 777s => `commit 6ede489d12a09dd148d1f78c3a2179afddf29843'... 777s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/avon 6ede489d12a09dd148d1f78c3a2179afddf29843 777s => `' 777s + git reset --hard refs/remotes/dgit/dgit/avon 777s HEAD is now at 6ede489 Ancestor 777s + bash -ec ' set -o pipefail 777s git ls-tree -r --name-only -z HEAD | '\\' 777s xargs -0r touch -h -r . -- 777s ' 777s dgit ok: ready for work in example.avon 777s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.avon 777s del_lrfetchrefs... 777s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 777s ' 777s + perl -i -pe 's/ test-dummy / unknown-distro / if m/^Dgit:/' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 777s + cd example.import 777s + t-expect-fail 'hinted url with protocol file which is unsafe' t-dgit import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc xunk 777s + local 'mpat=hinted url with protocol file which is unsafe' 777s + shift 777s + set +o pipefail 777s + LC_MESSAGES=C 777s + LANGUAGE=C 777s + t-dgit import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc xunk 777s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 777s + local dgit=dgit 777s + pwd 777s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import 777s + : ' 777s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 777s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc xunk 777s | git rev-parse --show-toplevel 777s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import' 777s | git config -z --get-regexp --local '.*' 777s | git config -z --get-regexp --local '.*' 777s | git config -z --get-regexp --global '.*' 777s | git config -z --get-regexp --system '.*' 777s | git check-ref-format --normalize refs/heads/xunk 777s => `refs/heads/xunk' 777s | git symbolic-ref -q HEAD 777s => `refs/heads/master' 777s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/xunk' 777s => `' 777s gpgv: Signature made Mon Mar 31 22:59:51 2025 UTC 777s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 777s gpgv: Can't check signature: No public key 777s dgit: warning: cannot verify signature /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 777s Dgit metadata in .dsc: specified git info (unknown-distro) 777s dgit: import-dsc of .dsc with Dgit field, using git hash 777s .dsc names distro unknown-distro: fetching rewrite map 777s 777s dgit: error: .dsc Dgit metadata is in context of distro unknown-distro 777s dgit: for which we have no configured url; 777s dgit: .dsc provides hinted url with protocol file which is unsafe. 777s dgit: (can be overridden by config - consult documentation) 777s + local 'ps=255 0' 777s + set -o pipefail 777s + case $ps in 777s + t-grep-mpat 'hinted url with protocol file which is unsafe' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 777s + local 'mpat=hinted url with protocol file which is unsafe' 777s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 777s + local grepper=fgrep 777s + case "$mpat" in 777s + fgrep -e 'hinted url with protocol file which is unsafe' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 777s dgit: .dsc provides hinted url with protocol file which is unsafe. 777s + t-git-config dgit.dsc-url-proto-ok.file true 777s + git config --global dgit.dsc-url-proto-ok.file true 777s + t-dgit import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc xunk 777s + local dgit=dgit 777s + pwd 777s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import 777s + : ' 777s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 777s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc xunk 777s | git rev-parse --show-toplevel 777s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import' 777s | git config -z --get-regexp --local '.*' 777s | git config -z --get-regexp --local '.*' 777s | git config -z --get-regexp --global '.*' 777s | git config -z --get-regexp --system '.*' 777s | git check-ref-format --normalize refs/heads/xunk 777s => `refs/heads/xunk' 777s | git symbolic-ref -q HEAD 777s => `refs/heads/master' 777s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/xunk' 777s => `' 777s gpgv: Signature made Mon Mar 31 22:59:51 2025 UTC 777s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 777s gpgv: Can't check signature: No public key 777s dgit: warning: cannot verify signature /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 777s Dgit metadata in .dsc: specified git info (unknown-distro) 777s dgit: import-dsc of .dsc with Dgit field, using git hash 777s .dsc names distro unknown-distro: fetching rewrite map 777s git_lrfetch_sane suppl=1 specs dgit-rewrite/map 777s git_lrfetch_sane specre=(?:refs/dgit\-rewrite\/map) 777s git_lrfetch_sane iteration 0 777s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git refs/dgit-rewrite/map 777s => 3b495a6e749025fce4348080e1b3a30e1e640c90 refs/dgit-rewrite/map 777s git_lrfetch_sane fspecs +refs/dgit-rewrite/map:refs/dgit-fetch/unknown-distro/dgit-rewrite/map 777s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git '+refs/dgit-rewrite/map:refs/dgit-fetch/unknown-distro/dgit-rewrite/map' 777s | git for-each-ref refs/dgit-fetch/unknown-distro 777s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/unknown-distro/dgit-rewrite/map 777s git_lrfetch_sane: git fetch --no-insane emulation complete 777s $VAR1 = { 777s 'refs/dgit-fetch/unknown-distro/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90' 777s }; 777s GCF| git cat-file --batch 777s GCF>| refs/dgit-fetch/unknown-distro/dgit-rewrite/map:map 777s GCF<| 51516389792c0bbd1377a84700d0d6916c8cde22 blob 246 777s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 777s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255 777s | sh -ec 'echo 6ede489d12a09dd148d1f78c3a2179afddf29843 | git cat-file --batch-check' 777s => `6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255' 777s + git update-ref -m 'dgit import-dsc (Dgit): /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc' refs/heads/xunk 6ede489d12a09dd148d1f78c3a2179afddf29843 777s | git ls-tree -lrz -- 6ede489d12a09dd148d1f78c3a2179afddf29843: 777s dgit: import-dsc: updated git ref refs/heads/xunk 777s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 777s ' 777s + cd .. 777s + dscf=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 777s + t-reprepro-includedsc avon /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc ds- 777s + local suite=avon 777s + local dscf=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 777s + local rrinst=ds- 777s + t-reprepro--run includedsc avon /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 777s + local mir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror 777s + reprepro --outdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror --basedir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror includedsc avon /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 777s Exporting indices... 777s Deleting files no longer referenced... 777s + t-reprepro-regen ds- 777s + local rrinst=ds- 777s + t-reprepro--run export 777s + local mir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror 777s + reprepro --outdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror --basedir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror export 777s + cd example.avon 777s + t-dgit fetch 777s + local dgit=dgit 777s + pwd 777s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.avon 777s + : ' 777s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 777s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch 777s | git rev-parse --show-toplevel 777s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.avon' 777s | git config -z --get-regexp --local '.*' 777s | git config -z --get-regexp --local '.*' 777s | git config -z --get-regexp --global '.*' 777s | git config -z --get-regexp --system '.*' 777s | git symbolic-ref -q HEAD 777s => `refs/heads/dgit/avon' 777s + sh -ec 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget 777s + apt-get -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' update 777s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror avon InRelease [2097 B] 777s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror avon InRelease [2097 B] 777s Get:2 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror avon/main Sources [552 B] 777s Reading package lists... 777s W: file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror/dists/avon/InRelease: Key is stored in legacy trusted.gpg keyring (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-etc-apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details. 777s release file Codename: avon 777s canonical suite name is avon 777s | apt-cache -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' showsrc example 777s => `Package: example'... 777s + sh -ec 'cd "$1"/source; shift; exec "$@"' x /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget apt-get -c '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' --download-only --only-source source example 777s Reading package lists... 777s Need to get 0 B/2191 B of source archives. 777s Get:1 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror avon/main example 2.1 (dsc) [1170 B] 777s Get:2 file:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/ds-mirror avon/main example 2.1 (tar) [1021 B] 777s Download complete and in download only mode 777s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/.cache/dgit/aptget/source/example_2.1.dsc... 777s get_archive_dsc: Version 2.1 777s last upload to archive: specified git info (test-dummy) 777s .dsc names distro test-dummy: fetching rewrite map 777s git_lrfetch_sane suppl=1 specs dgit-rewrite/map 777s git_lrfetch_sane specre=(?:refs/dgit\-rewrite\/map) 777s git_lrfetch_sane iteration 0 777s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git refs/dgit-rewrite/map 777s => 3b495a6e749025fce4348080e1b3a30e1e640c90 refs/dgit-rewrite/map 777s git_lrfetch_sane fspecs +refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map 777s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git '+refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map' 777s | git for-each-ref refs/dgit-fetch/test-dummy 777s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 777s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 777s git_lrfetch_sane: tidying any old suite lrfetchrefs 777s | git for-each-ref refs/dgit-fetch/avon 777s git_lrfetch_sane: git fetch --no-insane emulation complete 777s $VAR1 = { 777s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90', 777s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '280a7c982bdb127de0b2e4256d7782d0c575814a' 777s }; 777s GCF| git cat-file --batch 777s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 777s GCF<| 51516389792c0bbd1377a84700d0d6916c8cde22 blob 246 777s server's git history rewrite map contains a relevant entry! 777s using rewritten git hash in place of .dsc value 777s GCF>| 607a66789db97a80a676b4ffbf45275c5b7fe795 777s GCF<| 607a66789db97a80a676b4ffbf45275c5b7fe795 missing 777s .dsc names distro test-dummy: fetching additional commits 777s git_lrfetch_sane suppl=1 specs tags/archive/test-dummy/2.1 777s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/2\.1) 777s git_lrfetch_sane iteration 0 777s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git refs/tags/archive/test-dummy/2.1 777s => c177cd6af7c529760c51622b3ad35cbd78404be1 refs/tags/archive/test-dummy/2.1 777s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/2.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 777s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/2.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' 777s | git for-each-ref refs/dgit-fetch/test-dummy 777s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 777s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 777s |> c177cd6af7c529760c51622b3ad35cbd78404be1 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 777s git_lrfetch_sane: tidying any old suite lrfetchrefs 777s | git for-each-ref refs/dgit-fetch/avon 777s git_lrfetch_sane: git fetch --no-insane emulation complete 777s $VAR1 = { 777s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '280a7c982bdb127de0b2e4256d7782d0c575814a', 777s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90', 777s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' => 'c177cd6af7c529760c51622b3ad35cbd78404be1' 777s }; 777s GCF>| 607a66789db97a80a676b4ffbf45275c5b7fe795 777s GCF<| 607a66789db97a80a676b4ffbf45275c5b7fe795 commit 252 777s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/downstream/dgit/avon' 777s => `' 777s previous reference hash= 777s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/avon' 777s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 777s fetch_from_archive: lastfetch=6ede489d12a09dd148d1f78c3a2179afddf29843 777s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 607a66789db97a80a676b4ffbf45275c5b7fe795 777s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 777s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 777s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 777s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 777s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 777s fetch mergeinfos: 777s commit 607a66789db97a80a676b4ffbf45275c5b7fe795 Dgit field in .dsc from archive 777s fetch hash=607a66789db97a80a676b4ffbf45275c5b7fe795 777s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 607a66789db97a80a676b4ffbf45275c5b7fe795 777s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 777s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 777s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 777s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 777s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 777s + git update-ref -m 'dgit fetch avon' DGIT_ARCHIVE 607a66789db97a80a676b4ffbf45275c5b7fe795 777s | git log -n2 607a66789db97a80a676b4ffbf45275c5b7fe795 777s => `commit 607a66789db97a80a676b4ffbf45275c5b7fe795'... 777s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/avon 607a66789db97a80a676b4ffbf45275c5b7fe795 777s => `' 777s dgit ok: fetched into refs/remotes/dgit/dgit/avon 777s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.avon 777s del_lrfetchrefs... 777s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 777s ' 777s + t-ref-same refs/remotes/dgit/dgit/avon 777s + local name=refs/remotes/dgit/dgit/avon 777s + local val 777s ++ t-git-get-ref refs/remotes/dgit/dgit/avon 777s ++ local ref=refs/remotes/dgit/dgit/avon 777s ++ case "$ref" in 777s ++ git show-ref -d refs/remotes/dgit/dgit/avon 777s ++ perl -ne ' 777s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/avon\E(?:\^\{\})?$#; 777s END { print "$x\n" if length $x; } 777s ' 777s + val=607a66789db97a80a676b4ffbf45275c5b7fe795 777s + t-ref-same-val refs/remotes/dgit/dgit/avon 607a66789db97a80a676b4ffbf45275c5b7fe795 777s + local name=refs/remotes/dgit/dgit/avon 777s + local val=607a66789db97a80a676b4ffbf45275c5b7fe795 777s + case "${t_ref_val-unset}" in 777s + t_ref_val=607a66789db97a80a676b4ffbf45275c5b7fe795 777s + t_ref_names+=("$name") 777s + cd ../example.import 777s + git init 777s Reinitialized existing Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import/.git/ 777s + t-dgit import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +x 777s + local dgit=dgit 777s + pwd 777s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import 777s + : ' 777s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 777s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +x 778s | git rev-parse --show-toplevel 778s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import' 778s | git config -z --get-regexp --local '.*' 778s | git config -z --get-regexp --local '.*' 778s | git config -z --get-regexp --global '.*' 778s | git config -z --get-regexp --system '.*' 778s | git check-ref-format --normalize refs/heads/x 778s => `refs/heads/x' 778s | git symbolic-ref -q HEAD 778s => `refs/heads/master' 778s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/x' 778s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 778s gpgv: Signature made Mon Mar 31 23:00:04 2025 UTC 778s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 778s gpgv: Can't check signature: No public key 778s dgit: warning: cannot verify signature /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 778s Dgit metadata in .dsc: specified git info (test-dummy) 778s dgit: import-dsc of .dsc with Dgit field, using git hash 778s .dsc names distro test-dummy: fetching rewrite map 778s git_lrfetch_sane suppl=1 specs dgit-rewrite/map 778s git_lrfetch_sane specre=(?:refs/dgit\-rewrite\/map) 778s git_lrfetch_sane iteration 0 778s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git refs/dgit-rewrite/map 778s => 3b495a6e749025fce4348080e1b3a30e1e640c90 refs/dgit-rewrite/map 778s git_lrfetch_sane fspecs +refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map 778s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git '+refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map' 778s | git for-each-ref refs/dgit-fetch/test-dummy 778s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 778s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 778s git_lrfetch_sane: git fetch --no-insane emulation complete 778s $VAR1 = { 778s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90', 778s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '280a7c982bdb127de0b2e4256d7782d0c575814a' 778s }; 778s GCF| git cat-file --batch 778s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 778s GCF<| 51516389792c0bbd1377a84700d0d6916c8cde22 blob 246 778s server's git history rewrite map contains a relevant entry! 778s using rewritten git hash in place of .dsc value 778s GCF>| 607a66789db97a80a676b4ffbf45275c5b7fe795 778s GCF<| 607a66789db97a80a676b4ffbf45275c5b7fe795 missing 778s .dsc names distro test-dummy: fetching additional commits 778s git_lrfetch_sane suppl=1 specs tags/archive/test-dummy/2.1 778s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/2\.1) 778s git_lrfetch_sane iteration 0 778s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git refs/tags/archive/test-dummy/2.1 778s => c177cd6af7c529760c51622b3ad35cbd78404be1 refs/tags/archive/test-dummy/2.1 778s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/2.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 778s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/2.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' 778s | git for-each-ref refs/dgit-fetch/test-dummy 778s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 778s |> 280a7c982bdb127de0b2e4256d7782d0c575814a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 778s |> c177cd6af7c529760c51622b3ad35cbd78404be1 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 778s git_lrfetch_sane: git fetch --no-insane emulation complete 778s $VAR1 = { 778s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90', 778s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' => 'c177cd6af7c529760c51622b3ad35cbd78404be1', 778s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '280a7c982bdb127de0b2e4256d7782d0c575814a' 778s }; 778s GCF>| 607a66789db97a80a676b4ffbf45275c5b7fe795 778s GCF<| 607a66789db97a80a676b4ffbf45275c5b7fe795 commit 252 778s | sh -ec 'echo 607a66789db97a80a676b4ffbf45275c5b7fe795 | git cat-file --batch-check' 778s => `607a66789db97a80a676b4ffbf45275c5b7fe795 commit 252' 778s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 607a66789db97a80a676b4ffbf45275c5b7fe795 778s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 778s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 778s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 778s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 778s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 778s + git update-ref -m 'dgit import-dsc (Dgit): /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +' refs/heads/x 607a66789db97a80a676b4ffbf45275c5b7fe795 778s | git ls-tree -lrz -- 607a66789db97a80a676b4ffbf45275c5b7fe795: 778s dgit: import-dsc: updated git ref refs/heads/x 778s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 778s ' 778s + t-ref-same refs/heads/x 778s + local name=refs/heads/x 778s + local val 778s ++ t-git-get-ref refs/heads/x 778s ++ local ref=refs/heads/x 778s ++ case "$ref" in 778s ++ git show-ref -d refs/heads/x 778s ++ perl -ne ' 778s $x = $1 if m#^(\w+) \Qrefs/heads/x\E(?:\^\{\})?$#; 778s END { print "$x\n" if length $x; } 778s ' 778s + val=607a66789db97a80a676b4ffbf45275c5b7fe795 778s + t-ref-same-val refs/heads/x 607a66789db97a80a676b4ffbf45275c5b7fe795 778s + local name=refs/heads/x 778s + local val=607a66789db97a80a676b4ffbf45275c5b7fe795 778s + case "${t_ref_val-unset}" in 778s + t_ref_val=607a66789db97a80a676b4ffbf45275c5b7fe795 778s + t_ref_names+=("$name") 778s + git show x 778s + grep Spong 778s Spong 778s + t-expect-fail 'Your git tree does not have that object' t-dgit --no-chase-dsc-distro import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +y 778s + local 'mpat=Your git tree does not have that object' 778s + shift 778s + set +o pipefail 778s + LC_MESSAGES=C 778s + LANGUAGE=C 778s + t-dgit --no-chase-dsc-distro import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +y 778s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 778s + local dgit=dgit 778s + pwd 778s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import 778s + : ' 778s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 778s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --no-chase-dsc-distro import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +y 778s | git rev-parse --show-toplevel 778s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import' 778s | git config -z --get-regexp --local '.*' 778s | git config -z --get-regexp --local '.*' 778s | git config -z --get-regexp --global '.*' 778s | git config -z --get-regexp --system '.*' 778s | git check-ref-format --normalize refs/heads/y 778s => `refs/heads/y' 778s | git symbolic-ref -q HEAD 778s => `refs/heads/master' 778s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/y' 778s => `' 778s gpgv: Signature made Mon Mar 31 23:00:04 2025 UTC 778s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 778s gpgv: Can't check signature: No public key 778s dgit: warning: cannot verify signature /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 778s Dgit metadata in .dsc: specified git info (test-dummy) 778s dgit: import-dsc of .dsc with Dgit field, using git hash 778s not chasing .dsc distro test-dummy: not fetching rewrite map 778s | sh -ec 'echo d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 | git cat-file --batch-check' 778s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 missing' 778s 778s dgit: error: .dsc contains Dgit field referring to object d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 778s dgit: Your git tree does not have that object. Try `git fetch' from a 778s dgit: plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again. 778s + local 'ps=255 0' 778s + set -o pipefail 778s + case $ps in 778s + t-grep-mpat 'Your git tree does not have that object' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 778s + local 'mpat=Your git tree does not have that object' 778s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 778s + local grepper=fgrep 778s + case "$mpat" in 778s + fgrep -e 'Your git tree does not have that object' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 778s dgit: Your git tree does not have that object. Try `git fetch' from a 778s + cd ../example 778s + t-dgit --no-chase-dsc-distro import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +y 778s + local dgit=dgit 778s + pwd 778s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 778s + : ' 778s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 778s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --no-chase-dsc-distro import-dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +y 778s | git rev-parse --show-toplevel 778s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 778s | git config -z --get-regexp --local '.*' 778s | git config -z --get-regexp --local '.*' 778s | git config -z --get-regexp --global '.*' 778s | git config -z --get-regexp --system '.*' 778s | git check-ref-format --normalize refs/heads/y 778s => `refs/heads/y' 778s | git symbolic-ref -q HEAD 778s => `refs/heads/master' 778s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/y' 778s => `' 778s gpgv: Signature made Mon Mar 31 23:00:04 2025 UTC 778s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 778s gpgv: Can't check signature: No public key 778s dgit: warning: cannot verify signature /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 778s Dgit metadata in .dsc: specified git info (test-dummy) 778s dgit: import-dsc of .dsc with Dgit field, using git hash 778s not chasing .dsc distro test-dummy: not fetching rewrite map 778s | sh -ec 'echo d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 | git cat-file --batch-check' 778s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 commit 250' 778s + git update-ref -m 'dgit import-dsc (Dgit): /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +' refs/heads/y d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 778s | git ls-tree -lrz -- d5d72bd268117528fdb90dd8ee4f0f2fe5432b61: 778s dgit: import-dsc: updated git ref refs/heads/y 778s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 778s ' 778s + git show y 778s + grep Sid 778s Sid 778s + * Sid 778s * Sid 778s + t-ok 778s + : ======================================== 778s + t-check-only-bpd 778s + '[' .. = .. ']' 778s + return 778s + t-fscks 778s + shopt -s nullglob 778s + for d in $tmp/*/.git $tmp/git/*.git 778s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.avon 778s + t-git-fsck 778s ++ git rev-parse --git-dir 778s + local fsckerrs=.git/dgit-test-fsck.errs 778s + set +e 778s + tee .git/dgit-test-fsck.errs 778s + LC_MESSAGES=C 778s + git fsck --no-dangling --strict 778s + ps='0 0' 778s + set -e 778s + local pats 778s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 778s + test '0 0' = '0 0' 778s + pats+=(-e 'notice: HEAD points to an unborn branch') 778s + pats+=(-e 'notice: No default references') 778s + set +e 778s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 778s + rc=1 778s + set -e 778s + case $rc in 778s + for d in $tmp/*/.git $tmp/git/*.git 778s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.import 778s + t-git-fsck 778s ++ git rev-parse --git-dir 778s + local fsckerrs=.git/dgit-test-fsck.errs 778s + set +e 778s + LC_MESSAGES=C 778s + git fsck --no-dangling --strict 778s + tee .git/dgit-test-fsck.errs 778s notice: HEAD points to an unborn branch (master) 778s + ps='0 0' 778s + set -e 778s + local pats 778s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 778s + test '0 0' = '0 0' 778s + pats+=(-e 'notice: HEAD points to an unborn branch') 778s + pats+=(-e 'notice: No default references') 778s + set +e 778s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 778s + rc=1 778s + set -e 778s + case $rc in 778s + for d in $tmp/*/.git $tmp/git/*.git 778s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 778s + t-git-fsck 778s ++ git rev-parse --git-dir 778s + local fsckerrs=.git/dgit-test-fsck.errs 778s + set +e 778s + LC_MESSAGES=C 778s + git fsck --no-dangling --strict 778s + tee .git/dgit-test-fsck.errs 778s + ps='0 0' 778s + set -e 778s + local pats 778s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 778s + test '0 0' = '0 0' 778s + pats+=(-e 'notice: HEAD points to an unborn branch') 778s + pats+=(-e 'notice: No default references') 778s + set +e 778s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 778s + rc=1 778s + set -e 778s + case $rc in 778s + for d in $tmp/*/.git $tmp/git/*.git 778s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/map 778s + t-git-fsck 778s ++ git rev-parse --git-dir 778s + local fsckerrs=.git/dgit-test-fsck.errs 778s + set +e 778s + LC_MESSAGES=C 778s + git fsck --no-dangling --strict 778s + tee .git/dgit-test-fsck.errs 778s + ps='0 0' 778s + set -e 778s + local pats 778s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 778s + test '0 0' = '0 0' 778s + pats+=(-e 'notice: HEAD points to an unborn branch') 778s + pats+=(-e 'notice: No default references') 778s + set +e 778s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 778s + rc=1 778s + set -e 778s + case $rc in 778s + for d in $tmp/*/.git $tmp/git/*.git 778s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 778s + t-git-fsck 778s ++ git rev-parse --git-dir 778s + local fsckerrs=./dgit-test-fsck.errs 778s + set +e 778s + LC_MESSAGES=C 778s + git fsck --no-dangling --strict 778s + tee ./dgit-test-fsck.errs 778s notice: HEAD points to an unborn branch (master) 778s + ps='0 0' 778s + set -e 778s + local pats 778s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 778s + test '0 0' = '0 0' 778s + pats+=(-e 'notice: HEAD points to an unborn branch') 778s + pats+=(-e 'notice: No default references') 778s + set +e 778s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 778s + rc=1 778s + set -e 778s + case $rc in 778s + t-save-artifacts 778s + artifacts=/tmp/autopkgtest.XK8uun/downstream-gitless-artifacts 778s + '[' x/tmp/autopkgtest.XK8uun/downstream-gitless-artifacts = x ']' 778s + '[' xtmp = x ']' 778s + GZIP=-1v 778s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/downstream-gitless-artifacts/downstream-gitless.tar.gz '--exclude=*.tar' . 778s gzip: warning: GZIP environment variable is deprecated; use an alias or script 778s 91.0% 778s + echo ok. 778s ok. 778s + rc=0 778s + set +x 778s + set +e 778s + pwd 778s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 778s + '[' x '!=' x ']' 778s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 778s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 778s + set -e 778s + test 0 = 0 779s autopkgtest [23:00:09]: test downstream-gitless: -----------------------] 779s autopkgtest [23:00:09]: test downstream-gitless: - - - - - - - - - - results - - - - - - - - - - 779s downstream-gitless PASS 780s autopkgtest [23:00:10]: test alternating-dgit: preparing testbed 860s autopkgtest [23:01:30]: testbed dpkg architecture: ppc64el 860s autopkgtest [23:01:30]: testbed apt version: 2.4.13 861s autopkgtest [23:01:31]: @@@@@@@@@@@@@@@@@@@@ test bed setup 861s autopkgtest [23:01:31]: testbed release detected to be: jammy 862s autopkgtest [23:01:32]: updating testbed package index (apt update) 862s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 862s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 862s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 862s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 863s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.2 kB] 863s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 863s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 863s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el Packages [170 kB] 863s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el c-n-f Metadata [2476 B] 863s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el Packages [1704 B] 863s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el c-n-f Metadata [116 B] 863s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el Packages [85.0 kB] 863s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el c-n-f Metadata [2064 B] 863s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse ppc64el c-n-f Metadata [116 B] 865s Fetched 715 kB in 1s (547 kB/s) 866s Reading package lists... 867s autopkgtest [23:01:37]: upgrading testbed (apt dist-upgrade and autopurge) 867s Reading package lists... 867s Building dependency tree... 867s Reading state information... 868s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 868s Starting 2 pkgProblemResolver with broken count: 0 868s Done 868s Entering ResolveByKeep 868s 868s The following NEW packages will be installed: 868s linux-headers-5.15.0-136 linux-headers-5.15.0-136-generic 868s linux-image-5.15.0-136-generic linux-modules-5.15.0-136-generic 868s linux-modules-extra-5.15.0-136-generic 868s The following packages will be upgraded: 868s apt apt-utils libapt-pkg6.0 linux-generic linux-headers-generic 868s linux-headers-virtual linux-image-generic linux-image-virtual linux-virtual 868s 9 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. 868s Need to get 112 MB of archives. 868s After this operation, 613 MB of additional disk space will be used. 868s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el libapt-pkg6.0 ppc64el 2.4.14 [1030 kB] 869s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt ppc64el 2.4.14 [1407 kB] 869s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt-utils ppc64el 2.4.14 [236 kB] 869s Get:4 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-5.15.0-136-generic ppc64el 5.15.0-136.147 [22.0 MB] 869s Get:5 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-5.15.0-136-generic ppc64el 5.15.0-136.147 [11.5 MB] 870s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-extra-5.15.0-136-generic ppc64el 5.15.0-136.147 [60.3 MB] 871s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-generic ppc64el 5.15.0.136.134 [1700 B] 871s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-generic ppc64el 5.15.0.136.134 [2466 B] 871s Get:9 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-virtual ppc64el 5.15.0.136.134 [1676 B] 871s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-virtual ppc64el 5.15.0.136.134 [2464 B] 871s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-virtual ppc64el 5.15.0.136.134 [1634 B] 871s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136 all 5.15.0-136.147 [12.3 MB] 872s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136-generic ppc64el 5.15.0-136.147 [3208 kB] 872s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-generic ppc64el 5.15.0.136.134 [2364 B] 872s Fetched 112 MB in 3s (32.4 MB/s) 872s (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 ... 66539 files and directories currently installed.) 872s Preparing to unpack .../libapt-pkg6.0_2.4.14_ppc64el.deb ... 872s Unpacking libapt-pkg6.0:ppc64el (2.4.14) over (2.4.13) ... 872s Setting up libapt-pkg6.0:ppc64el (2.4.14) ... 872s (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 ... 66539 files and directories currently installed.) 872s Preparing to unpack .../apt_2.4.14_ppc64el.deb ... 872s Unpacking apt (2.4.14) over (2.4.13) ... 872s Setting up apt (2.4.14) ... 873s (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 ... 66539 files and directories currently installed.) 873s Preparing to unpack .../00-apt-utils_2.4.14_ppc64el.deb ... 873s Unpacking apt-utils (2.4.14) over (2.4.13) ... 873s Selecting previously unselected package linux-modules-5.15.0-136-generic. 873s Preparing to unpack .../01-linux-modules-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 873s Unpacking linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 874s Selecting previously unselected package linux-image-5.15.0-136-generic. 874s Preparing to unpack .../02-linux-image-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 874s Unpacking linux-image-5.15.0-136-generic (5.15.0-136.147) ... 874s Selecting previously unselected package linux-modules-extra-5.15.0-136-generic. 874s Preparing to unpack .../03-linux-modules-extra-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 874s Unpacking linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 876s Preparing to unpack .../04-linux-generic_5.15.0.136.134_ppc64el.deb ... 876s Unpacking linux-generic (5.15.0.136.134) over (5.15.0.135.133) ... 876s Preparing to unpack .../05-linux-image-generic_5.15.0.136.134_ppc64el.deb ... 876s Unpacking linux-image-generic (5.15.0.136.134) over (5.15.0.135.133) ... 876s Preparing to unpack .../06-linux-virtual_5.15.0.136.134_ppc64el.deb ... 876s Unpacking linux-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 876s Preparing to unpack .../07-linux-image-virtual_5.15.0.136.134_ppc64el.deb ... 876s Unpacking linux-image-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 876s Preparing to unpack .../08-linux-headers-virtual_5.15.0.136.134_ppc64el.deb ... 876s Unpacking linux-headers-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 876s Selecting previously unselected package linux-headers-5.15.0-136. 876s Preparing to unpack .../09-linux-headers-5.15.0-136_5.15.0-136.147_all.deb ... 876s Unpacking linux-headers-5.15.0-136 (5.15.0-136.147) ... 878s Selecting previously unselected package linux-headers-5.15.0-136-generic. 878s Preparing to unpack .../10-linux-headers-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 878s Unpacking linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 879s Preparing to unpack .../11-linux-headers-generic_5.15.0.136.134_ppc64el.deb ... 879s Unpacking linux-headers-generic (5.15.0.136.134) over (5.15.0.135.133) ... 879s Setting up apt-utils (2.4.14) ... 879s Setting up linux-headers-5.15.0-136 (5.15.0-136.147) ... 879s Setting up linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 879s Setting up linux-headers-generic (5.15.0.136.134) ... 879s Setting up linux-headers-virtual (5.15.0.136.134) ... 879s Setting up linux-image-5.15.0-136-generic (5.15.0-136.147) ... 880s I: /boot/vmlinux is now a symlink to vmlinux-5.15.0-136-generic 880s I: /boot/initrd.img is now a symlink to initrd.img-5.15.0-136-generic 880s Setting up linux-image-virtual (5.15.0.136.134) ... 880s Setting up linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 881s Setting up linux-virtual (5.15.0.136.134) ... 881s Setting up linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 883s Setting up linux-image-generic (5.15.0.136.134) ... 883s Setting up linux-generic (5.15.0.136.134) ... 883s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 883s Processing triggers for man-db (2.10.2-1) ... 883s Processing triggers for linux-image-5.15.0-136-generic (5.15.0-136.147) ... 883s /etc/kernel/postinst.d/initramfs-tools: 883s update-initramfs: Generating /boot/initrd.img-5.15.0-136-generic 883s No lz4 in /usr/bin:/sbin:/bin, using gzip 907s /etc/kernel/postinst.d/zz-update-grub: 907s Sourcing file `/etc/default/grub' 907s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 907s Sourcing file `/etc/default/grub.d/init-select.cfg' 907s Generating grub configuration file ... 907s Found linux image: /boot/vmlinux-5.15.0-136-generic 907s Found initrd image: /boot/initrd.img-5.15.0-136-generic 908s Found linux image: /boot/vmlinux-5.15.0-135-generic 908s Found initrd image: /boot/initrd.img-5.15.0-135-generic 908s Warning: os-prober will not be executed to detect other bootable partitions. 908s Systems on them will not be added to the GRUB boot configuration. 908s Check GRUB_DISABLE_OS_PROBER documentation entry. 908s done 909s Reading package lists... 910s Building dependency tree... 910s Reading state information... 910s Starting pkgProblemResolver with broken count: 0 910s Starting 2 pkgProblemResolver with broken count: 0 910s Done 910s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 910s autopkgtest [23:02:20]: rebooting testbed after setup commands that affected boot 948s Reading package lists... 948s Building dependency tree... 948s Reading state information... 948s Starting pkgProblemResolver with broken count: 0 948s Starting 2 pkgProblemResolver with broken count: 0 948s Done 948s The following NEW packages will be installed: 948s autoconf automake autopoint autotools-dev build-essential chiark-utils-bin 948s cpp cpp-11 debhelper debugedit devscripts dgit dgit-infrastructure 948s dh-autoreconf dh-strip-nondeterminism dput dwz fakeroot faketime g++ g++-11 948s gcc gcc-11 gcc-11-base gettext git git-buildpackage git-man intltool-debian 948s libarchive-zip-perl libasan6 libatomic1 libb-hooks-op-check-perl 948s libc-dev-bin libc6-dev libcc1-0 libcgi-pm-perl 948s libclass-method-modifiers-perl libclass-xsaccessor-perl libcrypt-dev 948s libdbd-sqlite3-perl libdbi-perl libdebhelper-perl libdevel-callchecker-perl 948s libdynaloader-functions-perl libencode-locale-perl liberror-perl 948s libexporter-tiny-perl libfakeroot libfaketime libfile-dirlist-perl 948s libfile-homedir-perl libfile-libmagic-perl libfile-listing-perl 948s libfile-stripnondeterminism-perl libfile-touch-perl libfile-which-perl 948s libgcc-11-dev libgomp1 libhtml-parser-perl libhtml-tagset-perl 948s libhtml-tree-perl libhttp-cookies-perl libhttp-date-perl 948s libhttp-message-perl libhttp-negotiate-perl libhttp-server-simple-perl 948s libhttp-server-simple-static-perl libimport-into-perl libio-html-perl 948s libio-pty-perl libio-socket-ssl-perl libipc-run-perl libisl23 libitm1 948s libjson-perl liblist-moreutils-perl liblist-moreutils-xs-perl liblsan0 948s liblwp-mediatypes-perl liblwp-protocol-https-perl libmodule-runtime-perl 948s libmoo-perl libmpc3 libnet-http-perl libnet-ssleay-perl libnsl-dev 948s libparams-classify-perl libquadmath0 librole-tiny-perl libstdc++-11-dev 948s libsub-override-perl libsub-quote-perl libtext-csv-perl libtext-glob-perl 948s libtimedate-perl libtirpc-dev libtool libtry-tiny-perl libtsan0 libubsan1 948s liburi-perl libwww-curl-perl libwww-perl libwww-robotrules-perl 948s linux-libc-dev m4 patchutils perl-openssl-defaults po-debconf 948s python3-dateutil python3-debian python3-gpg rpcsvc-proto sqlite3 wdiff 948s 0 upgraded, 116 newly installed, 0 to remove and 0 not upgraded. 948s Need to get 68.7 MB of archives. 948s After this operation, 262 MB of additional disk space will be used. 948s Get:1 http://ftpmaster.internal/ubuntu jammy/main ppc64el m4 ppc64el 1.4.18-5ubuntu2 [214 kB] 949s Get:2 http://ftpmaster.internal/ubuntu jammy/main ppc64el autoconf all 2.71-2 [338 kB] 949s Get:3 http://ftpmaster.internal/ubuntu jammy/main ppc64el autotools-dev all 20220109.1 [44.9 kB] 949s Get:4 http://ftpmaster.internal/ubuntu jammy/main ppc64el automake all 1:1.16.5-1.3 [558 kB] 949s Get:5 http://ftpmaster.internal/ubuntu jammy/main ppc64el autopoint all 0.21-4ubuntu4 [422 kB] 949s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc-dev-bin ppc64el 2.35-0ubuntu3.9 [21.4 kB] 949s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-libc-dev ppc64el 5.15.0-136.147 [1313 kB] 949s Get:8 http://ftpmaster.internal/ubuntu jammy/main ppc64el libcrypt-dev ppc64el 1:4.4.27-1 [142 kB] 949s Get:9 http://ftpmaster.internal/ubuntu jammy/main ppc64el rpcsvc-proto ppc64el 1.4.2-0ubuntu6 [82.3 kB] 949s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtirpc-dev ppc64el 1.3.2-2ubuntu0.1 [223 kB] 949s Get:11 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnsl-dev ppc64el 1.3.0-2build2 [80.0 kB] 949s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc6-dev ppc64el 2.35-0ubuntu3.9 [2053 kB] 949s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11-base ppc64el 11.4.0-1ubuntu1~22.04 [20.3 kB] 949s Get:14 http://ftpmaster.internal/ubuntu jammy/main ppc64el libisl23 ppc64el 0.24-2build1 [833 kB] 949s Get:15 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmpc3 ppc64el 1.2.1-2build1 [52.2 kB] 949s Get:16 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el cpp-11 ppc64el 11.4.0-1ubuntu1~22.04 [8800 kB] 949s Get:17 http://ftpmaster.internal/ubuntu jammy/main ppc64el cpp ppc64el 4:11.2.0-1ubuntu1 [27.7 kB] 949s Get:18 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libcc1-0 ppc64el 12.3.0-1ubuntu1~22.04 [49.5 kB] 949s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgomp1 ppc64el 12.3.0-1ubuntu1~22.04 [140 kB] 949s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libitm1 ppc64el 12.3.0-1ubuntu1~22.04 [32.9 kB] 949s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libatomic1 ppc64el 12.3.0-1ubuntu1~22.04 [10.6 kB] 949s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libasan6 ppc64el 11.4.0-1ubuntu1~22.04 [2303 kB] 950s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el liblsan0 ppc64el 12.3.0-1ubuntu1~22.04 [1090 kB] 950s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtsan0 ppc64el 11.4.0-1ubuntu1~22.04 [2278 kB] 950s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libubsan1 ppc64el 12.3.0-1ubuntu1~22.04 [1001 kB] 950s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libquadmath0 ppc64el 12.3.0-1ubuntu1~22.04 [156 kB] 950s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgcc-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [1477 kB] 950s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11 ppc64el 11.4.0-1ubuntu1~22.04 [17.7 MB] 950s Get:29 http://ftpmaster.internal/ubuntu jammy/main ppc64el gcc ppc64el 4:11.2.0-1ubuntu1 [5152 B] 950s Get:30 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libstdc++-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [2197 kB] 950s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el g++-11 ppc64el 11.4.0-1ubuntu1~22.04 [10.2 MB] 950s Get:32 http://ftpmaster.internal/ubuntu jammy/main ppc64el g++ ppc64el 4:11.2.0-1ubuntu1 [1408 B] 950s Get:33 http://ftpmaster.internal/ubuntu jammy/main ppc64el build-essential ppc64el 12.9ubuntu3 [4752 B] 950s Get:34 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 950s Get:35 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtool all 2.4.6-15build2 [164 kB] 950s Get:36 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-autoreconf all 20 [16.1 kB] 950s Get:37 http://ftpmaster.internal/ubuntu jammy/main ppc64el libarchive-zip-perl all 1.68-1 [90.2 kB] 950s Get:38 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-override-perl all 0.09-2 [9532 B] 950s Get:39 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 950s Get:40 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-strip-nondeterminism all 1.13.0-1 [5344 B] 950s Get:41 http://ftpmaster.internal/ubuntu jammy/main ppc64el debugedit ppc64el 1:5.0-4build1 [51.6 kB] 950s Get:42 http://ftpmaster.internal/ubuntu jammy/main ppc64el dwz ppc64el 0.14-1build2 [124 kB] 951s Get:43 http://ftpmaster.internal/ubuntu jammy/main ppc64el gettext ppc64el 0.21-4ubuntu4 [976 kB] 951s Get:44 http://ftpmaster.internal/ubuntu jammy/main ppc64el intltool-debian all 0.35.0+20060710.5 [24.9 kB] 951s Get:45 http://ftpmaster.internal/ubuntu jammy/main ppc64el po-debconf all 1.0.21+nmu1 [233 kB] 951s Get:46 http://ftpmaster.internal/ubuntu jammy/main ppc64el debhelper all 13.6ubuntu1 [923 kB] 951s Get:47 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfakeroot ppc64el 1.28-1ubuntu1 [33.8 kB] 951s Get:48 http://ftpmaster.internal/ubuntu jammy/main ppc64el fakeroot ppc64el 1.28-1ubuntu1 [62.8 kB] 951s Get:49 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-dirlist-perl all 0.05-2 [7100 B] 951s Get:50 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-which-perl all 1.23-1 [13.8 kB] 951s Get:51 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-homedir-perl all 1.006-1 [38.3 kB] 951s Get:52 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-touch-perl all 0.12-1 [9024 B] 951s Get:53 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-pty-perl ppc64el 1:1.15-2build2 [35.3 kB] 951s Get:54 http://ftpmaster.internal/ubuntu jammy/main ppc64el libipc-run-perl all 20200505.0-1 [89.8 kB] 951s Get:55 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 951s Get:56 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-xsaccessor-perl ppc64el 1.19-3build9 [36.6 kB] 951s Get:57 http://ftpmaster.internal/ubuntu jammy/main ppc64el libb-hooks-op-check-perl ppc64el 0.22-1build5 [10.4 kB] 951s Get:58 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 951s Get:59 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdevel-callchecker-perl ppc64el 0.008-1ubuntu4 [14.7 kB] 951s Get:60 http://ftpmaster.internal/ubuntu jammy/main ppc64el libparams-classify-perl ppc64el 0.015-1build5 [23.9 kB] 951s Get:61 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmodule-runtime-perl all 0.016-1 [16.2 kB] 951s Get:62 http://ftpmaster.internal/ubuntu jammy/main ppc64el libimport-into-perl all 1.002005-1 [11.0 kB] 951s Get:63 http://ftpmaster.internal/ubuntu jammy/main ppc64el librole-tiny-perl all 2.002004-1 [16.3 kB] 951s Get:64 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-quote-perl all 2.006006-1 [19.5 kB] 951s Get:65 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmoo-perl all 2.005004-3 [48.0 kB] 951s Get:66 http://ftpmaster.internal/ubuntu jammy/main ppc64el libencode-locale-perl all 1.05-1.1 [11.8 kB] 951s Get:67 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtimedate-perl all 2.3300-2 [34.0 kB] 951s Get:68 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-date-perl all 6.05-1 [9920 B] 951s Get:69 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-listing-perl all 6.14-1 [11.2 kB] 951s Get:70 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tagset-perl all 3.20-4 [12.5 kB] 951s Get:71 http://ftpmaster.internal/ubuntu jammy/main ppc64el liburi-perl all 5.10-1 [78.8 kB] 951s Get:72 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-parser-perl ppc64el 3.76-1build2 [93.6 kB] 951s Get:73 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tree-perl all 5.07-2 [200 kB] 951s Get:74 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-html-perl all 1.004-2 [15.4 kB] 951s Get:75 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 951s Get:76 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-message-perl all 6.36-1 [76.8 kB] 951s Get:77 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-cookies-perl all 6.10-1 [18.4 kB] 951s Get:78 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-negotiate-perl all 6.01-1 [12.5 kB] 951s Get:79 http://ftpmaster.internal/ubuntu jammy/main ppc64el perl-openssl-defaults ppc64el 5build2 [7540 B] 951s Get:80 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-ssleay-perl ppc64el 1.92-1build2 [332 kB] 951s Get:81 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-socket-ssl-perl all 2.074-2 [192 kB] 951s Get:82 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-http-perl all 6.22-1 [23.2 kB] 951s Get:83 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 951s Get:84 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtry-tiny-perl all 0.31-1 [21.8 kB] 951s Get:85 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-robotrules-perl all 6.02-1 [12.6 kB] 951s Get:86 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-perl all 6.61-1 [141 kB] 951s Get:87 http://ftpmaster.internal/ubuntu jammy/main ppc64el patchutils ppc64el 0.4.2-1build2 [86.6 kB] 951s Get:88 http://ftpmaster.internal/ubuntu jammy/main ppc64el wdiff ppc64el 1.2.2-2build3 [29.5 kB] 951s Get:89 http://ftpmaster.internal/ubuntu jammy/main ppc64el devscripts ppc64el 2.22.1ubuntu1 [1058 kB] 951s Get:90 http://ftpmaster.internal/ubuntu jammy/main ppc64el liberror-perl all 0.17029-1 [26.5 kB] 951s Get:91 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 951s Get:92 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git ppc64el 1:2.34.1-1ubuntu1.12 [4143 kB] 952s Get:93 http://ftpmaster.internal/ubuntu jammy/main ppc64el python3-dateutil all 2.8.1-6 [78.4 kB] 953s Get:94 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-buildpackage all 0.9.25 [799 kB] 953s Get:95 http://ftpmaster.internal/ubuntu jammy/main ppc64el libexporter-tiny-perl all 1.002002-1 [36.2 kB] 953s Get:96 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-xs-perl ppc64el 0.430-2build2 [42.5 kB] 953s Get:97 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-perl all 0.430-2 [38.2 kB] 953s Get:98 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-debian all 0.1.43ubuntu1.1 [107 kB] 953s Get:99 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-gpg ppc64el 1.16.0-1.2ubuntu4.2 [227 kB] 953s Get:100 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el dput all 1.1.0ubuntu2.1 [44.7 kB] 953s Get:101 http://ftpmaster.internal/ubuntu jammy/main ppc64el libjson-perl all 4.04000-1 [81.8 kB] 953s Get:102 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtext-glob-perl all 0.11-2 [8042 B] 953s Get:103 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libwww-curl-perl ppc64el 4.17-7build2 [72.5 kB] 953s Get:104 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libtext-csv-perl all 2.01-1 [108 kB] 953s Get:105 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit all 9.15 [194 kB] 953s Get:106 http://ftpmaster.internal/ubuntu jammy/main ppc64el libcgi-pm-perl all 4.54-1 [188 kB] 953s Get:107 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdbi-perl ppc64el 1.643-3build3 [748 kB] 953s Get:108 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libdbd-sqlite3-perl ppc64el 1.70-3build1 [172 kB] 953s Get:109 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfile-libmagic-perl ppc64el 1.23-1build2 [30.2 kB] 953s Get:110 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libhttp-server-simple-perl all 0.52-1.1 [23.2 kB] 953s Get:111 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libhttp-server-simple-static-perl all 0.14-1 [8896 B] 953s Get:112 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el sqlite3 ppc64el 3.37.2-2ubuntu0.3 [880 kB] 953s Get:113 http://ftpmaster.internal/ubuntu jammy/universe ppc64el chiark-utils-bin ppc64el 6.1.2+nmu1 [55.7 kB] 953s Get:114 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit-infrastructure all 9.15 [40.8 kB] 953s Get:115 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfaketime ppc64el 0.9.8-9 [35.9 kB] 953s Get:116 http://ftpmaster.internal/ubuntu jammy/universe ppc64el faketime ppc64el 0.9.8-9 [10.3 kB] 953s Fetched 68.7 MB in 4s (16.2 MB/s) 953s Selecting previously unselected package m4. 954s (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 ... 101007 files and directories currently installed.) 954s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_ppc64el.deb ... 954s Unpacking m4 (1.4.18-5ubuntu2) ... 954s Selecting previously unselected package autoconf. 954s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 954s Unpacking autoconf (2.71-2) ... 954s Selecting previously unselected package autotools-dev. 954s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 954s Unpacking autotools-dev (20220109.1) ... 954s Selecting previously unselected package automake. 954s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 954s Unpacking automake (1:1.16.5-1.3) ... 954s Selecting previously unselected package autopoint. 954s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 954s Unpacking autopoint (0.21-4ubuntu4) ... 954s Selecting previously unselected package libc-dev-bin. 954s Preparing to unpack .../005-libc-dev-bin_2.35-0ubuntu3.9_ppc64el.deb ... 954s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 954s Selecting previously unselected package linux-libc-dev:ppc64el. 954s Preparing to unpack .../006-linux-libc-dev_5.15.0-136.147_ppc64el.deb ... 954s Unpacking linux-libc-dev:ppc64el (5.15.0-136.147) ... 954s Selecting previously unselected package libcrypt-dev:ppc64el. 954s Preparing to unpack .../007-libcrypt-dev_1%3a4.4.27-1_ppc64el.deb ... 954s Unpacking libcrypt-dev:ppc64el (1:4.4.27-1) ... 954s Selecting previously unselected package rpcsvc-proto. 954s Preparing to unpack .../008-rpcsvc-proto_1.4.2-0ubuntu6_ppc64el.deb ... 954s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 954s Selecting previously unselected package libtirpc-dev:ppc64el. 954s Preparing to unpack .../009-libtirpc-dev_1.3.2-2ubuntu0.1_ppc64el.deb ... 954s Unpacking libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 954s Selecting previously unselected package libnsl-dev:ppc64el. 954s Preparing to unpack .../010-libnsl-dev_1.3.0-2build2_ppc64el.deb ... 954s Unpacking libnsl-dev:ppc64el (1.3.0-2build2) ... 954s Selecting previously unselected package libc6-dev:ppc64el. 954s Preparing to unpack .../011-libc6-dev_2.35-0ubuntu3.9_ppc64el.deb ... 954s Unpacking libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 954s Selecting previously unselected package gcc-11-base:ppc64el. 954s Preparing to unpack .../012-gcc-11-base_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 954s Unpacking gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 954s Selecting previously unselected package libisl23:ppc64el. 954s Preparing to unpack .../013-libisl23_0.24-2build1_ppc64el.deb ... 954s Unpacking libisl23:ppc64el (0.24-2build1) ... 954s Selecting previously unselected package libmpc3:ppc64el. 954s Preparing to unpack .../014-libmpc3_1.2.1-2build1_ppc64el.deb ... 954s Unpacking libmpc3:ppc64el (1.2.1-2build1) ... 954s Selecting previously unselected package cpp-11. 954s Preparing to unpack .../015-cpp-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 954s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 954s Selecting previously unselected package cpp. 954s Preparing to unpack .../016-cpp_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 954s Unpacking cpp (4:11.2.0-1ubuntu1) ... 955s Selecting previously unselected package libcc1-0:ppc64el. 955s Preparing to unpack .../017-libcc1-0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package libgomp1:ppc64el. 955s Preparing to unpack .../018-libgomp1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package libitm1:ppc64el. 955s Preparing to unpack .../019-libitm1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package libatomic1:ppc64el. 955s Preparing to unpack .../020-libatomic1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package libasan6:ppc64el. 955s Preparing to unpack .../021-libasan6_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package liblsan0:ppc64el. 955s Preparing to unpack .../022-liblsan0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package libtsan0:ppc64el. 955s Preparing to unpack .../023-libtsan0_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package libubsan1:ppc64el. 955s Preparing to unpack .../024-libubsan1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package libquadmath0:ppc64el. 955s Preparing to unpack .../025-libquadmath0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package libgcc-11-dev:ppc64el. 955s Preparing to unpack .../026-libgcc-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package gcc-11. 955s Preparing to unpack .../027-gcc-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package gcc. 955s Preparing to unpack .../028-gcc_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 955s Unpacking gcc (4:11.2.0-1ubuntu1) ... 955s Selecting previously unselected package libstdc++-11-dev:ppc64el. 955s Preparing to unpack .../029-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package g++-11. 955s Preparing to unpack .../030-g++-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 955s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 955s Selecting previously unselected package g++. 955s Preparing to unpack .../031-g++_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 955s Unpacking g++ (4:11.2.0-1ubuntu1) ... 955s Selecting previously unselected package build-essential. 955s Preparing to unpack .../032-build-essential_12.9ubuntu3_ppc64el.deb ... 955s Unpacking build-essential (12.9ubuntu3) ... 955s Selecting previously unselected package libdebhelper-perl. 955s Preparing to unpack .../033-libdebhelper-perl_13.6ubuntu1_all.deb ... 955s Unpacking libdebhelper-perl (13.6ubuntu1) ... 955s Selecting previously unselected package libtool. 955s Preparing to unpack .../034-libtool_2.4.6-15build2_all.deb ... 955s Unpacking libtool (2.4.6-15build2) ... 956s Selecting previously unselected package dh-autoreconf. 956s Preparing to unpack .../035-dh-autoreconf_20_all.deb ... 956s Unpacking dh-autoreconf (20) ... 956s Selecting previously unselected package libarchive-zip-perl. 956s Preparing to unpack .../036-libarchive-zip-perl_1.68-1_all.deb ... 956s Unpacking libarchive-zip-perl (1.68-1) ... 956s Selecting previously unselected package libsub-override-perl. 956s Preparing to unpack .../037-libsub-override-perl_0.09-2_all.deb ... 956s Unpacking libsub-override-perl (0.09-2) ... 956s Selecting previously unselected package libfile-stripnondeterminism-perl. 956s Preparing to unpack .../038-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 956s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 956s Selecting previously unselected package dh-strip-nondeterminism. 956s Preparing to unpack .../039-dh-strip-nondeterminism_1.13.0-1_all.deb ... 956s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 956s Selecting previously unselected package debugedit. 956s Preparing to unpack .../040-debugedit_1%3a5.0-4build1_ppc64el.deb ... 956s Unpacking debugedit (1:5.0-4build1) ... 956s Selecting previously unselected package dwz. 956s Preparing to unpack .../041-dwz_0.14-1build2_ppc64el.deb ... 956s Unpacking dwz (0.14-1build2) ... 956s Selecting previously unselected package gettext. 956s Preparing to unpack .../042-gettext_0.21-4ubuntu4_ppc64el.deb ... 956s Unpacking gettext (0.21-4ubuntu4) ... 956s Selecting previously unselected package intltool-debian. 956s Preparing to unpack .../043-intltool-debian_0.35.0+20060710.5_all.deb ... 956s Unpacking intltool-debian (0.35.0+20060710.5) ... 956s Selecting previously unselected package po-debconf. 956s Preparing to unpack .../044-po-debconf_1.0.21+nmu1_all.deb ... 956s Unpacking po-debconf (1.0.21+nmu1) ... 956s Selecting previously unselected package debhelper. 956s Preparing to unpack .../045-debhelper_13.6ubuntu1_all.deb ... 956s Unpacking debhelper (13.6ubuntu1) ... 956s Selecting previously unselected package libfakeroot:ppc64el. 956s Preparing to unpack .../046-libfakeroot_1.28-1ubuntu1_ppc64el.deb ... 956s Unpacking libfakeroot:ppc64el (1.28-1ubuntu1) ... 956s Selecting previously unselected package fakeroot. 956s Preparing to unpack .../047-fakeroot_1.28-1ubuntu1_ppc64el.deb ... 956s Unpacking fakeroot (1.28-1ubuntu1) ... 956s Selecting previously unselected package libfile-dirlist-perl. 956s Preparing to unpack .../048-libfile-dirlist-perl_0.05-2_all.deb ... 956s Unpacking libfile-dirlist-perl (0.05-2) ... 956s Selecting previously unselected package libfile-which-perl. 956s Preparing to unpack .../049-libfile-which-perl_1.23-1_all.deb ... 956s Unpacking libfile-which-perl (1.23-1) ... 956s Selecting previously unselected package libfile-homedir-perl. 956s Preparing to unpack .../050-libfile-homedir-perl_1.006-1_all.deb ... 956s Unpacking libfile-homedir-perl (1.006-1) ... 956s Selecting previously unselected package libfile-touch-perl. 956s Preparing to unpack .../051-libfile-touch-perl_0.12-1_all.deb ... 956s Unpacking libfile-touch-perl (0.12-1) ... 956s Selecting previously unselected package libio-pty-perl. 956s Preparing to unpack .../052-libio-pty-perl_1%3a1.15-2build2_ppc64el.deb ... 956s Unpacking libio-pty-perl (1:1.15-2build2) ... 956s Selecting previously unselected package libipc-run-perl. 956s Preparing to unpack .../053-libipc-run-perl_20200505.0-1_all.deb ... 956s Unpacking libipc-run-perl (20200505.0-1) ... 956s Selecting previously unselected package libclass-method-modifiers-perl. 956s Preparing to unpack .../054-libclass-method-modifiers-perl_2.13-1_all.deb ... 956s Unpacking libclass-method-modifiers-perl (2.13-1) ... 956s Selecting previously unselected package libclass-xsaccessor-perl. 956s Preparing to unpack .../055-libclass-xsaccessor-perl_1.19-3build9_ppc64el.deb ... 956s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 956s Selecting previously unselected package libb-hooks-op-check-perl. 956s Preparing to unpack .../056-libb-hooks-op-check-perl_0.22-1build5_ppc64el.deb ... 956s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 956s Selecting previously unselected package libdynaloader-functions-perl. 956s Preparing to unpack .../057-libdynaloader-functions-perl_0.003-1.1_all.deb ... 956s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 956s Selecting previously unselected package libdevel-callchecker-perl. 956s Preparing to unpack .../058-libdevel-callchecker-perl_0.008-1ubuntu4_ppc64el.deb ... 956s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 956s Selecting previously unselected package libparams-classify-perl. 956s Preparing to unpack .../059-libparams-classify-perl_0.015-1build5_ppc64el.deb ... 956s Unpacking libparams-classify-perl (0.015-1build5) ... 956s Selecting previously unselected package libmodule-runtime-perl. 956s Preparing to unpack .../060-libmodule-runtime-perl_0.016-1_all.deb ... 956s Unpacking libmodule-runtime-perl (0.016-1) ... 956s Selecting previously unselected package libimport-into-perl. 956s Preparing to unpack .../061-libimport-into-perl_1.002005-1_all.deb ... 956s Unpacking libimport-into-perl (1.002005-1) ... 956s Selecting previously unselected package librole-tiny-perl. 956s Preparing to unpack .../062-librole-tiny-perl_2.002004-1_all.deb ... 956s Unpacking librole-tiny-perl (2.002004-1) ... 956s Selecting previously unselected package libsub-quote-perl. 956s Preparing to unpack .../063-libsub-quote-perl_2.006006-1_all.deb ... 956s Unpacking libsub-quote-perl (2.006006-1) ... 956s Selecting previously unselected package libmoo-perl. 956s Preparing to unpack .../064-libmoo-perl_2.005004-3_all.deb ... 956s Unpacking libmoo-perl (2.005004-3) ... 956s Selecting previously unselected package libencode-locale-perl. 956s Preparing to unpack .../065-libencode-locale-perl_1.05-1.1_all.deb ... 956s Unpacking libencode-locale-perl (1.05-1.1) ... 956s Selecting previously unselected package libtimedate-perl. 956s Preparing to unpack .../066-libtimedate-perl_2.3300-2_all.deb ... 956s Unpacking libtimedate-perl (2.3300-2) ... 956s Selecting previously unselected package libhttp-date-perl. 956s Preparing to unpack .../067-libhttp-date-perl_6.05-1_all.deb ... 956s Unpacking libhttp-date-perl (6.05-1) ... 956s Selecting previously unselected package libfile-listing-perl. 956s Preparing to unpack .../068-libfile-listing-perl_6.14-1_all.deb ... 956s Unpacking libfile-listing-perl (6.14-1) ... 956s Selecting previously unselected package libhtml-tagset-perl. 956s Preparing to unpack .../069-libhtml-tagset-perl_3.20-4_all.deb ... 956s Unpacking libhtml-tagset-perl (3.20-4) ... 956s Selecting previously unselected package liburi-perl. 956s Preparing to unpack .../070-liburi-perl_5.10-1_all.deb ... 956s Unpacking liburi-perl (5.10-1) ... 956s Selecting previously unselected package libhtml-parser-perl:ppc64el. 956s Preparing to unpack .../071-libhtml-parser-perl_3.76-1build2_ppc64el.deb ... 956s Unpacking libhtml-parser-perl:ppc64el (3.76-1build2) ... 956s Selecting previously unselected package libhtml-tree-perl. 956s Preparing to unpack .../072-libhtml-tree-perl_5.07-2_all.deb ... 956s Unpacking libhtml-tree-perl (5.07-2) ... 956s Selecting previously unselected package libio-html-perl. 956s Preparing to unpack .../073-libio-html-perl_1.004-2_all.deb ... 956s Unpacking libio-html-perl (1.004-2) ... 956s Selecting previously unselected package liblwp-mediatypes-perl. 956s Preparing to unpack .../074-liblwp-mediatypes-perl_6.04-1_all.deb ... 956s Unpacking liblwp-mediatypes-perl (6.04-1) ... 956s Selecting previously unselected package libhttp-message-perl. 956s Preparing to unpack .../075-libhttp-message-perl_6.36-1_all.deb ... 956s Unpacking libhttp-message-perl (6.36-1) ... 956s Selecting previously unselected package libhttp-cookies-perl. 956s Preparing to unpack .../076-libhttp-cookies-perl_6.10-1_all.deb ... 956s Unpacking libhttp-cookies-perl (6.10-1) ... 956s Selecting previously unselected package libhttp-negotiate-perl. 956s Preparing to unpack .../077-libhttp-negotiate-perl_6.01-1_all.deb ... 956s Unpacking libhttp-negotiate-perl (6.01-1) ... 956s Selecting previously unselected package perl-openssl-defaults:ppc64el. 956s Preparing to unpack .../078-perl-openssl-defaults_5build2_ppc64el.deb ... 956s Unpacking perl-openssl-defaults:ppc64el (5build2) ... 956s Selecting previously unselected package libnet-ssleay-perl:ppc64el. 956s Preparing to unpack .../079-libnet-ssleay-perl_1.92-1build2_ppc64el.deb ... 956s Unpacking libnet-ssleay-perl:ppc64el (1.92-1build2) ... 956s Selecting previously unselected package libio-socket-ssl-perl. 956s Preparing to unpack .../080-libio-socket-ssl-perl_2.074-2_all.deb ... 956s Unpacking libio-socket-ssl-perl (2.074-2) ... 957s Selecting previously unselected package libnet-http-perl. 957s Preparing to unpack .../081-libnet-http-perl_6.22-1_all.deb ... 957s Unpacking libnet-http-perl (6.22-1) ... 957s Selecting previously unselected package liblwp-protocol-https-perl. 957s Preparing to unpack .../082-liblwp-protocol-https-perl_6.10-1_all.deb ... 957s Unpacking liblwp-protocol-https-perl (6.10-1) ... 957s Selecting previously unselected package libtry-tiny-perl. 957s Preparing to unpack .../083-libtry-tiny-perl_0.31-1_all.deb ... 957s Unpacking libtry-tiny-perl (0.31-1) ... 957s Selecting previously unselected package libwww-robotrules-perl. 957s Preparing to unpack .../084-libwww-robotrules-perl_6.02-1_all.deb ... 957s Unpacking libwww-robotrules-perl (6.02-1) ... 957s Selecting previously unselected package libwww-perl. 957s Preparing to unpack .../085-libwww-perl_6.61-1_all.deb ... 957s Unpacking libwww-perl (6.61-1) ... 957s Selecting previously unselected package patchutils. 957s Preparing to unpack .../086-patchutils_0.4.2-1build2_ppc64el.deb ... 957s Unpacking patchutils (0.4.2-1build2) ... 957s Selecting previously unselected package wdiff. 957s Preparing to unpack .../087-wdiff_1.2.2-2build3_ppc64el.deb ... 957s Unpacking wdiff (1.2.2-2build3) ... 957s Selecting previously unselected package devscripts. 957s Preparing to unpack .../088-devscripts_2.22.1ubuntu1_ppc64el.deb ... 957s Unpacking devscripts (2.22.1ubuntu1) ... 957s Selecting previously unselected package liberror-perl. 957s Preparing to unpack .../089-liberror-perl_0.17029-1_all.deb ... 957s Unpacking liberror-perl (0.17029-1) ... 957s Selecting previously unselected package git-man. 957s Preparing to unpack .../090-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 957s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 957s Selecting previously unselected package git. 957s Preparing to unpack .../091-git_1%3a2.34.1-1ubuntu1.12_ppc64el.deb ... 957s Unpacking git (1:2.34.1-1ubuntu1.12) ... 957s Selecting previously unselected package python3-dateutil. 957s Preparing to unpack .../092-python3-dateutil_2.8.1-6_all.deb ... 957s Unpacking python3-dateutil (2.8.1-6) ... 957s Selecting previously unselected package git-buildpackage. 957s Preparing to unpack .../093-git-buildpackage_0.9.25_all.deb ... 957s Unpacking git-buildpackage (0.9.25) ... 957s Selecting previously unselected package libexporter-tiny-perl. 957s Preparing to unpack .../094-libexporter-tiny-perl_1.002002-1_all.deb ... 957s Unpacking libexporter-tiny-perl (1.002002-1) ... 957s Selecting previously unselected package liblist-moreutils-xs-perl. 957s Preparing to unpack .../095-liblist-moreutils-xs-perl_0.430-2build2_ppc64el.deb ... 957s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 957s Selecting previously unselected package liblist-moreutils-perl. 957s Preparing to unpack .../096-liblist-moreutils-perl_0.430-2_all.deb ... 957s Unpacking liblist-moreutils-perl (0.430-2) ... 957s Selecting previously unselected package python3-debian. 957s Preparing to unpack .../097-python3-debian_0.1.43ubuntu1.1_all.deb ... 957s Unpacking python3-debian (0.1.43ubuntu1.1) ... 957s Selecting previously unselected package python3-gpg. 957s Preparing to unpack .../098-python3-gpg_1.16.0-1.2ubuntu4.2_ppc64el.deb ... 957s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 957s Selecting previously unselected package dput. 957s Preparing to unpack .../099-dput_1.1.0ubuntu2.1_all.deb ... 957s Unpacking dput (1.1.0ubuntu2.1) ... 957s Selecting previously unselected package libjson-perl. 957s Preparing to unpack .../100-libjson-perl_4.04000-1_all.deb ... 957s Unpacking libjson-perl (4.04000-1) ... 957s Selecting previously unselected package libtext-glob-perl. 957s Preparing to unpack .../101-libtext-glob-perl_0.11-2_all.deb ... 957s Unpacking libtext-glob-perl (0.11-2) ... 957s Selecting previously unselected package libwww-curl-perl. 957s Preparing to unpack .../102-libwww-curl-perl_4.17-7build2_ppc64el.deb ... 957s Unpacking libwww-curl-perl (4.17-7build2) ... 957s Selecting previously unselected package libtext-csv-perl. 957s Preparing to unpack .../103-libtext-csv-perl_2.01-1_all.deb ... 957s Unpacking libtext-csv-perl (2.01-1) ... 957s Selecting previously unselected package dgit. 957s Preparing to unpack .../104-dgit_9.15_all.deb ... 957s Unpacking dgit (9.15) ... 957s Selecting previously unselected package libcgi-pm-perl. 957s Preparing to unpack .../105-libcgi-pm-perl_4.54-1_all.deb ... 957s Unpacking libcgi-pm-perl (4.54-1) ... 957s Selecting previously unselected package libdbi-perl:ppc64el. 957s Preparing to unpack .../106-libdbi-perl_1.643-3build3_ppc64el.deb ... 957s Unpacking libdbi-perl:ppc64el (1.643-3build3) ... 957s Selecting previously unselected package libdbd-sqlite3-perl:ppc64el. 957s Preparing to unpack .../107-libdbd-sqlite3-perl_1.70-3build1_ppc64el.deb ... 957s Unpacking libdbd-sqlite3-perl:ppc64el (1.70-3build1) ... 957s Selecting previously unselected package libfile-libmagic-perl. 957s Preparing to unpack .../108-libfile-libmagic-perl_1.23-1build2_ppc64el.deb ... 957s Unpacking libfile-libmagic-perl (1.23-1build2) ... 957s Selecting previously unselected package libhttp-server-simple-perl. 957s Preparing to unpack .../109-libhttp-server-simple-perl_0.52-1.1_all.deb ... 957s Unpacking libhttp-server-simple-perl (0.52-1.1) ... 957s Selecting previously unselected package libhttp-server-simple-static-perl. 957s Preparing to unpack .../110-libhttp-server-simple-static-perl_0.14-1_all.deb ... 957s Unpacking libhttp-server-simple-static-perl (0.14-1) ... 957s Selecting previously unselected package sqlite3. 957s Preparing to unpack .../111-sqlite3_3.37.2-2ubuntu0.3_ppc64el.deb ... 957s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 957s Selecting previously unselected package chiark-utils-bin. 957s Preparing to unpack .../112-chiark-utils-bin_6.1.2+nmu1_ppc64el.deb ... 957s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 958s Selecting previously unselected package dgit-infrastructure. 958s Preparing to unpack .../113-dgit-infrastructure_9.15_all.deb ... 958s Unpacking dgit-infrastructure (9.15) ... 958s Selecting previously unselected package libfaketime:ppc64el. 958s Preparing to unpack .../114-libfaketime_0.9.8-9_ppc64el.deb ... 958s Unpacking libfaketime:ppc64el (0.9.8-9) ... 958s Selecting previously unselected package faketime. 958s Preparing to unpack .../115-faketime_0.9.8-9_ppc64el.deb ... 958s Unpacking faketime (0.9.8-9) ... 958s Setting up wdiff (1.2.2-2build3) ... 958s Setting up gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 958s Setting up libfile-which-perl (1.23-1) ... 958s Setting up libdynaloader-functions-perl (0.003-1.1) ... 958s Setting up libtext-glob-perl (0.11-2) ... 958s Setting up libclass-method-modifiers-perl (2.13-1) ... 958s Setting up libio-pty-perl (1:1.15-2build2) ... 958s Setting up libarchive-zip-perl (1.68-1) ... 958s Setting up libhtml-tagset-perl (3.20-4) ... 958s Setting up libdebhelper-perl (13.6ubuntu1) ... 958s Setting up liblwp-mediatypes-perl (6.04-1) ... 958s Setting up libtry-tiny-perl (0.31-1) ... 958s Setting up perl-openssl-defaults:ppc64el (5build2) ... 958s Setting up linux-libc-dev:ppc64el (5.15.0-136.147) ... 958s Setting up m4 (1.4.18-5ubuntu2) ... 958s Setting up libwww-curl-perl (4.17-7build2) ... 958s Setting up libencode-locale-perl (1.05-1.1) ... 958s Setting up libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 958s Setting up libfakeroot:ppc64el (1.28-1ubuntu1) ... 958s Setting up libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 958s Setting up chiark-utils-bin (6.1.2+nmu1) ... 958s Setting up fakeroot (1.28-1ubuntu1) ... 958s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 958s Setting up liberror-perl (0.17029-1) ... 958s Setting up patchutils (0.4.2-1build2) ... 958s Setting up autotools-dev (20220109.1) ... 958s Setting up libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 958s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 958s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 958s Setting up python3-debian (0.1.43ubuntu1.1) ... 958s Setting up libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 958s Setting up libmpc3:ppc64el (1.2.1-2build1) ... 958s Setting up libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 958s Setting up libio-html-perl (1.004-2) ... 958s Setting up autopoint (0.21-4ubuntu4) ... 958s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 958s Setting up libipc-run-perl (20200505.0-1) ... 958s Setting up libfile-libmagic-perl (1.23-1build2) ... 958s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 958s Setting up autoconf (2.71-2) ... 958s Setting up libtimedate-perl (2.3300-2) ... 958s Setting up libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 958s Setting up dwz (0.14-1build2) ... 958s Setting up libnsl-dev:ppc64el (1.3.0-2build2) ... 958s Setting up libcrypt-dev:ppc64el (1:4.4.27-1) ... 958s Setting up libjson-perl (4.04000-1) ... 958s Setting up librole-tiny-perl (2.002004-1) ... 958s Setting up debugedit (1:5.0-4build1) ... 958s Setting up libsub-override-perl (0.09-2) ... 958s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 958s Setting up python3-dateutil (2.8.1-6) ... 958s Setting up libsub-quote-perl (2.006006-1) ... 958s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 958s Setting up libexporter-tiny-perl (1.002002-1) ... 958s Setting up libfile-dirlist-perl (0.05-2) ... 958s Setting up libisl23:ppc64el (0.24-2build1) ... 958s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 958s Setting up libfile-homedir-perl (1.006-1) ... 958s Setting up libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 958s Setting up liburi-perl (5.10-1) ... 958s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 958s Setting up libfile-touch-perl (0.12-1) ... 958s Setting up libdbi-perl:ppc64el (1.643-3build3) ... 958s Setting up liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 958s Setting up libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 958s Setting up libfaketime:ppc64el (0.9.8-9) ... 958s Setting up libtext-csv-perl (2.01-1) ... 958s Setting up libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 958s Setting up libnet-ssleay-perl:ppc64el (1.92-1build2) ... 958s Setting up automake (1:1.16.5-1.3) ... 958s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 958s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 958s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 958s Setting up faketime (0.9.8-9) ... 958s Setting up libhttp-date-perl (6.05-1) ... 958s Setting up gettext (0.21-4ubuntu4) ... 958s Setting up libfile-listing-perl (6.14-1) ... 958s Setting up liblist-moreutils-perl (0.430-2) ... 958s Setting up libnet-http-perl (6.22-1) ... 958s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 958s Setting up dput (1.1.0ubuntu2.1) ... 958s Setting up intltool-debian (0.35.0+20060710.5) ... 958s Setting up git (1:2.34.1-1ubuntu1.12) ... 958s Setting up dh-strip-nondeterminism (1.13.0-1) ... 958s Setting up libwww-robotrules-perl (6.02-1) ... 958s Setting up libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 958s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 958s Setting up cpp (4:11.2.0-1ubuntu1) ... 958s Setting up libhtml-parser-perl:ppc64el (3.76-1build2) ... 958s Setting up libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 958s Setting up libdbd-sqlite3-perl:ppc64el (1.70-3build1) ... 958s Setting up libio-socket-ssl-perl (2.074-2) ... 958s Setting up libhttp-message-perl (6.36-1) ... 958s Setting up libhttp-negotiate-perl (6.01-1) ... 958s Setting up libhttp-cookies-perl (6.10-1) ... 958s Setting up libtool (2.4.6-15build2) ... 958s Setting up po-debconf (1.0.21+nmu1) ... 958s Setting up libhtml-tree-perl (5.07-2) ... 958s Setting up libparams-classify-perl (0.015-1build5) ... 958s Setting up libcgi-pm-perl (4.54-1) ... 958s Setting up gcc (4:11.2.0-1ubuntu1) ... 958s Setting up dh-autoreconf (20) ... 958s Setting up libmodule-runtime-perl (0.016-1) ... 958s Setting up libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 958s Setting up dgit-infrastructure (9.15) ... 958s Setting up libhttp-server-simple-perl (0.52-1.1) ... 958s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 958s Setting up libhttp-server-simple-static-perl (0.14-1) ... 958s Setting up libimport-into-perl (1.002005-1) ... 958s Setting up libmoo-perl (2.005004-3) ... 958s Setting up debhelper (13.6ubuntu1) ... 958s Setting up g++ (4:11.2.0-1ubuntu1) ... 958s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 958s Setting up build-essential (12.9ubuntu3) ... 958s Setting up liblwp-protocol-https-perl (6.10-1) ... 958s Setting up libwww-perl (6.61-1) ... 958s Setting up devscripts (2.22.1ubuntu1) ... 958s Setting up git-buildpackage (0.9.25) ... 959s Setting up dgit (9.15) ... 959s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 959s Processing triggers for man-db (2.10.2-1) ... 959s Processing triggers for install-info (6.8-4build1) ... 964s autopkgtest [23:03:14]: test alternating-dgit: [----------------------- 964s ++ set -o pipefail 964s ++ . tests/lib-core 964s ++ . tests/lib-restricts 964s ++ trap ' 964s rc=$? 964s set +x 964s test $rc = 0 || echo " 964s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 964s 964s Most relevant logs are just before assignment rc=$rc 964s Will now do cleanup etc. 964s " 964s set -x 964s set +e 964s pwd 964s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 964s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 964s set -e 964s test $rc = 0 || t-report-failure 964s ' EXIT 964s ++ t-filter-out-git-hyphen-dir 964s ++ local pathent 964s +++ type -p git-rev-parse 964s +++ : 964s ++ pathent= 964s ++ case "$pathent" in 964s ++ return 964s ++ t-set-intree 964s ++ '[' x = x ']' 964s ++ return 964s ++ : -D 964s ++ export DGIT_TEST_DEBUG 964s ++ : x 964s ++ export DGIT_TEST_DEBPUSH_DEBUG 964s ++ : 964s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 964s ++ GIT_COMMITTER_DATE='1530000000 +0100' 964s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 964s ++ GIT_AUTHOR_DATE='1530000000 +0100' 964s ++ export LC_CTYPE=C.UTF-8 964s ++ LC_CTYPE=C.UTF-8 964s ++ unset CDPATH 964s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 964s ++ FILTER_BRANCH_SQUELCH_WARNING=1 964s +++ pwd 964s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 964s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 964s ++ testname=alternating-dgit 964s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 964s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 964s ++ bpd=.. 964s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 964s ++ '[' x '!=' x ']' 964s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s +++ pwd 964s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ t-set-using-tmp 964s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 964s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 964s ++ export 'DEBFULLNAME=dgit test git user' 964s ++ DEBFULLNAME='dgit test git user' 964s ++ git config --global user.email dgit-test@debian.example.net 964s ++ git config --global user.name 'dgit test git user' 964s ++ git config --global protocol.ext.allow always 964s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 964s ++ env -0 964s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 964s ++ export DEBCHANGE_VENDOR=dpkg 964s ++ DEBCHANGE_VENDOR=dpkg 964s ++ unset VISUAL 964s ++ unset GIT_EDITOR 964s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 964s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 964s ++ cat 964s ++ schroot=build 964s ++ : aq 964s ++ : archive/test-dummy 964s ++ : sid:unstable 964s ++ t-git-config dgit.default.old-dsc-distro test-dummy 964s ++ git config --global dgit.default.old-dsc-distro test-dummy 964s ++ for import in ${autoimport-gnupg} 964s ++ case "$0" in 964s ++ t-setup-import gnupg 964s ++ local setupname=gnupg 964s ++ local setupsrc 964s ++ local lock 964s ++ '[' x = x ']' 964s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 964s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 964s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 964s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 964s cd "$1"; shift 964s setupname="$1"; shift 964s simport="$1"; shift 964s if [ -e "$simport" ]; then exit 0; fi 964s env - "$@" \ 964s "tests/setup/$setupname" 964s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 964s + cd /tmp/autopkgtest.XK8uun/build.980/src 964s + shift 964s + setupname=gnupg 964s + shift 964s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 964s + shift 964s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 964s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/alternating-dgit-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/alternating-dgit-stderr --stdout=/tmp/autopkgtest.XK8uun/alternating-dgit-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/alternating-dgit -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/alternating-dgit' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/alternating-dgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 964s ++ set -o pipefail 964s ++ . tests/lib-core 964s ++ . tests/lib-restricts 964s ++ trap ' 964s rc=$? 964s set +x 964s test $rc = 0 || echo " 964s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 964s 964s Most relevant logs are just before assignment rc=$rc 964s Will now do cleanup etc. 964s " 964s set -x 964s set +e 964s pwd 964s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 964s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 964s set -e 964s test $rc = 0 || t-report-failure 964s ' EXIT 964s ++ t-filter-out-git-hyphen-dir 964s ++ local pathent 964s +++ type -p git-rev-parse 964s +++ : 964s ++ pathent= 964s ++ case "$pathent" in 964s ++ return 964s ++ t-set-intree 964s ++ '[' x = x ']' 964s ++ return 964s ++ : -D 964s ++ export DGIT_TEST_DEBUG 964s ++ : x 964s ++ export DGIT_TEST_DEBPUSH_DEBUG 964s ++ : 964s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 964s ++ GIT_COMMITTER_DATE='1530000000 +0100' 964s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 964s ++ GIT_AUTHOR_DATE='1530000000 +0100' 964s ++ export LC_CTYPE=C.UTF-8 964s ++ LC_CTYPE=C.UTF-8 964s ++ unset CDPATH 964s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 964s ++ FILTER_BRANCH_SQUELCH_WARNING=1 964s +++ pwd 964s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 964s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 964s ++ testname=gnupg 964s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 964s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 964s ++ bpd=.. 964s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 964s ++ '[' x '!=' x ']' 964s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s +++ pwd 964s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ t-set-using-tmp 964s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 964s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 964s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 964s ++ export 'DEBFULLNAME=dgit test git user' 964s ++ DEBFULLNAME='dgit test git user' 964s ++ git config --global user.email dgit-test@debian.example.net 964s ++ git config --global user.name 'dgit test git user' 964s ++ git config --global protocol.ext.allow always 964s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 964s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 964s ++ export DEBCHANGE_VENDOR=dpkg 964s ++ DEBCHANGE_VENDOR=dpkg 964s ++ unset VISUAL 964s ++ unset GIT_EDITOR 964s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 964s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 964s ++ cat 964s ++ schroot=build 964s ++ : aq 964s ++ : archive/test-dummy 964s ++ : sid:unstable 964s ++ t-git-config dgit.default.old-dsc-distro test-dummy 964s ++ git config --global dgit.default.old-dsc-distro test-dummy 964s ++ for import in ${autoimport-gnupg} 964s ++ case "$0" in 964s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 964s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 964s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 964s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 964s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 964s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 964s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 964s + setup=' 964s export GNUPGHOME=$tmp/gnupg 964s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 964s 964s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 964s ssb rsa2048 2013-11-17 [E] 964s 964s sec rsa2048 2014-01-26 [SC] 964s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 964s uid [ultimate] Populus Romanus (test key) 964s ssb rsa2048 2014-01-26 [E] 964s 964s sec rsa2048 2014-01-26 [SC] 964s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 964s uid [ unknown] Hannibal (test key) 964s ssb rsa2048 2014-01-26 [E] 964s 964s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 964s export GNUPGHOME=$tmp/gnupg 964s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 964s 964s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 965s "sha256sum" => "$2", 965s "component" => "$3", 965s "filename" => "$4", 965s }; 965s END { 965s my $json = JSON->new->canonical(); 965s print $json->encode(\@v) or die $!; 965s } 965s ' 965s + t-aq-archive-updated new example 965s + local suite=new 965s + local p=example 965s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 965s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 965s + perl -wne ' 965s use JSON; 965s use strict; 965s our @v; 965s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 965s push @v, { 965s "version" => "$1", 965s "sha256sum" => "$2", 965s "component" => "$3", 965s "filename" => "$4", 965s }; 965s END { 965s my $json = JSON->new->canonical(); 965s print $json->encode(\@v) or die $!; 965s } 965s ' 965s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 965s + cat 965s + jsondelim=' },' 965s + for suitespec in $suitespecs 965s + local suite=stable 965s + local sname=stable 965s + t-aq-archive-updated stable example 965s + local suite=stable 965s + local p=example 965s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 965s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 965s + perl -wne ' 965s use JSON; 965s use strict; 965s our @v; 965s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 965s push @v, { 965s "version" => "$1", 965s "sha256sum" => "$2", 965s "component" => "$3", 965s "filename" => "$4", 965s }; 965s END { 965s my $json = JSON->new->canonical(); 965s print $json->encode(\@v) or die $!; 965s } 965s ' 965s + t-aq-archive-updated new example 965s + local suite=new 965s + local p=example 965s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 965s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 965s + perl -wne ' 965s use JSON; 965s use strict; 965s our @v; 965s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 965s push @v, { 965s "version" => "$1", 965s "sha256sum" => "$2", 965s "component" => "$3", 965s "filename" => "$4", 965s }; 965s END { 965s my $json = JSON->new->canonical(); 965s print $json->encode(\@v) or die $!; 965s } 965s ' 965s + ln -sf stable /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 965s + cat 965s + jsondelim=' },' 965s + for suitespec in $suitespecs 965s + local suite=testing 965s + local sname=testing 965s + t-aq-archive-updated testing example 965s + local suite=testing 965s + local p=example 965s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/testing 965s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/testing 965s + perl -wne ' 965s use JSON; 965s use strict; 965s our @v; 965s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 965s push @v, { 965s "version" => "$1", 965s "sha256sum" => "$2", 965s "component" => "$3", 965s "filename" => "$4", 965s }; 965s END { 965s my $json = JSON->new->canonical(); 965s print $json->encode(\@v) or die $!; 965s } 965s ' 965s + t-aq-archive-updated new example 965s + local suite=new 965s + local p=example 965s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 965s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 965s + perl -wne ' 965s use JSON; 965s use strict; 965s our @v; 965s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 965s push @v, { 965s "version" => "$1", 965s "sha256sum" => "$2", 965s "component" => "$3", 965s "filename" => "$4", 965s }; 965s END { 965s my $json = JSON->new->canonical(); 965s print $json->encode(\@v) or die $!; 965s } 965s ' 965s + ln -sf testing /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/testing 965s + cat 965s + jsondelim=' },' 965s + cat 965s + t-git-none 965s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 965s + set -e 965s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 965s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 965s + t-worktree 1.0 965s + rm -rf example 965s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0 965s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.tar 965s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.edit 965s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.edit 965s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.0.tar 965s + cd example 965s + git show-ref --verify --quiet refs/heads/master 965s + cd .. 965s + cd example 965s + revision=1 965s + echo ancestor 965s + git add which 965s + t-commit Ancestor '' stable 965s + local msg=Ancestor 965s + v=1.1 965s + t-debchange --force-distribution -v1.1 --distribution stable Ancestor 965s + DEBEMAIL=dgit-tests@example.org 965s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v1.1 --distribution stable Ancestor 965s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v1.1 --distribution stable Ancestor 965s debchange warning: Unable to determine if stable is a valid Ubuntu release. 965s libdistro-info-perl is not installed, Debian release names are not known. 965s libdistro-info-perl is not installed, Ubuntu release names are not known. 965s + git add debian/changelog 965s + debcommit 965s git commit -m Ancestor 965s [master 6ede489] Ancestor 965s 2 files changed, 7 insertions(+) 965s create mode 100644 which 965s + revision=2 965s + push-to master stable 965s + t-refs-same-start 965s + unset t_ref_val 965s + t_ref_names=() 965s + t-ref-head 965s + local val 965s ++ git rev-parse HEAD 965s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 965s + t-ref-same-val HEAD 6ede489d12a09dd148d1f78c3a2179afddf29843 965s + local name=HEAD 965s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 965s + case "${t_ref_val-unset}" in 965s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 965s + t_ref_names+=("$name") 965s + t-dgit build 965s + local dgit=dgit 965s + pwd 965s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 965s + : ' 965s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 965s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 965s | git rev-parse --show-toplevel 965s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 965s | git config -z --get-regexp --local '.*' 965s | git config -z --get-regexp --local '.*' 965s | git config -z --get-regexp --global '.*' 965s | git config -z --get-regexp --system '.*' 965s format , quilt mode linear 965s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 965s warning: could not open directory 'debian/source/': No such file or directory 965s => `' 965s + git diff --quiet HEAD 965s massage split -F. 965s massage done 3 -b. 965s format , quilt mode linear 965s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 965s warning: could not open directory 'debian/source/': No such file or directory 965s => `' 965s + git diff --quiet HEAD 965s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 965s dpkg-buildpackage: info: source package example 965s dpkg-buildpackage: info: source version 1.1 965s dpkg-buildpackage: info: source distribution stable 965s dpkg-buildpackage: info: source changed by dgit test git user 965s fakeroot debian/rules clean 965s EXAMPLE RULES TARGET clean 965s dh_clean 965s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 965s | git clean -dn 965s => `' 965s | git rev-parse 'HEAD~0' 965s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 965s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 965s CD work 965s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 965s + git reset -q --hard 6ede489d12a09dd148d1f78c3a2179afddf29843 965s CD .. 965s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 966s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 966s dpkg-source: warning: source directory 'work' is not - 'example-1.1' 966s dpkg-source: info: using source format '1.0' 966s dpkg-source: info: building example in example_1.1.tar.gz 966s dpkg-source: info: building example in example_1.1.dsc 966s CD work 966s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 966s package seems new, not specifying -v 966s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.1_source.changes dpkg-genchanges -S 966s dpkg-genchanges: info: including full source code in upload 966s CD .. 966s moving example_1.1.dsc, example_1.1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 966s renaming (Files) example_1.1.tar.gz 966s renaming (dsc) example_1.1.dsc 966s renaming (changes) example_1.1_source.changes 966s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 966s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b 966s dpkg-buildpackage: info: source package example 966s dpkg-buildpackage: info: source version 1.1 966s dpkg-buildpackage: info: source distribution stable 966s dpkg-buildpackage: info: source changed by dgit test git user 966s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 966s dpkg-buildpackage: info: host architecture ppc64el 966s debian/rules build 966s EXAMPLE RULES TARGET build 966s fakeroot debian/rules binary 966s EXAMPLE RULES TARGET binary 966s dh_install 966s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 966s dh_gencontrol 966s dh_builddeb 966s dpkg-deb: building package 'example' in '../example_1.1_all.deb'. 966s dpkg-genbuildinfo --build=binary -O../example_1.1_ppc64el.buildinfo 966s dpkg-genchanges --build=binary -O../example_1.1_ppc64el.changes 967s dpkg-genchanges: info: binary-only upload (no source code included) 967s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 967s dpkg-buildpackage: info: binary-only upload (no source included) 967s CD .. 967s + mergechanges -f example_1.1_source.changes example_1.1_ppc64el.changes 967s dgit ok: build successful, results in example_1.1_multi.changes 967s 967s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 967s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 967s ' 967s + t-dgit push --new stable 967s + local dgit=dgit 967s + pwd 967s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 967s + : ' 967s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 967s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new stable 967s | git rev-parse --show-toplevel 967s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 967s | git config -z --get-regexp --local '.*' 967s | git config -z --get-regexp --local '.*' 967s | git config -z --get-regexp --global '.*' 967s | git config -z --get-regexp --system '.*' 968s format , quilt mode linear 968s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 968s warning: could not open directory 'debian/source/': No such file or directory 968s => `' 968s + git diff --quiet HEAD 968s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 968s canonical suite name is stable 968s actually entering push 968s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 968s => `0' 968s + git config remote.dgit.skipdefaultupdate true 968s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 968s get_archive_dsc: nothing in archive, returning undef 968s no version available from the archive 968s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/stable' 968s => `' 968s previous reference hash= 968s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/stable' 968s => `' 968s fetch_from_archive: lastfetch= 968s nothing found! 968s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 968s + git check-ref-format archive/test-dummy/1.1 968s | git symbolic-ref -q HEAD 968s => `refs/heads/master' 968s | git rev-parse 'HEAD~0' 968s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 968s ffq_prev_branchinfo branch current refs/heads/master 968s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 968s => `' 968s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 968s => `' 968s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 968s warning: could not open directory 'debian/source/': No such file or directory 968s => `' 968s + git diff --quiet HEAD 968s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.1' 968s => `' 968s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 968s checking that example_1.1.dsc corresponds to HEAD 968s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.1.dsc 968s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.1.dsc) 968s dpkg-source: info: extracting example in example-1.1 968s dpkg-source: info: unpacking example_1.1.tar.gz 968s CD example-1.1 968s | find -name .git -prune -print0 968s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 968s + git add -Af . 968s | git write-tree 968s => `f903521c6c60a705864da4c6c6716f8fbff08fcf' 968s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 968s + git diff --quiet f903521c6c60a705864da4c6c6716f8fbff08fcf 6ede489d12a09dd148d1f78c3a2179afddf29843 968s files_compare_inputs example_1.1.dsc 968s files_compare_inputs example_1.1.dsc Checksums-Sha256 968s files_compare_inputs example_1.1.dsc Checksums-Sha256 example_1.1.tar.gz 968s files_compare_inputs example_1.1.dsc Checksums-Sha1 968s files_compare_inputs example_1.1.dsc Checksums-Sha1 example_1.1.tar.gz 968s files_compare_inputs example_1.1.dsc Files 968s files_compare_inputs example_1.1.dsc Files example_1.1.tar.gz 968s files_compare_inputs example_1.1_multi.changes 968s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 968s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1.dsc 968s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1.tar.gz 968s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1_all.deb 968s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1_ppc64el.buildinfo 968s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 968s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1.dsc 968s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1.tar.gz 968s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1_all.deb 968s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1_ppc64el.buildinfo 968s files_compare_inputs example_1.1_multi.changes Files 968s files_compare_inputs example_1.1_multi.changes Files example_1.1.dsc 968s files_compare_inputs example_1.1_multi.changes Files example_1.1.tar.gz 968s files_compare_inputs example_1.1_multi.changes Files example_1.1_all.deb 968s files_compare_inputs example_1.1_multi.changes Files example_1.1_ppc64el.buildinfo 968s checking origs needed (1.1)... 968s checking origs needed placement 'devel extra'... 968s origs example_1.1.tar.gz | 34b381ab0da452e877e28d6c39cc00da 758 example_1.1.tar.gz 968s ../example_1.1_multi.changes already has appropriate .orig(s) (if any) 968s push_tagwants: $VAR1 = [ 968s '1.1', 968s '6ede489d12a09dd148d1f78c3a2179afddf29843', 968s undef, 968s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 968s ]; 968s $VAR2 = [ 968s { 968s 'Tfn' => sub { "DUMMY" }, 968s 'TfSuffix' => '', 968s 'View' => 'dgit', 968s 'Objid' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 968s 'Tag' => 'archive/test-dummy/1.1', 968s 'TagFn' => sub { "DUMMY" } 968s }, 968s { 968s 'Tfn' => sub { "DUMMY" }, 968s 'TfSuffix' => '-dgit', 968s 'View' => 'dgit', 968s 'Objid' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 968s 'Tag' => 'test-dummy/1.1', 968s 'TagFn' => sub { "DUMMY" } 968s } 968s ]; 968s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 968s => `1530000000 +0000' 968s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 968s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 968s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 968s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 968s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 968s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 968s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 968s => `d0b818884a8eaedec614b84b19a27b3f458b515b' 968s + git verify-tag d0b818884a8eaedec614b84b19a27b3f458b515b 968s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 968s gpg: Signature made Mon Mar 31 23:03:18 2025 UTC 968s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 968s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 968s gpg: WARNING: This key is not certified with a trusted signature! 968s gpg: There is no indication that the signature belongs to the owner. 968s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 968s + git update-ref refs/tags/archive/test-dummy/1.1 d0b818884a8eaedec614b84b19a27b3f458b515b 968s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 968s => `33a8516eac48d6ae1daa0104446504d7136e2c9f' 968s + git verify-tag 33a8516eac48d6ae1daa0104446504d7136e2c9f 968s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 968s gpg: Signature made Mon Mar 31 23:03:18 2025 UTC 968s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 968s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 968s gpg: WARNING: This key is not certified with a trusted signature! 968s gpg: There is no indication that the signature belongs to the owner. 968s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 968s + git update-ref refs/tags/test-dummy/1.1 33a8516eac48d6ae1daa0104446504d7136e2c9f 968s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 968s => `0' 968s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 968s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 6ede489d12a09dd148d1f78c3a2179afddf29843:refs/dgit/stable refs/tags/archive/test-dummy/1.1 refs/tags/test-dummy/1.1 968s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 968s * [new reference] 6ede489d12a09dd148d1f78c3a2179afddf29843 -> refs/dgit/stable 968s * [new tag] archive/test-dummy/1.1 -> archive/test-dummy/1.1 968s * [new tag] test-dummy/1.1 -> test-dummy/1.1 968s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 968s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.1_multi.changes 968s signfile dsc ../example_1.1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 968s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 968s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 968s 968s signfile buildinfo ../example_1.1_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 968s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 968s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 969s 969s fixup_changes dsc ../example_1.1.dsc ../example_1.1_multi.changes 969s fixup_changes buildinfo ../example_1.1_ppc64el.buildinfo ../example_1.1_multi.changes 969s signfile changes ../example_1.1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 969s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 969s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 969s 969s Successfully signed dsc, buildinfo, changes files 969s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_1.1_multi.changes 969s gpg: ../example_1.1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 969s gpg: ../example_1.1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 969s D: Setting host argument. 969s Checking signature on .changes 969s Checking signature on .dsc 969s Uploading to test-dummy (via local to localhost): 969s Successfully uploaded packages. 969s dgit ok: pushed and uploaded 1.1 969s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 969s del_lrfetchrefs... 969s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 969s ' 969s + t-pushed-good master stable 969s + local branch=master 969s + local suite=stable 969s + t-refs-same refs/heads/master 969s + local g 969s + for g in $* 969s + t-ref-same refs/heads/master 969s + local name=refs/heads/master 969s + local val 969s ++ t-git-get-ref refs/heads/master 969s ++ local ref=refs/heads/master 969s ++ case "$ref" in 969s ++ git show-ref -d refs/heads/master 969s ++ perl -ne ' 969s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 969s END { print "$x\n" if length $x; } 969s ' 969s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t-ref-same-val refs/heads/master 6ede489d12a09dd148d1f78c3a2179afddf29843 969s + local name=refs/heads/master 969s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + case "${t_ref_val-unset}" in 969s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t_ref_names+=("$name") 969s + t-pushed-good-core 969s + t-ref-dsc-dgit 969s + t-incoming-dsc 969s + local dsc=example_1.1.dsc 969s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc 969s + local val 969s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc Dgit 969s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc 969s ++ local field=Dgit 969s ++ perl -e ' 969s use Dpkg::Control::Hash; 969s my $h = new Dpkg::Control::Hash allow_pgp=>1; 969s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc"); 969s my $val = $h->{"Dgit"},"\n"; 969s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc Dgit" unless defined $val; 969s print $val,"\n"; 969s ' 969s + val='6ede489d12a09dd148d1f78c3a2179afddf29843 test-dummy archive/test-dummy/1.1 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 969s ++ perl -e ' 969s $_=shift @ARGV; 969s die "Dgit $_ ?" unless m/^\w+\b/; 969s print $&,"\n" or die $!; 969s ' '6ede489d12a09dd148d1f78c3a2179afddf29843 test-dummy archive/test-dummy/1.1 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 969s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc 6ede489d12a09dd148d1f78c3a2179afddf29843 969s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc 969s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + case "${t_ref_val-unset}" in 969s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t_ref_names+=("$name") 969s ++ t-v-tag 969s ++ echo refs/tags/archive/test-dummy/1.1 969s + t-refs-same refs/tags/archive/test-dummy/1.1 refs/remotes/dgit/dgit/stable 969s + local g 969s + for g in $* 969s + t-ref-same refs/tags/archive/test-dummy/1.1 969s + local name=refs/tags/archive/test-dummy/1.1 969s + local val 969s ++ t-git-get-ref refs/tags/archive/test-dummy/1.1 969s ++ local ref=refs/tags/archive/test-dummy/1.1 969s ++ case "$ref" in 969s ++ git show-ref -d refs/tags/archive/test-dummy/1.1 969s ++ perl -ne ' 969s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.1\E(?:\^\{\})?$#; 969s END { print "$x\n" if length $x; } 969s ' 969s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t-ref-same-val refs/tags/archive/test-dummy/1.1 6ede489d12a09dd148d1f78c3a2179afddf29843 969s + local name=refs/tags/archive/test-dummy/1.1 969s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + case "${t_ref_val-unset}" in 969s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t_ref_names+=("$name") 969s + for g in $* 969s + t-ref-same refs/remotes/dgit/dgit/stable 969s + local name=refs/remotes/dgit/dgit/stable 969s + local val 969s ++ t-git-get-ref refs/remotes/dgit/dgit/stable 969s ++ local ref=refs/remotes/dgit/dgit/stable 969s ++ case "$ref" in 969s ++ git show-ref -d refs/remotes/dgit/dgit/stable 969s ++ perl -ne ' 969s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/stable\E(?:\^\{\})?$#; 969s END { print "$x\n" if length $x; } 969s ' 969s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t-ref-same-val refs/remotes/dgit/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 969s + local name=refs/remotes/dgit/dgit/stable 969s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + case "${t_ref_val-unset}" in 969s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t_ref_names+=("$name") 969s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 969s + local val 969s + for g in $* 969s ++ t-git-get-ref refs/heads/dgit/unstable 969s ++ local ref=refs/heads/dgit/unstable 969s ++ case "$ref" in 969s ++ git show-ref -d refs/heads/dgit/unstable 969s ++ perl -ne ' 969s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 969s END { print "$x\n" if length $x; } 969s ' 969s ++ test 1 = 1 969s + val= 969s + '[' x '!=' x ']' 969s + for g in $* 969s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 969s ++ local ref=refs/remotes/dgit/dgit/unstable 969s ++ case "$ref" in 969s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 969s ++ perl -ne ' 969s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 969s END { print "$x\n" if length $x; } 969s ' 969s ++ test 1 = 1 969s + val= 969s + '[' x '!=' x ']' 969s + set -e 969s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 969s ++ t-v-tag 969s ++ echo refs/tags/archive/test-dummy/1.1 969s + t-refs-same refs/dgit/stable refs/tags/archive/test-dummy/1.1 969s + local g 969s + for g in $* 969s + t-ref-same refs/dgit/stable 969s + local name=refs/dgit/stable 969s + local val 969s ++ t-git-get-ref refs/dgit/stable 969s ++ local ref=refs/dgit/stable 969s ++ case "$ref" in 969s ++ git show-ref -d refs/dgit/stable 969s ++ perl -ne ' 969s $x = $1 if m#^(\w+) \Qrefs/dgit/stable\E(?:\^\{\})?$#; 969s END { print "$x\n" if length $x; } 969s ' 969s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t-ref-same-val refs/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 969s + local name=refs/dgit/stable 969s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + case "${t_ref_val-unset}" in 969s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t_ref_names+=("$name") 969s + for g in $* 969s + t-ref-same refs/tags/archive/test-dummy/1.1 969s + local name=refs/tags/archive/test-dummy/1.1 969s + local val 969s ++ t-git-get-ref refs/tags/archive/test-dummy/1.1 969s ++ local ref=refs/tags/archive/test-dummy/1.1 969s ++ case "$ref" in 969s ++ git show-ref -d refs/tags/archive/test-dummy/1.1 969s ++ perl -ne ' 969s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.1\E(?:\^\{\})?$#; 969s END { print "$x\n" if length $x; } 969s ' 969s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t-ref-same-val refs/tags/archive/test-dummy/1.1 6ede489d12a09dd148d1f78c3a2179afddf29843 969s + local name=refs/tags/archive/test-dummy/1.1 969s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + case "${t_ref_val-unset}" in 969s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 969s + t_ref_names+=("$name") 969s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 969s + t-refs-notexist refs/dgit/unstable 969s + local val 969s + for g in $* 969s ++ t-git-get-ref refs/dgit/unstable 969s ++ local ref=refs/dgit/unstable 969s ++ case "$ref" in 969s ++ git show-ref -d refs/dgit/unstable 969s ++ perl -ne ' 969s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 969s END { print "$x\n" if length $x; } 969s ' 969s ++ test 1 = 1 969s + val= 969s + '[' x '!=' x ']' 969s ++ t-v-tag 969s ++ echo refs/tags/archive/test-dummy/1.1 969s + git verify-tag refs/tags/archive/test-dummy/1.1 969s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 969s gpg: Signature made Mon Mar 31 23:03:18 2025 UTC 969s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 969s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 969s gpg: WARNING: This key is not certified with a trusted signature! 969s gpg: There is no indication that the signature belongs to the owner. 969s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 969s + t-archive-process-incoming stable 969s + local suite=stable 969s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1_all.deb /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1_multi.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.1_ppc64el.buildinfo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 969s + t-archive-query stable 969s + local suite=stable 969s + local dscf=main/example_1.1.dsc 969s + t-archive-query-aq stable example 1.1 main/example_1.1.dsc 969s + local suite=stable 969s + local p=example 969s + local v=1.1 969s + local dscf=main/example_1.1.dsc 969s + local sha 969s ++ sha256sum 969s + sha='60f2d885001265a36a1b913260f9b5339e6acb1db0c788939c9b4975148a74ee -' 969s + echo '1.1 60f2d885001265a36a1b913260f9b5339e6acb1db0c788939c9b4975148a74ee main/example_1.1.dsc' 969s + t-aq-archive-updated stable example 969s + local suite=stable 969s + local p=example 969s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 969s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 969s + perl -wne ' 969s use JSON; 969s use strict; 969s our @v; 969s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 969s push @v, { 969s "version" => "$1", 969s "sha256sum" => "$2", 969s "component" => "$3", 969s "filename" => "$4", 969s }; 969s END { 969s my $json = JSON->new->canonical(); 969s print $json->encode(\@v) or die $!; 969s } 969s ' 969s + git checkout -b stable 969s Switched to a new branch 'stable' 969s + echo stable 969s + git add which 969s + t-commit Stable '' stable 969s + local msg=Stable 969s + v=1.2 969s + t-debchange --force-distribution -v1.2 --distribution stable Stable 969s + DEBEMAIL=dgit-tests@example.org 969s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v1.2 --distribution stable Stable 969s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v1.2 --distribution stable Stable 969s debchange warning: Unable to determine if stable is a valid Ubuntu release. 969s libdistro-info-perl is not installed, Debian release names are not known. 969s libdistro-info-perl is not installed, Ubuntu release names are not known. 969s + git add debian/changelog 969s + debcommit 969s git commit -m Stable 969s [stable d5060e0] Stable 969s 2 files changed, 7 insertions(+), 1 deletion(-) 969s + revision=3 969s + push-to stable stable 969s + t-refs-same-start 969s + unset t_ref_val 969s + t_ref_names=() 969s + t-ref-head 969s + local val 969s ++ git rev-parse HEAD 969s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 969s + t-ref-same-val HEAD d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 969s + local name=HEAD 969s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 969s + case "${t_ref_val-unset}" in 969s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 969s + t_ref_names+=("$name") 969s + t-dgit build 969s + local dgit=dgit 969s + pwd 969s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 969s + : ' 969s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 969s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 970s | git rev-parse --show-toplevel 970s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 970s | git config -z --get-regexp --local '.*' 970s | git config -z --get-regexp --local '.*' 970s | git config -z --get-regexp --global '.*' 970s | git config -z --get-regexp --system '.*' 970s format , quilt mode linear 970s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 970s warning: could not open directory 'debian/source/': No such file or directory 970s => `' 970s + git diff --quiet HEAD 970s massage split -F. 970s massage done 3 -b. 970s format , quilt mode linear 970s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 970s warning: could not open directory 'debian/source/': No such file or directory 970s => `' 970s + git diff --quiet HEAD 970s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 970s dpkg-buildpackage: info: source package example 970s dpkg-buildpackage: info: source version 1.2 970s dpkg-buildpackage: info: source distribution stable 970s dpkg-buildpackage: info: source changed by dgit test git user 970s fakeroot debian/rules clean 970s EXAMPLE RULES TARGET clean 970s dh_clean 970s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 970s | git clean -dn 970s => `' 970s | git rev-parse 'HEAD~0' 970s => `d5060e0b2c66d5369fd8d88a498efa3d9f2706e0' 970s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 970s CD work 970s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 970s + git reset -q --hard d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 970s CD .. 970s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 970s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 970s dpkg-source: warning: source directory 'work' is not - 'example-1.2' 970s dpkg-source: info: using source format '1.0' 970s dpkg-source: info: building example in example_1.2.tar.gz 970s dpkg-source: info: building example in example_1.2.dsc 970s CD work 970s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 970s changelog will contain changes since 1.1 970s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.2_source.changes dpkg-genchanges -S -v1.1 970s dpkg-genchanges: info: including full source code in upload 970s CD .. 970s moving example_1.2.dsc, example_1.2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 970s renaming (Files) example_1.2.tar.gz 970s renaming (dsc) example_1.2.dsc 970s renaming (changes) example_1.2_source.changes 970s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 970s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b -v1.1 970s dpkg-buildpackage: info: source package example 970s dpkg-buildpackage: info: source version 1.2 970s dpkg-buildpackage: info: source distribution stable 970s dpkg-buildpackage: info: source changed by dgit test git user 970s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 970s dpkg-buildpackage: info: host architecture ppc64el 970s debian/rules build 970s EXAMPLE RULES TARGET build 970s fakeroot debian/rules binary 970s EXAMPLE RULES TARGET binary 970s dh_install 970s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 970s dh_gencontrol 971s dh_builddeb 971s dpkg-deb: building package 'example' in '../example_1.2_all.deb'. 971s dpkg-genbuildinfo --build=binary -O../example_1.2_ppc64el.buildinfo 971s dpkg-genchanges --build=binary -v1.1 -O../example_1.2_ppc64el.changes 971s dpkg-genchanges: info: binary-only upload (no source code included) 971s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 971s dpkg-buildpackage: info: binary-only upload (no source included) 971s CD .. 971s + mergechanges -f example_1.2_source.changes example_1.2_ppc64el.changes 972s dgit ok: build successful, results in example_1.2_multi.changes 972s 972s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 972s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 972s ' 972s + t-dgit push --new stable 972s + local dgit=dgit 972s + pwd 972s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 972s + : ' 972s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 972s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new stable 972s | git rev-parse --show-toplevel 972s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 972s | git config -z --get-regexp --local '.*' 972s | git config -z --get-regexp --local '.*' 972s | git config -z --get-regexp --global '.*' 972s | git config -z --get-regexp --system '.*' 972s format , quilt mode linear 972s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 972s warning: could not open directory 'debian/source/': No such file or directory 972s => `' 972s + git diff --quiet HEAD 972s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 972s canonical suite name is stable 972s actually entering push 972s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 972s => `1' 972s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/stable dgit-rewrite/map 972s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/stable)|(?:refs/dgit\-rewrite\/map) 972s git_lrfetch_sane iteration 0 972s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/stable refs/dgit-rewrite/map 972s => 6ede489d12a09dd148d1f78c3a2179afddf29843 refs/dgit/stable 972s => d0b818884a8eaedec614b84b19a27b3f458b515b refs/tags/archive/test-dummy/1.1 972s => 33a8516eac48d6ae1daa0104446504d7136e2c9f refs/tags/test-dummy/1.1 972s 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 972s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 972s | git for-each-ref refs/dgit-fetch/test-dummy 972s |> 6ede489d12a09dd148d1f78c3a2179afddf29843 commit refs/dgit-fetch/test-dummy/dgit/stable 972s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 972s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 972s git_lrfetch_sane: tidying any old suite lrfetchrefs 972s | git for-each-ref refs/dgit-fetch/stable 972s git_lrfetch_sane: git fetch --no-insane emulation complete 972s $VAR1 = { 972s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => '33a8516eac48d6ae1daa0104446504d7136e2c9f', 972s 'refs/dgit-fetch/test-dummy/dgit/stable' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 972s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => 'd0b818884a8eaedec614b84b19a27b3f458b515b' 972s }; 972s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 972s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/tags/archive/test-dummy/1.1 972s currently refs/tags/archive/test-dummy/1.1=d0b818884a8eaedec614b84b19a27b3f458b515b 972s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/tags/test-dummy/1.1 972s currently refs/tags/test-dummy/1.1=33a8516eac48d6ae1daa0104446504d7136e2c9f 972s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 972s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 972s offered refs/tags/archive/test-dummy/1.1=d0b818884a8eaedec614b84b19a27b3f458b515b 972s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 972s offered refs/tags/test-dummy/1.1=33a8516eac48d6ae1daa0104446504d7136e2c9f 972s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 972s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_1.1.dsc... 972s get_archive_dsc: Version 1.1 972s last upload to archive: specified git info (test-dummy) 972s GCF| git cat-file --batch 972s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 972s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 972s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 972s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255 972s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/stable' 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s previous reference hash=6ede489d12a09dd148d1f78c3a2179afddf29843 972s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/stable' 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s fetch_from_archive: lastfetch=6ede489d12a09dd148d1f78c3a2179afddf29843 972s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s fetch mergeinfos: 972s commit 6ede489d12a09dd148d1f78c3a2179afddf29843 Dgit field in .dsc from archive 972s fetch hash=6ede489d12a09dd148d1f78c3a2179afddf29843 972s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 972s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 972s + git update-ref -m 'dgit fetch stable' DGIT_ARCHIVE 6ede489d12a09dd148d1f78c3a2179afddf29843 972s | git log -n2 6ede489d12a09dd148d1f78c3a2179afddf29843 972s => `commit 6ede489d12a09dd148d1f78c3a2179afddf29843'... 974s | git ls-tree -lrz -- 6ede489d12a09dd148d1f78c3a2179afddf29843: 974s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 974s + git check-ref-format archive/test-dummy/1.2 974s | git symbolic-ref -q HEAD 974s => `refs/heads/stable' 974s | git rev-parse 'HEAD~0' 974s => `d5060e0b2c66d5369fd8d88a498efa3d9f2706e0' 974s ffq_prev_branchinfo branch current refs/heads/stable 974s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/stable' 974s => `' 974s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/stable' 974s => `' 974s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 974s warning: could not open directory 'debian/source/': No such file or directory 974s => `' 974s + git diff --quiet HEAD 974s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 974s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 974s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 974s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 974s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 974s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.2' 974s => `' 974s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 974s checking that example_1.2.dsc corresponds to HEAD 974s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.2.dsc 974s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.2.dsc) 974s dpkg-source: info: extracting example in example-1.2 974s dpkg-source: info: unpacking example_1.2.tar.gz 974s CD example-1.2 974s | find -name .git -prune -print0 974s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 974s + git add -Af . 974s | git write-tree 974s => `04b91662ca770360f547964817f3b334b327a676' 974s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 974s + git diff --quiet 04b91662ca770360f547964817f3b334b327a676 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s files_compare_inputs example_1.2.dsc 974s files_compare_inputs example_1.2.dsc Checksums-Sha256 974s files_compare_inputs example_1.2.dsc Checksums-Sha256 example_1.2.tar.gz 974s files_compare_inputs example_1.2.dsc Checksums-Sha1 974s files_compare_inputs example_1.2.dsc Checksums-Sha1 example_1.2.tar.gz 974s files_compare_inputs example_1.2.dsc Files 974s files_compare_inputs example_1.2.dsc Files example_1.2.tar.gz 974s files_compare_inputs example_1.2_multi.changes 974s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 974s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2.dsc 974s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2.tar.gz 974s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2_all.deb 974s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2_ppc64el.buildinfo 974s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 974s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2.dsc 974s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2.tar.gz 974s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2_all.deb 974s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2_ppc64el.buildinfo 974s files_compare_inputs example_1.2_multi.changes Files 974s files_compare_inputs example_1.2_multi.changes Files example_1.2.dsc 974s files_compare_inputs example_1.2_multi.changes Files example_1.2.tar.gz 974s files_compare_inputs example_1.2_multi.changes Files example_1.2_all.deb 974s files_compare_inputs example_1.2_multi.changes Files example_1.2_ppc64el.buildinfo 974s checking origs needed (1.2)... 974s checking origs needed placement 'devel extra'... 974s origs example_1.2.tar.gz | 22390cb6d6349ce2058dce0e096ce3c4 765 example_1.2.tar.gz 974s ../example_1.2_multi.changes already has appropriate .orig(s) (if any) 974s push_tagwants: $VAR1 = [ 974s '1.2', 974s 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 974s undef, 974s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 974s ]; 974s $VAR2 = [ 974s { 974s 'Tfn' => sub { "DUMMY" }, 974s 'TfSuffix' => '', 974s 'Objid' => 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 974s 'Tag' => 'archive/test-dummy/1.2', 974s 'View' => 'dgit', 974s 'TagFn' => sub { "DUMMY" } 974s }, 974s { 974s 'TagFn' => sub { "DUMMY" }, 974s 'View' => 'dgit', 974s 'Tfn' => sub { "DUMMY" }, 974s 'TfSuffix' => '-dgit', 974s 'Objid' => 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 974s 'Tag' => 'test-dummy/1.2' 974s } 974s ]; 974s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 974s => `1530000000 +0000' 974s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 974s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 974s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 974s => `b0b916127aeda597f52d7e9b6b978a8dbf11cac0' 974s + git verify-tag b0b916127aeda597f52d7e9b6b978a8dbf11cac0 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s gpg: Signature made Mon Mar 31 23:03:22 2025 UTC 974s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 974s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 974s gpg: WARNING: This key is not certified with a trusted signature! 974s gpg: There is no indication that the signature belongs to the owner. 974s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 974s + git update-ref refs/tags/archive/test-dummy/1.2 b0b916127aeda597f52d7e9b6b978a8dbf11cac0 974s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 974s => `1f87342067cb976b8ba8ea4ac5fd502aab26b0c1' 974s + git verify-tag 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s gpg: Signature made Mon Mar 31 23:03:22 2025 UTC 974s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 974s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 974s gpg: WARNING: This key is not certified with a trusted signature! 974s gpg: There is no indication that the signature belongs to the owner. 974s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 974s + git update-ref refs/tags/test-dummy/1.2 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 974s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 974s => `1' 974s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git d5060e0b2c66d5369fd8d88a498efa3d9f2706e0:refs/dgit/stable refs/tags/archive/test-dummy/1.2 refs/tags/test-dummy/1.2 974s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 974s 6ede489..d5060e0 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 -> refs/dgit/stable 974s * [new tag] archive/test-dummy/1.2 -> archive/test-dummy/1.2 974s * [new tag] test-dummy/1.2 -> test-dummy/1.2 974s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.2_multi.changes 974s signfile dsc ../example_1.2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s 974s signfile buildinfo ../example_1.2_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s 974s fixup_changes dsc ../example_1.2.dsc ../example_1.2_multi.changes 974s fixup_changes buildinfo ../example_1.2_ppc64el.buildinfo ../example_1.2_multi.changes 974s signfile changes ../example_1.2_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s 974s Successfully signed dsc, buildinfo, changes files 974s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_1.2_multi.changes 974s gpg: ../example_1.2_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 974s gpg: ../example_1.2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 974s D: Setting host argument. 974s Checking signature on .changes 974s Checking signature on .dsc 974s Uploading to test-dummy (via local to localhost): 974s Successfully uploaded packages. 974s dgit ok: pushed and uploaded 1.2 974s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 974s del_lrfetchrefs... 974s del_lrfetchrefs: 6ede489d12a09dd148d1f78c3a2179afddf29843 refs/dgit-fetch/test-dummy/dgit/stable 974s del_lrfetchrefs: d0b818884a8eaedec614b84b19a27b3f458b515b refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 974s del_lrfetchrefs: 33a8516eac48d6ae1daa0104446504d7136e2c9f refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 974s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 974s ' 974s + t-pushed-good stable stable 974s + local branch=stable 974s + local suite=stable 974s + t-refs-same refs/heads/stable 974s + local g 974s + for g in $* 974s + t-ref-same refs/heads/stable 974s + local name=refs/heads/stable 974s + local val 974s ++ t-git-get-ref refs/heads/stable 974s ++ local ref=refs/heads/stable 974s ++ case "$ref" in 974s ++ git show-ref -d refs/heads/stable 974s ++ perl -ne ' 974s $x = $1 if m#^(\w+) \Qrefs/heads/stable\E(?:\^\{\})?$#; 974s END { print "$x\n" if length $x; } 974s ' 974s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t-ref-same-val refs/heads/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + local name=refs/heads/stable 974s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + case "${t_ref_val-unset}" in 974s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t_ref_names+=("$name") 974s + t-pushed-good-core 974s + t-ref-dsc-dgit 974s + t-incoming-dsc 974s + local dsc=example_1.2.dsc 974s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc 974s + local val 974s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc Dgit 974s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc 974s ++ local field=Dgit 974s ++ perl -e ' 974s use Dpkg::Control::Hash; 974s my $h = new Dpkg::Control::Hash allow_pgp=>1; 974s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc"); 974s my $val = $h->{"Dgit"},"\n"; 974s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc Dgit" unless defined $val; 974s print $val,"\n"; 974s ' 974s + val='d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 test-dummy archive/test-dummy/1.2 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 974s ++ perl -e ' 974s $_=shift @ARGV; 974s die "Dgit $_ ?" unless m/^\w+\b/; 974s print $&,"\n" or die $!; 974s ' 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0 test-dummy archive/test-dummy/1.2 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 974s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc 974s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + case "${t_ref_val-unset}" in 974s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t_ref_names+=("$name") 974s ++ t-v-tag 974s ++ echo refs/tags/archive/test-dummy/1.2 974s + t-refs-same refs/tags/archive/test-dummy/1.2 refs/remotes/dgit/dgit/stable 974s + local g 974s + for g in $* 974s + t-ref-same refs/tags/archive/test-dummy/1.2 974s + local name=refs/tags/archive/test-dummy/1.2 974s + local val 974s ++ t-git-get-ref refs/tags/archive/test-dummy/1.2 974s ++ local ref=refs/tags/archive/test-dummy/1.2 974s ++ case "$ref" in 974s ++ git show-ref -d refs/tags/archive/test-dummy/1.2 974s ++ perl -ne ' 974s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.2\E(?:\^\{\})?$#; 974s END { print "$x\n" if length $x; } 974s ' 974s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t-ref-same-val refs/tags/archive/test-dummy/1.2 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + local name=refs/tags/archive/test-dummy/1.2 974s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + case "${t_ref_val-unset}" in 974s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t_ref_names+=("$name") 974s + for g in $* 974s + t-ref-same refs/remotes/dgit/dgit/stable 974s + local name=refs/remotes/dgit/dgit/stable 974s + local val 974s ++ t-git-get-ref refs/remotes/dgit/dgit/stable 974s ++ local ref=refs/remotes/dgit/dgit/stable 974s ++ case "$ref" in 974s ++ git show-ref -d refs/remotes/dgit/dgit/stable 974s ++ perl -ne ' 974s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/stable\E(?:\^\{\})?$#; 974s END { print "$x\n" if length $x; } 974s ' 974s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t-ref-same-val refs/remotes/dgit/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + local name=refs/remotes/dgit/dgit/stable 974s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + case "${t_ref_val-unset}" in 974s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t_ref_names+=("$name") 974s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 974s + local val 974s + for g in $* 974s ++ t-git-get-ref refs/heads/dgit/unstable 974s ++ local ref=refs/heads/dgit/unstable 974s ++ case "$ref" in 974s ++ git show-ref -d refs/heads/dgit/unstable 974s ++ perl -ne ' 974s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 974s END { print "$x\n" if length $x; } 974s ' 974s ++ test 1 = 1 974s + val= 974s + '[' x '!=' x ']' 974s + for g in $* 974s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 974s ++ local ref=refs/remotes/dgit/dgit/unstable 974s ++ case "$ref" in 974s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 974s ++ perl -ne ' 974s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 974s END { print "$x\n" if length $x; } 974s ' 974s ++ test 1 = 1 974s + val= 974s + '[' x '!=' x ']' 974s + set -e 974s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 974s ++ t-v-tag 974s ++ echo refs/tags/archive/test-dummy/1.2 974s + t-refs-same refs/dgit/stable refs/tags/archive/test-dummy/1.2 974s + local g 974s + for g in $* 974s + t-ref-same refs/dgit/stable 974s + local name=refs/dgit/stable 974s + local val 974s ++ t-git-get-ref refs/dgit/stable 974s ++ local ref=refs/dgit/stable 974s ++ case "$ref" in 974s ++ git show-ref -d refs/dgit/stable 974s ++ perl -ne ' 974s $x = $1 if m#^(\w+) \Qrefs/dgit/stable\E(?:\^\{\})?$#; 974s END { print "$x\n" if length $x; } 974s ' 974s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t-ref-same-val refs/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + local name=refs/dgit/stable 974s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + case "${t_ref_val-unset}" in 974s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t_ref_names+=("$name") 974s + for g in $* 974s + t-ref-same refs/tags/archive/test-dummy/1.2 974s + local name=refs/tags/archive/test-dummy/1.2 974s + local val 974s ++ t-git-get-ref refs/tags/archive/test-dummy/1.2 974s ++ local ref=refs/tags/archive/test-dummy/1.2 974s ++ case "$ref" in 974s ++ git show-ref -d refs/tags/archive/test-dummy/1.2 974s ++ perl -ne ' 974s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.2\E(?:\^\{\})?$#; 974s END { print "$x\n" if length $x; } 974s ' 974s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t-ref-same-val refs/tags/archive/test-dummy/1.2 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + local name=refs/tags/archive/test-dummy/1.2 974s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + case "${t_ref_val-unset}" in 974s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 974s + t_ref_names+=("$name") 974s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 974s + t-refs-notexist refs/dgit/unstable 974s + local val 974s + for g in $* 974s ++ t-git-get-ref refs/dgit/unstable 974s ++ local ref=refs/dgit/unstable 974s ++ case "$ref" in 974s ++ perl -ne ' 974s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 974s END { print "$x\n" if length $x; } 974s ' 974s ++ git show-ref -d refs/dgit/unstable 974s ++ test 1 = 1 974s + val= 974s + '[' x '!=' x ']' 974s ++ t-v-tag 974s ++ echo refs/tags/archive/test-dummy/1.2 974s + git verify-tag refs/tags/archive/test-dummy/1.2 974s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 974s gpg: Signature made Mon Mar 31 23:03:22 2025 UTC 974s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 974s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 974s gpg: WARNING: This key is not certified with a trusted signature! 974s gpg: There is no indication that the signature belongs to the owner. 974s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 974s + t-archive-process-incoming stable 974s + local suite=stable 974s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2_all.deb /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2_multi.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_1.2_ppc64el.buildinfo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 974s + t-archive-query stable 974s + local suite=stable 974s + local dscf=main/example_1.2.dsc 974s + t-archive-query-aq stable example 1.2 main/example_1.2.dsc 974s + local suite=stable 974s + local p=example 974s + local v=1.2 974s + local dscf=main/example_1.2.dsc 974s + local sha 974s ++ sha256sum 974s + sha='531ec9d2895f599eafb2a768a7b5a756d5a245d01896b205c32273bd6f197fa2 -' 974s + echo '1.2 531ec9d2895f599eafb2a768a7b5a756d5a245d01896b205c32273bd6f197fa2 main/example_1.2.dsc' 974s + t-aq-archive-updated stable example 974s + local suite=stable 974s + local p=example 974s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 974s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/stable 974s + perl -wne ' 974s use JSON; 974s use strict; 974s our @v; 974s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 974s push @v, { 974s "version" => "$1", 974s "sha256sum" => "$2", 974s "component" => "$3", 974s "filename" => "$4", 974s }; 974s END { 974s my $json = JSON->new->canonical(); 974s print $json->encode(\@v) or die $!; 974s } 974s ' 974s + git checkout master 974s Switched to branch 'master' 974s + majorv=2 974s + revision=0 974s + echo sid 974s + git add which 974s + t-commit Sid 974s + local msg=Sid 974s + v=2.0 974s + t-debchange --force-distribution -v2.0 --distribution unstable Sid 974s + DEBEMAIL=dgit-tests@example.org 974s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v2.0 --distribution unstable Sid 974s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v2.0 --distribution unstable Sid 974s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 974s libdistro-info-perl is not installed, Debian release names are not known. 974s libdistro-info-perl is not installed, Ubuntu release names are not known. 974s + git add debian/changelog 974s + debcommit 974s git commit -m Sid 974s [master 1c97ddd] Sid 974s 2 files changed, 7 insertions(+), 1 deletion(-) 974s + revision=1 974s + push-to master sid 974s + t-refs-same-start 974s + unset t_ref_val 974s + t_ref_names=() 974s + t-ref-head 974s + local val 974s ++ git rev-parse HEAD 974s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 974s + t-ref-same-val HEAD 1c97ddd6759afae0eea88cf10027c6cba8866ea1 974s + local name=HEAD 974s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 974s + case "${t_ref_val-unset}" in 974s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 974s + t_ref_names+=("$name") 974s + t-dgit build 974s + local dgit=dgit 974s + pwd 974s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 974s + : ' 974s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 974s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 974s | git rev-parse --show-toplevel 974s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 974s | git config -z --get-regexp --local '.*' 974s | git config -z --get-regexp --local '.*' 974s | git config -z --get-regexp --global '.*' 974s | git config -z --get-regexp --system '.*' 974s format , quilt mode linear 974s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 974s warning: could not open directory 'debian/source/': No such file or directory 974s => `' 974s + git diff --quiet HEAD 974s massage split -F. 974s massage done 3 -b. 974s format , quilt mode linear 974s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 974s warning: could not open directory 'debian/source/': No such file or directory 974s => `' 974s + git diff --quiet HEAD 974s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 974s dpkg-buildpackage: info: source package example 974s dpkg-buildpackage: info: source version 2.0 974s dpkg-buildpackage: info: source distribution unstable 974s dpkg-buildpackage: info: source changed by dgit test git user 974s fakeroot debian/rules clean 974s EXAMPLE RULES TARGET clean 974s dh_clean 974s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 974s | git clean -dn 974s => `' 974s | git rev-parse 'HEAD~0' 974s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 974s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 974s CD work 974s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 974s + git reset -q --hard 1c97ddd6759afae0eea88cf10027c6cba8866ea1 974s CD .. 974s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 974s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 974s dpkg-source: warning: source directory 'work' is not - 'example-2.0' 974s dpkg-source: info: using source format '1.0' 974s dpkg-source: info: building example in example_2.0.tar.gz 974s dpkg-source: info: building example in example_2.0.dsc 974s CD work 974s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 974s package seems new, not specifying -v 974s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0_source.changes dpkg-genchanges -S 974s dpkg-genchanges: info: including full source code in upload 974s CD .. 974s moving example_2.0.dsc, example_2.0_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 974s renaming (Files) example_2.0.tar.gz 974s renaming (dsc) example_2.0.dsc 974s renaming (changes) example_2.0_source.changes 974s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 974s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b 974s dpkg-buildpackage: info: source package example 974s dpkg-buildpackage: info: source version 2.0 974s dpkg-buildpackage: info: source distribution unstable 974s dpkg-buildpackage: info: source changed by dgit test git user 975s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 975s dpkg-buildpackage: info: host architecture ppc64el 975s debian/rules build 975s EXAMPLE RULES TARGET build 975s fakeroot debian/rules binary 975s EXAMPLE RULES TARGET binary 975s dh_install 975s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 975s dh_gencontrol 975s dh_builddeb 975s dpkg-deb: building package 'example' in '../example_2.0_all.deb'. 975s dpkg-genbuildinfo --build=binary -O../example_2.0_ppc64el.buildinfo 975s dpkg-genchanges --build=binary -O../example_2.0_ppc64el.changes 975s dpkg-genchanges: info: binary-only upload (no source code included) 975s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 975s dpkg-buildpackage: info: binary-only upload (no source included) 975s CD .. 975s + mergechanges -f example_2.0_source.changes example_2.0_ppc64el.changes 976s dgit ok: build successful, results in example_2.0_multi.changes 976s 976s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 976s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 976s ' 976s + t-dgit push --new sid 976s + local dgit=dgit 976s + pwd 976s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 976s + : ' 976s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 976s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new sid 976s | git rev-parse --show-toplevel 976s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 976s | git config -z --get-regexp --local '.*' 976s | git config -z --get-regexp --local '.*' 976s | git config -z --get-regexp --global '.*' 976s | git config -z --get-regexp --system '.*' 976s format , quilt mode linear 976s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 976s warning: could not open directory 'debian/source/': No such file or directory 976s => `' 976s + git diff --quiet HEAD 976s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 976s canonical suite name for unstable is sid 976s actually entering push 976s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 976s => `1' 976s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 976s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 976s git_lrfetch_sane iteration 0 976s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 976s => d0b818884a8eaedec614b84b19a27b3f458b515b refs/tags/archive/test-dummy/1.1 976s => b0b916127aeda597f52d7e9b6b978a8dbf11cac0 refs/tags/archive/test-dummy/1.2 976s => 33a8516eac48d6ae1daa0104446504d7136e2c9f refs/tags/test-dummy/1.1 976s => 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 refs/tags/test-dummy/1.2 976s 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/* 976s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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/*' 976s | git for-each-ref refs/dgit-fetch/test-dummy 976s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 976s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 976s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 976s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 976s git_lrfetch_sane: tidying any old suite lrfetchrefs 976s | git for-each-ref refs/dgit-fetch/sid 976s git_lrfetch_sane: git fetch --no-insane emulation complete 976s $VAR1 = { 976s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => 'd0b818884a8eaedec614b84b19a27b3f458b515b', 976s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => 'b0b916127aeda597f52d7e9b6b978a8dbf11cac0', 976s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => '1f87342067cb976b8ba8ea4ac5fd502aab26b0c1', 976s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => '33a8516eac48d6ae1daa0104446504d7136e2c9f' 976s }; 976s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 976s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/tags/archive/test-dummy/1.1 976s currently refs/tags/archive/test-dummy/1.1=d0b818884a8eaedec614b84b19a27b3f458b515b 976s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/tags/archive/test-dummy/1.2 976s currently refs/tags/archive/test-dummy/1.2=b0b916127aeda597f52d7e9b6b978a8dbf11cac0 976s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/tags/test-dummy/1.1 976s currently refs/tags/test-dummy/1.1=33a8516eac48d6ae1daa0104446504d7136e2c9f 976s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/tags/test-dummy/1.2 976s currently refs/tags/test-dummy/1.2=1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 976s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 976s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 976s offered refs/tags/archive/test-dummy/1.1=d0b818884a8eaedec614b84b19a27b3f458b515b 976s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 976s offered refs/tags/archive/test-dummy/1.2=b0b916127aeda597f52d7e9b6b978a8dbf11cac0 976s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 976s offered refs/tags/test-dummy/1.1=33a8516eac48d6ae1daa0104446504d7136e2c9f 976s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 976s offered refs/tags/test-dummy/1.2=1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 976s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 976s get_archive_dsc: nothing in archive, returning undef 976s no version available from the archive 976s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 976s => `' 976s previous reference hash= 976s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 976s => `' 976s fetch_from_archive: lastfetch= 976s nothing found! 976s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 976s + git check-ref-format archive/test-dummy/2.0 976s | git symbolic-ref -q HEAD 976s => `refs/heads/master' 976s | git rev-parse 'HEAD~0' 976s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 976s ffq_prev_branchinfo branch current refs/heads/master 976s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 976s => `' 976s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 976s => `' 976s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 976s warning: could not open directory 'debian/source/': No such file or directory 976s => `' 976s + git diff --quiet HEAD 976s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0' 976s => `' 976s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 976s checking that example_2.0.dsc corresponds to HEAD 976s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.dsc 976s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.dsc) 976s dpkg-source: info: extracting example in example-2.0 976s dpkg-source: info: unpacking example_2.0.tar.gz 976s CD example-2.0 976s | find -name .git -prune -print0 976s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 976s + git add -Af . 976s | git write-tree 976s => `18c935f7d9e9d6f4e8c714dba79cea37f4a6c413' 976s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 976s + git diff --quiet 18c935f7d9e9d6f4e8c714dba79cea37f4a6c413 1c97ddd6759afae0eea88cf10027c6cba8866ea1 976s files_compare_inputs example_2.0.dsc 976s files_compare_inputs example_2.0.dsc Checksums-Sha256 976s files_compare_inputs example_2.0.dsc Checksums-Sha256 example_2.0.tar.gz 976s files_compare_inputs example_2.0.dsc Checksums-Sha1 976s files_compare_inputs example_2.0.dsc Checksums-Sha1 example_2.0.tar.gz 976s files_compare_inputs example_2.0.dsc Files 976s files_compare_inputs example_2.0.dsc Files example_2.0.tar.gz 976s files_compare_inputs example_2.0_multi.changes 976s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 976s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0.dsc 976s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0.tar.gz 976s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0_all.deb 976s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0_ppc64el.buildinfo 976s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 976s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0.dsc 976s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0.tar.gz 976s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0_all.deb 976s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0_ppc64el.buildinfo 976s files_compare_inputs example_2.0_multi.changes Files 976s files_compare_inputs example_2.0_multi.changes Files example_2.0.dsc 976s files_compare_inputs example_2.0_multi.changes Files example_2.0.tar.gz 976s files_compare_inputs example_2.0_multi.changes Files example_2.0_all.deb 976s files_compare_inputs example_2.0_multi.changes Files example_2.0_ppc64el.buildinfo 976s checking origs needed (2.0)... 976s checking origs needed placement 'devel extra'... 976s origs example_2.0.tar.gz | e99199f6be70638923c1fd68d14d7f9c 763 example_2.0.tar.gz 976s ../example_2.0_multi.changes already has appropriate .orig(s) (if any) 976s push_tagwants: $VAR1 = [ 976s '2.0', 976s '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 976s undef, 976s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 976s ]; 976s $VAR2 = [ 976s { 976s 'Objid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 976s 'TagFn' => sub { "DUMMY" }, 976s 'View' => 'dgit', 976s 'Tag' => 'archive/test-dummy/2.0', 976s 'Tfn' => sub { "DUMMY" }, 976s 'TfSuffix' => '' 976s }, 976s { 976s 'Tag' => 'test-dummy/2.0', 976s 'View' => 'dgit', 976s 'TagFn' => sub { "DUMMY" }, 976s 'TfSuffix' => '-dgit', 976s 'Tfn' => sub { "DUMMY" }, 976s 'Objid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1' 976s } 976s ]; 976s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 976s => `1530000000 +0000' 976s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 976s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 976s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 976s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 976s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 977s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 977s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 977s => `37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7' 977s + git verify-tag 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 977s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 977s gpg: Signature made Mon Mar 31 23:03:26 2025 UTC 977s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 977s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 977s gpg: WARNING: This key is not certified with a trusted signature! 977s gpg: There is no indication that the signature belongs to the owner. 977s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 977s + git update-ref refs/tags/archive/test-dummy/2.0 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 977s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 977s => `ab87ff4d38509178c14e017f987d907f149e1d68' 977s + git verify-tag ab87ff4d38509178c14e017f987d907f149e1d68 977s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 977s gpg: Signature made Mon Mar 31 23:03:26 2025 UTC 977s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 977s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 977s gpg: WARNING: This key is not certified with a trusted signature! 977s gpg: There is no indication that the signature belongs to the owner. 977s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 977s + git update-ref refs/tags/test-dummy/2.0 ab87ff4d38509178c14e017f987d907f149e1d68 977s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 977s => `1' 977s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1c97ddd6759afae0eea88cf10027c6cba8866ea1:refs/dgit/sid refs/tags/archive/test-dummy/2.0 refs/tags/test-dummy/2.0 977s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 977s * [new reference] 1c97ddd6759afae0eea88cf10027c6cba8866ea1 -> refs/dgit/sid 977s * [new tag] archive/test-dummy/2.0 -> archive/test-dummy/2.0 977s * [new tag] test-dummy/2.0 -> test-dummy/2.0 977s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 977s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0_multi.changes 977s signfile dsc ../example_2.0.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 977s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 977s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 977s 977s signfile buildinfo ../example_2.0_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 977s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 977s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 977s 977s fixup_changes dsc ../example_2.0.dsc ../example_2.0_multi.changes 977s fixup_changes buildinfo ../example_2.0_ppc64el.buildinfo ../example_2.0_multi.changes 977s signfile changes ../example_2.0_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 977s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 977s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 977s 977s Successfully signed dsc, buildinfo, changes files 977s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0_multi.changes 977s gpg: ../example_2.0_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 977s gpg: ../example_2.0.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 977s D: Setting host argument. 977s Checking signature on .changes 977s Checking signature on .dsc 977s Uploading to test-dummy (via local to localhost): 977s Successfully uploaded packages. 978s dgit ok: pushed and uploaded 2.0 978s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 978s del_lrfetchrefs... 978s del_lrfetchrefs: d0b818884a8eaedec614b84b19a27b3f458b515b refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 978s del_lrfetchrefs: b0b916127aeda597f52d7e9b6b978a8dbf11cac0 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 978s del_lrfetchrefs: 33a8516eac48d6ae1daa0104446504d7136e2c9f refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 978s del_lrfetchrefs: 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 978s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 978s ' 978s + t-pushed-good master sid 978s + local branch=master 978s + local suite=sid 978s + t-refs-same refs/heads/master 978s + local g 978s + for g in $* 978s + t-ref-same refs/heads/master 978s + local name=refs/heads/master 978s + local val 978s ++ t-git-get-ref refs/heads/master 978s ++ local ref=refs/heads/master 978s ++ case "$ref" in 978s ++ git show-ref -d refs/heads/master 978s ++ perl -ne ' 978s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 978s END { print "$x\n" if length $x; } 978s ' 978s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t-ref-same-val refs/heads/master 1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + local name=refs/heads/master 978s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + case "${t_ref_val-unset}" in 978s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t_ref_names+=("$name") 978s + t-pushed-good-core 978s + t-ref-dsc-dgit 978s + t-incoming-dsc 978s + local dsc=example_2.0.dsc 978s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc 978s + local val 978s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc Dgit 978s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc 978s ++ local field=Dgit 978s ++ perl -e ' 978s use Dpkg::Control::Hash; 978s my $h = new Dpkg::Control::Hash allow_pgp=>1; 978s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc"); 978s my $val = $h->{"Dgit"},"\n"; 978s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc Dgit" unless defined $val; 978s print $val,"\n"; 978s ' 978s + val='1c97ddd6759afae0eea88cf10027c6cba8866ea1 test-dummy archive/test-dummy/2.0 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 978s ++ perl -e ' 978s $_=shift @ARGV; 978s die "Dgit $_ ?" unless m/^\w+\b/; 978s print $&,"\n" or die $!; 978s ' '1c97ddd6759afae0eea88cf10027c6cba8866ea1 test-dummy archive/test-dummy/2.0 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 978s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc 1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc 978s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + case "${t_ref_val-unset}" in 978s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t_ref_names+=("$name") 978s ++ t-v-tag 978s ++ echo refs/tags/archive/test-dummy/2.0 978s + t-refs-same refs/tags/archive/test-dummy/2.0 refs/remotes/dgit/dgit/sid 978s + local g 978s + for g in $* 978s + t-ref-same refs/tags/archive/test-dummy/2.0 978s + local name=refs/tags/archive/test-dummy/2.0 978s + local val 978s ++ t-git-get-ref refs/tags/archive/test-dummy/2.0 978s ++ local ref=refs/tags/archive/test-dummy/2.0 978s ++ case "$ref" in 978s ++ perl -ne ' 978s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.0\E(?:\^\{\})?$#; 978s END { print "$x\n" if length $x; } 978s ++ git show-ref -d refs/tags/archive/test-dummy/2.0 978s ' 978s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t-ref-same-val refs/tags/archive/test-dummy/2.0 1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + local name=refs/tags/archive/test-dummy/2.0 978s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + case "${t_ref_val-unset}" in 978s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t_ref_names+=("$name") 978s + for g in $* 978s + t-ref-same refs/remotes/dgit/dgit/sid 978s + local name=refs/remotes/dgit/dgit/sid 978s + local val 978s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 978s ++ local ref=refs/remotes/dgit/dgit/sid 978s ++ case "$ref" in 978s ++ git show-ref -d refs/remotes/dgit/dgit/sid 978s ++ perl -ne ' 978s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 978s END { print "$x\n" if length $x; } 978s ' 978s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t-ref-same-val refs/remotes/dgit/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + local name=refs/remotes/dgit/dgit/sid 978s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + case "${t_ref_val-unset}" in 978s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t_ref_names+=("$name") 978s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 978s + local val 978s + for g in $* 978s ++ t-git-get-ref refs/heads/dgit/unstable 978s ++ local ref=refs/heads/dgit/unstable 978s ++ case "$ref" in 978s ++ git show-ref -d refs/heads/dgit/unstable 978s ++ perl -ne ' 978s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 978s END { print "$x\n" if length $x; } 978s ' 978s ++ test 1 = 1 978s + val= 978s + '[' x '!=' x ']' 978s + for g in $* 978s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 978s ++ local ref=refs/remotes/dgit/dgit/unstable 978s ++ case "$ref" in 978s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 978s ++ perl -ne ' 978s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 978s END { print "$x\n" if length $x; } 978s ' 978s ++ test 1 = 1 978s + val= 978s + '[' x '!=' x ']' 978s + set -e 978s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 978s ++ t-v-tag 978s ++ echo refs/tags/archive/test-dummy/2.0 978s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/2.0 978s + local g 978s + for g in $* 978s + t-ref-same refs/dgit/sid 978s + local name=refs/dgit/sid 978s + local val 978s ++ t-git-get-ref refs/dgit/sid 978s ++ local ref=refs/dgit/sid 978s ++ case "$ref" in 978s ++ git show-ref -d refs/dgit/sid 978s ++ perl -ne ' 978s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 978s END { print "$x\n" if length $x; } 978s ' 978s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t-ref-same-val refs/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + local name=refs/dgit/sid 978s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + case "${t_ref_val-unset}" in 978s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t_ref_names+=("$name") 978s + for g in $* 978s + t-ref-same refs/tags/archive/test-dummy/2.0 978s + local name=refs/tags/archive/test-dummy/2.0 978s + local val 978s ++ t-git-get-ref refs/tags/archive/test-dummy/2.0 978s ++ local ref=refs/tags/archive/test-dummy/2.0 978s ++ case "$ref" in 978s ++ git show-ref -d refs/tags/archive/test-dummy/2.0 978s ++ perl -ne ' 978s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.0\E(?:\^\{\})?$#; 978s END { print "$x\n" if length $x; } 978s ' 978s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t-ref-same-val refs/tags/archive/test-dummy/2.0 1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + local name=refs/tags/archive/test-dummy/2.0 978s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + case "${t_ref_val-unset}" in 978s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 978s + t_ref_names+=("$name") 978s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 978s + t-refs-notexist refs/dgit/unstable 978s + local val 978s + for g in $* 978s ++ t-git-get-ref refs/dgit/unstable 978s ++ local ref=refs/dgit/unstable 978s ++ case "$ref" in 978s ++ git show-ref -d refs/dgit/unstable 978s ++ perl -ne ' 978s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 978s END { print "$x\n" if length $x; } 978s ' 978s ++ test 1 = 1 978s + val= 978s + '[' x '!=' x ']' 978s ++ t-v-tag 978s ++ echo refs/tags/archive/test-dummy/2.0 978s + git verify-tag refs/tags/archive/test-dummy/2.0 978s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 978s gpg: Signature made Mon Mar 31 23:03:26 2025 UTC 978s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 978s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 978s gpg: WARNING: This key is not certified with a trusted signature! 978s gpg: There is no indication that the signature belongs to the owner. 978s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 978s + t-archive-process-incoming sid 978s + local suite=sid 978s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0_all.deb /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0_multi.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0_ppc64el.buildinfo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 978s + t-archive-query sid 978s + local suite=sid 978s + local dscf=main/example_2.0.dsc 978s + t-archive-query-aq sid example 2.0 main/example_2.0.dsc 978s + local suite=sid 978s + local p=example 978s + local v=2.0 978s + local dscf=main/example_2.0.dsc 978s + local sha 978s ++ sha256sum 978s + sha='a005078c22faf48a635ed3bd29ad042f2f4ab28027f32b14f9581519fb031b83 -' 978s + echo '2.0 a005078c22faf48a635ed3bd29ad042f2f4ab28027f32b14f9581519fb031b83 main/example_2.0.dsc' 978s + t-aq-archive-updated sid example 978s + local suite=sid 978s + local p=example 978s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 978s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 978s + perl -wne ' 978s use JSON; 978s use strict; 978s our @v; 978s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 978s push @v, { 978s "version" => "$1", 978s "sha256sum" => "$2", 978s "component" => "$3", 978s "filename" => "$4", 978s }; 978s END { 978s my $json = JSON->new->canonical(); 978s print $json->encode(\@v) or die $!; 978s } 978s ' 978s + echo sid-again 978s + git add which 978s + t-commit Sid 978s + local msg=Sid 978s + v=2.1 978s + t-debchange --force-distribution -v2.1 --distribution unstable Sid 978s + DEBEMAIL=dgit-tests@example.org 978s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v2.1 --distribution unstable Sid 978s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v2.1 --distribution unstable Sid 978s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 978s libdistro-info-perl is not installed, Debian release names are not known. 978s libdistro-info-perl is not installed, Ubuntu release names are not known. 978s + git add debian/changelog 978s + debcommit 978s git commit -m Sid 978s [master d5d72bd] Sid 978s 2 files changed, 7 insertions(+) 978s + revision=2 978s + push-to master sid 978s + t-refs-same-start 978s + unset t_ref_val 978s + t_ref_names=() 978s + t-ref-head 978s + local val 978s ++ git rev-parse HEAD 978s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 978s + t-ref-same-val HEAD d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 978s + local name=HEAD 978s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 978s + case "${t_ref_val-unset}" in 978s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 978s + t_ref_names+=("$name") 978s + t-dgit build 978s + local dgit=dgit 978s + pwd 978s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 978s + : ' 978s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 978s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 978s | git rev-parse --show-toplevel 978s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 978s | git config -z --get-regexp --local '.*' 978s | git config -z --get-regexp --local '.*' 978s | git config -z --get-regexp --global '.*' 978s | git config -z --get-regexp --system '.*' 978s format , quilt mode linear 978s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 978s warning: could not open directory 'debian/source/': No such file or directory 978s => `' 978s + git diff --quiet HEAD 978s massage split -F. 978s massage done 3 -b. 978s format , quilt mode linear 978s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 978s warning: could not open directory 'debian/source/': No such file or directory 978s => `' 978s + git diff --quiet HEAD 978s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 978s dpkg-buildpackage: info: source package example 978s dpkg-buildpackage: info: source version 2.1 978s dpkg-buildpackage: info: source distribution unstable 978s dpkg-buildpackage: info: source changed by dgit test git user 978s fakeroot debian/rules clean 978s EXAMPLE RULES TARGET clean 978s dh_clean 978s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 978s | git clean -dn 978s => `' 978s | git rev-parse 'HEAD~0' 978s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 978s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 978s CD work 978s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 978s + git reset -q --hard d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 978s CD .. 978s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 978s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 978s dpkg-source: warning: source directory 'work' is not - 'example-2.1' 978s dpkg-source: info: using source format '1.0' 978s dpkg-source: info: building example in example_2.1.tar.gz 978s dpkg-source: info: building example in example_2.1.dsc 978s CD work 978s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 978s changelog will contain changes since 2.0 978s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.1_source.changes dpkg-genchanges -S -v2.0 979s dpkg-genchanges: info: including full source code in upload 979s CD .. 979s moving example_2.1.dsc, example_2.1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 979s renaming (Files) example_2.1.tar.gz 979s renaming (dsc) example_2.1.dsc 979s renaming (changes) example_2.1_source.changes 979s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 979s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b -v2.0 979s dpkg-buildpackage: info: source package example 979s dpkg-buildpackage: info: source version 2.1 979s dpkg-buildpackage: info: source distribution unstable 979s dpkg-buildpackage: info: source changed by dgit test git user 979s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 979s dpkg-buildpackage: info: host architecture ppc64el 979s debian/rules build 979s EXAMPLE RULES TARGET build 979s fakeroot debian/rules binary 979s EXAMPLE RULES TARGET binary 979s dh_install 979s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 979s dh_gencontrol 979s dh_builddeb 979s dpkg-deb: building package 'example' in '../example_2.1_all.deb'. 979s dpkg-genbuildinfo --build=binary -O../example_2.1_ppc64el.buildinfo 979s dpkg-genchanges --build=binary -v2.0 -O../example_2.1_ppc64el.changes 979s dpkg-genchanges: info: binary-only upload (no source code included) 979s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 979s dpkg-buildpackage: info: binary-only upload (no source included) 979s CD .. 979s + mergechanges -f example_2.1_source.changes example_2.1_ppc64el.changes 980s dgit ok: build successful, results in example_2.1_multi.changes 980s 980s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 980s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 980s ' 980s + t-dgit push --new sid 980s + local dgit=dgit 980s + pwd 980s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 980s + : ' 980s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 980s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new sid 980s | git rev-parse --show-toplevel 980s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 980s | git config -z --get-regexp --local '.*' 980s | git config -z --get-regexp --local '.*' 980s | git config -z --get-regexp --global '.*' 980s | git config -z --get-regexp --system '.*' 980s format , quilt mode linear 980s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 980s warning: could not open directory 'debian/source/': No such file or directory 980s => `' 980s + git diff --quiet HEAD 980s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 980s canonical suite name for unstable is sid 980s actually entering push 980s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 980s => `1' 980s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 980s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 980s git_lrfetch_sane iteration 0 980s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 980s => 1c97ddd6759afae0eea88cf10027c6cba8866ea1 refs/dgit/sid 980s => d0b818884a8eaedec614b84b19a27b3f458b515b refs/tags/archive/test-dummy/1.1 980s => b0b916127aeda597f52d7e9b6b978a8dbf11cac0 refs/tags/archive/test-dummy/1.2 980s => 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 refs/tags/archive/test-dummy/2.0 980s => 33a8516eac48d6ae1daa0104446504d7136e2c9f refs/tags/test-dummy/1.1 980s => 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 refs/tags/test-dummy/1.2 980s => ab87ff4d38509178c14e017f987d907f149e1d68 refs/tags/test-dummy/2.0 980s 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 980s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 980s | git for-each-ref refs/dgit-fetch/test-dummy 980s |> 1c97ddd6759afae0eea88cf10027c6cba8866ea1 commit refs/dgit-fetch/test-dummy/dgit/sid 980s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 980s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 980s |> 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 980s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 980s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 980s |> ab87ff4d38509178c14e017f987d907f149e1d68 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 980s git_lrfetch_sane: tidying any old suite lrfetchrefs 980s | git for-each-ref refs/dgit-fetch/sid 980s git_lrfetch_sane: git fetch --no-insane emulation complete 980s $VAR1 = { 980s 'refs/dgit-fetch/test-dummy/dgit/sid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 980s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0' => 'ab87ff4d38509178c14e017f987d907f149e1d68', 980s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0' => '37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7', 980s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => '1f87342067cb976b8ba8ea4ac5fd502aab26b0c1', 980s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => '33a8516eac48d6ae1daa0104446504d7136e2c9f', 980s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => 'b0b916127aeda597f52d7e9b6b978a8dbf11cac0', 980s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => 'd0b818884a8eaedec614b84b19a27b3f458b515b' 980s }; 980s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 980s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/tags/archive/test-dummy/1.1 980s currently refs/tags/archive/test-dummy/1.1=d0b818884a8eaedec614b84b19a27b3f458b515b 980s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/tags/archive/test-dummy/1.2 980s currently refs/tags/archive/test-dummy/1.2=b0b916127aeda597f52d7e9b6b978a8dbf11cac0 980s |> 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 tag refs/tags/archive/test-dummy/2.0 980s currently refs/tags/archive/test-dummy/2.0=37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 980s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/tags/test-dummy/1.1 980s currently refs/tags/test-dummy/1.1=33a8516eac48d6ae1daa0104446504d7136e2c9f 980s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/tags/test-dummy/1.2 980s currently refs/tags/test-dummy/1.2=1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 980s |> ab87ff4d38509178c14e017f987d907f149e1d68 tag refs/tags/test-dummy/2.0 980s currently refs/tags/test-dummy/2.0=ab87ff4d38509178c14e017f987d907f149e1d68 980s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 980s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 980s offered refs/tags/archive/test-dummy/1.1=d0b818884a8eaedec614b84b19a27b3f458b515b 980s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 980s offered refs/tags/archive/test-dummy/1.2=b0b916127aeda597f52d7e9b6b978a8dbf11cac0 980s |> 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 980s offered refs/tags/archive/test-dummy/2.0=37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 980s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 980s offered refs/tags/test-dummy/1.1=33a8516eac48d6ae1daa0104446504d7136e2c9f 980s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 980s offered refs/tags/test-dummy/1.2=1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 980s |> ab87ff4d38509178c14e017f987d907f149e1d68 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 980s offered refs/tags/test-dummy/2.0=ab87ff4d38509178c14e017f987d907f149e1d68 980s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 980s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.0.dsc... 980s get_archive_dsc: Version 2.0 980s last upload to archive: specified git info (test-dummy) 980s GCF| git cat-file --batch 980s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 980s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 980s GCF>| 1c97ddd6759afae0eea88cf10027c6cba8866ea1 980s GCF<| 1c97ddd6759afae0eea88cf10027c6cba8866ea1 commit 250 980s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s previous reference hash=1c97ddd6759afae0eea88cf10027c6cba8866ea1 980s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s fetch_from_archive: lastfetch=1c97ddd6759afae0eea88cf10027c6cba8866ea1 980s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s fetch mergeinfos: 980s commit 1c97ddd6759afae0eea88cf10027c6cba8866ea1 Dgit field in .dsc from archive 980s fetch hash=1c97ddd6759afae0eea88cf10027c6cba8866ea1 980s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 1c97ddd6759afae0eea88cf10027c6cba8866ea1 980s | git log -n2 1c97ddd6759afae0eea88cf10027c6cba8866ea1 980s => `commit 1c97ddd6759afae0eea88cf10027c6cba8866ea1'... 980s | git ls-tree -lrz -- 1c97ddd6759afae0eea88cf10027c6cba8866ea1: 980s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 980s + git check-ref-format archive/test-dummy/2.1 980s | git symbolic-ref -q HEAD 980s => `refs/heads/master' 980s | git rev-parse 'HEAD~0' 980s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 980s ffq_prev_branchinfo branch current refs/heads/master 980s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 980s => `' 980s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 980s => `' 980s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 980s warning: could not open directory 'debian/source/': No such file or directory 980s => `' 980s + git diff --quiet HEAD 980s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 980s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 980s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.1' 980s => `' 980s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 980s checking that example_2.1.dsc corresponds to HEAD 980s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.dsc 980s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.dsc) 980s dpkg-source: info: extracting example in example-2.1 980s dpkg-source: info: unpacking example_2.1.tar.gz 980s CD example-2.1 980s | find -name .git -prune -print0 980s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 980s + git add -Af . 980s | git write-tree 980s => `0a454783758b3963f285d311a15fe86e962c54d4' 980s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 980s + git diff --quiet 0a454783758b3963f285d311a15fe86e962c54d4 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 981s files_compare_inputs example_2.1.dsc 981s files_compare_inputs example_2.1.dsc Checksums-Sha256 981s files_compare_inputs example_2.1.dsc Checksums-Sha256 example_2.1.tar.gz 981s files_compare_inputs example_2.1.dsc Checksums-Sha1 981s files_compare_inputs example_2.1.dsc Checksums-Sha1 example_2.1.tar.gz 981s files_compare_inputs example_2.1.dsc Files 981s files_compare_inputs example_2.1.dsc Files example_2.1.tar.gz 981s files_compare_inputs example_2.1_multi.changes 981s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 981s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1.dsc 981s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1.tar.gz 981s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1_all.deb 981s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1_ppc64el.buildinfo 981s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 981s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1.dsc 981s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1.tar.gz 981s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1_all.deb 981s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1_ppc64el.buildinfo 981s files_compare_inputs example_2.1_multi.changes Files 981s files_compare_inputs example_2.1_multi.changes Files example_2.1.dsc 981s files_compare_inputs example_2.1_multi.changes Files example_2.1.tar.gz 981s files_compare_inputs example_2.1_multi.changes Files example_2.1_all.deb 981s files_compare_inputs example_2.1_multi.changes Files example_2.1_ppc64el.buildinfo 981s checking origs needed (2.1)... 981s checking origs needed placement 'devel extra'... 981s origs example_2.1.tar.gz | 3c579320ad06b5c818289baa3f0ecb96 1021 example_2.1.tar.gz 981s ../example_2.1_multi.changes already has appropriate .orig(s) (if any) 981s push_tagwants: $VAR1 = [ 981s '2.1', 981s 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 981s undef, 981s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 981s ]; 981s $VAR2 = [ 981s { 981s 'Tfn' => sub { "DUMMY" }, 981s 'Tag' => 'archive/test-dummy/2.1', 981s 'TfSuffix' => '', 981s 'View' => 'dgit', 981s 'Objid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 981s 'TagFn' => sub { "DUMMY" } 981s }, 981s { 981s 'Tfn' => sub { "DUMMY" }, 981s 'Tag' => 'test-dummy/2.1', 981s 'TagFn' => sub { "DUMMY" }, 981s 'View' => 'dgit', 981s 'Objid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 981s 'TfSuffix' => '-dgit' 981s } 981s ]; 981s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 981s => `1530000000 +0000' 981s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 981s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 981s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 981s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 981s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 981s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 981s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 981s => `a76884198f9e5dec93121b0102b6d43b553fedab' 981s + git verify-tag a76884198f9e5dec93121b0102b6d43b553fedab 981s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 981s gpg: Signature made Mon Mar 31 23:03:31 2025 UTC 981s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 981s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 981s gpg: WARNING: This key is not certified with a trusted signature! 981s gpg: There is no indication that the signature belongs to the owner. 981s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 981s + git update-ref refs/tags/archive/test-dummy/2.1 a76884198f9e5dec93121b0102b6d43b553fedab 981s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 981s => `42a2e8da3b3c729aeb061608e06306a3f4cab637' 981s + git verify-tag 42a2e8da3b3c729aeb061608e06306a3f4cab637 981s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 981s gpg: Signature made Mon Mar 31 23:03:31 2025 UTC 981s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 981s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 981s gpg: WARNING: This key is not certified with a trusted signature! 981s gpg: There is no indication that the signature belongs to the owner. 981s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 981s + git update-ref refs/tags/test-dummy/2.1 42a2e8da3b3c729aeb061608e06306a3f4cab637 981s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 981s => `1' 981s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git d5d72bd268117528fdb90dd8ee4f0f2fe5432b61:refs/dgit/sid refs/tags/archive/test-dummy/2.1 refs/tags/test-dummy/2.1 981s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 981s 1c97ddd..d5d72bd d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> refs/dgit/sid 981s * [new tag] archive/test-dummy/2.1 -> archive/test-dummy/2.1 981s * [new tag] test-dummy/2.1 -> test-dummy/2.1 981s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 981s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.1_multi.changes 981s signfile dsc ../example_2.1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 981s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 981s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 981s 981s signfile buildinfo ../example_2.1_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 981s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 981s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 981s 981s fixup_changes dsc ../example_2.1.dsc ../example_2.1_multi.changes 981s fixup_changes buildinfo ../example_2.1_ppc64el.buildinfo ../example_2.1_multi.changes 981s signfile changes ../example_2.1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 981s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 981s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 981s 981s Successfully signed dsc, buildinfo, changes files 981s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.1_multi.changes 982s gpg: ../example_2.1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 982s gpg: ../example_2.1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 982s D: Setting host argument. 982s Checking signature on .changes 982s Checking signature on .dsc 982s Uploading to test-dummy (via local to localhost): 982s Successfully uploaded packages. 982s dgit ok: pushed and uploaded 2.1 982s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 982s del_lrfetchrefs... 982s del_lrfetchrefs: 1c97ddd6759afae0eea88cf10027c6cba8866ea1 refs/dgit-fetch/test-dummy/dgit/sid 982s del_lrfetchrefs: d0b818884a8eaedec614b84b19a27b3f458b515b refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 982s del_lrfetchrefs: b0b916127aeda597f52d7e9b6b978a8dbf11cac0 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 982s del_lrfetchrefs: 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 982s del_lrfetchrefs: 33a8516eac48d6ae1daa0104446504d7136e2c9f refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 982s del_lrfetchrefs: 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 982s del_lrfetchrefs: ab87ff4d38509178c14e017f987d907f149e1d68 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 982s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 982s ' 982s + t-pushed-good master sid 982s + local branch=master 982s + local suite=sid 982s + t-refs-same refs/heads/master 982s + local g 982s + for g in $* 982s + t-ref-same refs/heads/master 982s + local name=refs/heads/master 982s + local val 982s ++ t-git-get-ref refs/heads/master 982s ++ local ref=refs/heads/master 982s ++ case "$ref" in 982s ++ perl -ne ' 982s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 982s END { print "$x\n" if length $x; } 982s ' 982s ++ git show-ref -d refs/heads/master 982s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t-ref-same-val refs/heads/master d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + local name=refs/heads/master 982s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + case "${t_ref_val-unset}" in 982s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t_ref_names+=("$name") 982s + t-pushed-good-core 982s + t-ref-dsc-dgit 982s + t-incoming-dsc 982s + local dsc=example_2.1.dsc 982s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc 982s + local val 982s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc Dgit 982s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc 982s ++ local field=Dgit 982s ++ perl -e ' 982s use Dpkg::Control::Hash; 982s my $h = new Dpkg::Control::Hash allow_pgp=>1; 982s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc"); 982s my $val = $h->{"Dgit"},"\n"; 982s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc Dgit" unless defined $val; 982s print $val,"\n"; 982s ' 982s + val='d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 test-dummy archive/test-dummy/2.1 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 982s ++ perl -e ' 982s $_=shift @ARGV; 982s die "Dgit $_ ?" unless m/^\w+\b/; 982s print $&,"\n" or die $!; 982s ' 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61 test-dummy archive/test-dummy/2.1 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 982s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc 982s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + case "${t_ref_val-unset}" in 982s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t_ref_names+=("$name") 982s ++ t-v-tag 982s ++ echo refs/tags/archive/test-dummy/2.1 982s + t-refs-same refs/tags/archive/test-dummy/2.1 refs/remotes/dgit/dgit/sid 982s + local g 982s + for g in $* 982s + t-ref-same refs/tags/archive/test-dummy/2.1 982s + local name=refs/tags/archive/test-dummy/2.1 982s + local val 982s ++ t-git-get-ref refs/tags/archive/test-dummy/2.1 982s ++ local ref=refs/tags/archive/test-dummy/2.1 982s ++ case "$ref" in 982s ++ git show-ref -d refs/tags/archive/test-dummy/2.1 982s ++ perl -ne ' 982s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.1\E(?:\^\{\})?$#; 982s END { print "$x\n" if length $x; } 982s ' 982s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t-ref-same-val refs/tags/archive/test-dummy/2.1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + local name=refs/tags/archive/test-dummy/2.1 982s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + case "${t_ref_val-unset}" in 982s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t_ref_names+=("$name") 982s + for g in $* 982s + t-ref-same refs/remotes/dgit/dgit/sid 982s + local name=refs/remotes/dgit/dgit/sid 982s + local val 982s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 982s ++ local ref=refs/remotes/dgit/dgit/sid 982s ++ case "$ref" in 982s ++ git show-ref -d refs/remotes/dgit/dgit/sid 982s ++ perl -ne ' 982s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 982s END { print "$x\n" if length $x; } 982s ' 982s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t-ref-same-val refs/remotes/dgit/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + local name=refs/remotes/dgit/dgit/sid 982s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + case "${t_ref_val-unset}" in 982s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t_ref_names+=("$name") 982s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 982s + local val 982s + for g in $* 982s ++ t-git-get-ref refs/heads/dgit/unstable 982s ++ local ref=refs/heads/dgit/unstable 982s ++ case "$ref" in 982s ++ git show-ref -d refs/heads/dgit/unstable 982s ++ perl -ne ' 982s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 982s END { print "$x\n" if length $x; } 982s ' 982s ++ test 1 = 1 982s + val= 982s + '[' x '!=' x ']' 982s + for g in $* 982s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 982s ++ local ref=refs/remotes/dgit/dgit/unstable 982s ++ case "$ref" in 982s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 982s ++ perl -ne ' 982s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 982s END { print "$x\n" if length $x; } 982s ' 982s ++ test 1 = 1 982s + val= 982s + '[' x '!=' x ']' 982s + set -e 982s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 982s ++ t-v-tag 982s ++ echo refs/tags/archive/test-dummy/2.1 982s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/2.1 982s + local g 982s + for g in $* 982s + t-ref-same refs/dgit/sid 982s + local name=refs/dgit/sid 982s + local val 982s ++ t-git-get-ref refs/dgit/sid 982s ++ local ref=refs/dgit/sid 982s ++ case "$ref" in 982s ++ git show-ref -d refs/dgit/sid 982s ++ perl -ne ' 982s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 982s END { print "$x\n" if length $x; } 982s ' 982s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t-ref-same-val refs/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + local name=refs/dgit/sid 982s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + case "${t_ref_val-unset}" in 982s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t_ref_names+=("$name") 982s + for g in $* 982s + t-ref-same refs/tags/archive/test-dummy/2.1 982s + local name=refs/tags/archive/test-dummy/2.1 982s + local val 982s ++ t-git-get-ref refs/tags/archive/test-dummy/2.1 982s ++ local ref=refs/tags/archive/test-dummy/2.1 982s ++ case "$ref" in 982s ++ git show-ref -d refs/tags/archive/test-dummy/2.1 982s ++ perl -ne ' 982s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.1\E(?:\^\{\})?$#; 982s END { print "$x\n" if length $x; } 982s ' 982s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t-ref-same-val refs/tags/archive/test-dummy/2.1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + local name=refs/tags/archive/test-dummy/2.1 982s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + case "${t_ref_val-unset}" in 982s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 982s + t_ref_names+=("$name") 982s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 982s + t-refs-notexist refs/dgit/unstable 982s + local val 982s + for g in $* 982s ++ t-git-get-ref refs/dgit/unstable 982s ++ local ref=refs/dgit/unstable 982s ++ case "$ref" in 982s ++ git show-ref -d refs/dgit/unstable 982s ++ perl -ne ' 982s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 982s END { print "$x\n" if length $x; } 982s ' 982s ++ test 1 = 1 982s + val= 982s + '[' x '!=' x ']' 982s ++ t-v-tag 982s ++ echo refs/tags/archive/test-dummy/2.1 982s + git verify-tag refs/tags/archive/test-dummy/2.1 982s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 982s gpg: Signature made Mon Mar 31 23:03:31 2025 UTC 982s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 982s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 982s gpg: WARNING: This key is not certified with a trusted signature! 982s gpg: There is no indication that the signature belongs to the owner. 982s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 982s + t-archive-process-incoming sid 982s + local suite=sid 982s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1_all.deb /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1_multi.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1_ppc64el.buildinfo /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 982s + t-archive-query sid 982s + local suite=sid 982s + local dscf=main/example_2.1.dsc 982s + t-archive-query-aq sid example 2.1 main/example_2.1.dsc 982s + local suite=sid 982s + local p=example 982s + local v=2.1 982s + local dscf=main/example_2.1.dsc 982s + local sha 982s ++ sha256sum 982s + sha='48d922237ceecbe68a8536890766a763930b643a8f9b4d8a28322d56f615a79a -' 982s + echo '2.1 48d922237ceecbe68a8536890766a763930b643a8f9b4d8a28322d56f615a79a main/example_2.1.dsc' 982s + t-aq-archive-updated sid example 982s + local suite=sid 982s + local p=example 982s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 982s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 982s + perl -wne ' 982s use JSON; 982s use strict; 982s our @v; 982s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 982s push @v, { 982s "version" => "$1", 982s "sha256sum" => "$2", 982s "component" => "$3", 982s "filename" => "$4", 982s }; 982s END { 982s my $json = JSON->new->canonical(); 982s print $json->encode(\@v) or die $!; 982s } 982s ' 982s + git clean -xdff 982s Removing debian/.debhelper/ 982s Removing debian/example.debhelper.log 982s Removing debian/example.substvars 982s Removing debian/example/ 982s Removing debian/files 982s + t-setup-done 'v suitespecs majorv revision' 'aq git mirror example' ' 982s t-select-package example 982s ' 982s + local 'savevars=v suitespecs majorv revision' 982s + local 'savedirs=aq git mirror example' 982s + local 'importeval= 982s t-select-package example 982s ' 982s + local import=IMPORT.examplegit 982s + exec 982s + local vn 982s + for vn in $savevars 982s ++ eval 'printf '\''%s\n'\'' "$v"' 982s +++ printf '%s\n' 2.1 982s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -e ' 982s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 982s ' v 2.1 982s + for vn in $savevars 982s ++ eval 'printf '\''%s\n'\'' "$suitespecs"' 982s +++ printf '%s\n' 'sid:unstable stable testing' 982s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -e ' 982s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 982s ' suitespecs 'sid:unstable stable testing' 982s + for vn in $savevars 982s ++ eval 'printf '\''%s\n'\'' "$majorv"' 982s +++ printf '%s\n' 2 982s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -e ' 982s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 982s ' majorv 2 982s + for vn in $savevars 982s ++ eval 'printf '\''%s\n'\'' "$revision"' 982s +++ printf '%s\n' 2 982s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -e ' 982s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 982s ' revision 2 982s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 982s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 982s print STDERR "saving-exporting $vn\n"; 982s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 982s or die $!; 982s } 982s ' 982s saving-exporting DGIT_TEST_REAL_GPG_AGENT 982s saving-exporting DGIT_TEST_REAL_GPG 982s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 982s + set -e 982s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s + tar cf IMPORT.examplegit.tar aq git mirror example 982s + printf '\n%s\n' ' 982s t-select-package example 982s ' 982s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.examplegit.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.examplegit 982s + rc=0 982s + set +x 982s + set +e 982s + pwd 982s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 982s + '[' x '!=' x ']' 982s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 982s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 982s + set -e 982s + test 0 = 0 982s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 982s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 982s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.examplegit 982s ++ v=2.1 982s ++ suitespecs='sid:unstable stable testing' 982s ++ majorv=2 982s ++ revision=2 982s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 982s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 982s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 982s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 982s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 982s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 982s ++ t-select-package example 982s ++ p=example 982s ++ dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 982s + t-setup-import http-git-check 982s + local setupname=http-git-check 982s + local setupsrc 982s + local lock 982s + '[' x = x ']' 982s + setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s + lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 982s + local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 982s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check ']' 982s + with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 982s cd "$1"; shift 982s setupname="$1"; shift 982s simport="$1"; shift 982s if [ -e "$simport" ]; then exit 0; fi 982s env - "$@" \ 982s "tests/setup/$setupname" 982s ' x /tmp/autopkgtest.XK8uun/build.980/src http-git-check /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 982s + cd /tmp/autopkgtest.XK8uun/build.980/src 982s + shift 982s + setupname=http-git-check 982s + shift 982s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 982s + shift 982s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check ']' 982s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/alternating-dgit-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/alternating-dgit-stderr --stdout=/tmp/autopkgtest.XK8uun/alternating-dgit-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/alternating-dgit -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/alternating-dgit' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/alternating-dgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/http-git-check 982s ++ set -o pipefail 982s ++ . tests/lib-core 982s ++ . tests/lib-restricts 982s ++ trap ' 982s rc=$? 982s set +x 982s test $rc = 0 || echo " 982s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 982s 982s Most relevant logs are just before assignment rc=$rc 982s Will now do cleanup etc. 982s " 982s set -x 982s set +e 982s pwd 982s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 982s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 982s set -e 982s test $rc = 0 || t-report-failure 982s ' EXIT 982s ++ t-filter-out-git-hyphen-dir 982s ++ local pathent 982s +++ type -p git-rev-parse 982s +++ : 982s ++ pathent= 982s ++ case "$pathent" in 982s ++ return 982s ++ t-set-intree 982s ++ '[' x = x ']' 982s ++ return 982s ++ : -D 982s ++ export DGIT_TEST_DEBUG 982s ++ : x 982s ++ export DGIT_TEST_DEBPUSH_DEBUG 982s ++ : 982s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 982s ++ GIT_COMMITTER_DATE='1530000000 +0100' 982s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 982s ++ GIT_AUTHOR_DATE='1530000000 +0100' 982s ++ export LC_CTYPE=C.UTF-8 982s ++ LC_CTYPE=C.UTF-8 982s ++ unset CDPATH 982s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 982s ++ FILTER_BRANCH_SQUELCH_WARNING=1 982s +++ pwd 982s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 982s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 982s ++ testname=http-git-check 982s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 982s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 982s ++ bpd=.. 982s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 982s ++ '[' x '!=' x ']' 982s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s +++ pwd 982s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s ++ t-set-using-tmp 982s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 982s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 982s ++ export 'DEBFULLNAME=dgit test git user' 982s ++ DEBFULLNAME='dgit test git user' 982s ++ git config --global user.email dgit-test@debian.example.net 982s ++ git config --global user.name 'dgit test git user' 982s ++ git config --global protocol.ext.allow always 982s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 982s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 982s ++ export DEBCHANGE_VENDOR=dpkg 982s ++ DEBCHANGE_VENDOR=dpkg 982s ++ unset VISUAL 982s ++ unset GIT_EDITOR 982s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 982s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 982s ++ cat 982s ++ schroot=build 982s ++ : aq 982s ++ : archive/test-dummy 982s ++ : sid:unstable 982s ++ t-git-config dgit.default.old-dsc-distro test-dummy 982s ++ git config --global dgit.default.old-dsc-distro test-dummy 982s ++ for import in ${autoimport-gnupg} 982s ++ case "$0" in 982s ++ t-setup-import gnupg 982s ++ local setupname=gnupg 982s ++ local setupsrc 982s ++ local lock 982s ++ '[' x = x ']' 982s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 982s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 982s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 982s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 982s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 982s ++ . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 982s +++ DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 982s +++ DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 982s +++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 982s +++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 982s +++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 982s +++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 982s +++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 982s +++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 982s +++ export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 982s +++ cat 982s +++ : /usr/bin/gpg-agent 982s ++++ type -p gpg-agent 982s +++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 982s +++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 982s +++ export DGIT_STUNT_AGENT=/tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/gpg-agent 982s +++ DGIT_STUNT_AGENT=/tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/gpg-agent 982s +++ t-tstunt gpg 982s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 982s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 982s +++ local var=PATH 982s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 982s +++ eval ' 982s case "$PATH" in 982s "$tstunt:"*) ;; 982s *":$tstunt:"*) ;; 982s "") PATH="$tstunt" ;; 982s *) PATH="$tstunt:$PATH" ;; 982s esac 982s export PATH 982s ' 982s ++++ case "$PATH" in 982s ++++ PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 982s ++++ export PATH 982s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 982s +++ local var=PERLLIB 982s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 982s +++ eval ' 982s case "$PERLLIB" in 982s "$tstunt:"*) ;; 982s *":$tstunt:"*) ;; 982s "") PERLLIB="$tstunt" ;; 982s *) PERLLIB="$tstunt:$PERLLIB" ;; 982s esac 982s export PERLLIB 982s ' 982s ++++ case "$PERLLIB" in 982s ++++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 982s ++++ export PERLLIB 982s +++ local f 982s +++ for f in "$@" 982s +++ t-tstunt--save-real gpg 982s +++ local f=gpg 982s +++ case "$f" in 982s +++ local rc 982s +++ local real 982s +++ set +e 982s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 982s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 982s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 982s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 982s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 982s ++++ type -p gpg 982s +++ real=/usr/bin/gpg 982s +++ rc=0 982s +++ set -e 982s +++ case $rc in 982s +++ local varname=gpg 982s +++ varname=DGIT_TEST_REAL_GPG 982s +++ eval ' 982s : ${DGIT_TEST_REAL_GPG:=$real} 982s export DGIT_TEST_REAL_GPG 982s ' 982s ++++ : /usr/bin/gpg 982s ++++ export DGIT_TEST_REAL_GPG 982s +++ f=./gpg 982s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 982s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 982s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 982s + t-dependencies libhttp-server-simple-static-perl 982s + : 'Hopefully installed: libhttp-server-simple-static-perl' 982s + t-setup-done '' --files-from=/dev/null ' 982s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 982s read <$tmp/must-clean/git-check.port git_check_port 982s 982s t-git-config --global dgit-distro.test-dummy.git-check url 982s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 982s t-git-config --global dgit-distro.test-dummy.git-check-url \ 982s http://127.0.0.1:$git_check_port 982s ' 982s + local savevars= 982s + local savedirs=--files-from=/dev/null 982s + local 'importeval= 982s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 982s read <$tmp/must-clean/git-check.port git_check_port 982s 982s t-git-config --global dgit-distro.test-dummy.git-check url 982s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 982s t-git-config --global dgit-distro.test-dummy.git-check-url \ 982s http://127.0.0.1:$git_check_port 982s ' 982s + local import=IMPORT.http-git-check 982s + exec 982s + local vn 982s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 982s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 982s print STDERR "saving-exporting $vn\n"; 982s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 982s or die $!; 982s } 982s ' 982s saving-exporting DGIT_TEST_REAL_GPG 982s saving-exporting DGIT_TEST_REAL_GPG_AGENT 982s + set -e 982s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 982s + printf '\n%s\n' ' 982s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 982s read <$tmp/must-clean/git-check.port git_check_port 982s 982s t-git-config --global dgit-distro.test-dummy.git-check url 982s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 982s t-git-config --global dgit-distro.test-dummy.git-check-url \ 982s http://127.0.0.1:$git_check_port 982s ' 982s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 982s + rc=0 982s + set +x 982s + set +e 982s + pwd 982s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 982s + '[' x '!=' x ']' 982s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 982s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 982s + set -e 982s + test 0 = 0 982s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 982s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 982s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 982s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 982s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 982s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 982s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 982s ++ /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 982s ++ read git_check_port 982s ++ t-git-config --global dgit-distro.test-dummy.git-check url 982s ++ git config --global --global dgit-distro.test-dummy.git-check url 982s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 982s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 982s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:43907 982s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:43907 982s + cd example 982s + git checkout -b nondgit 982s Switched to a new branch 'nondgit' 982s + t-commit 'non-dgit upload' 982s + local 'msg=non-dgit upload' 982s + v=2.2 982s + t-debchange --force-distribution -v2.2 --distribution unstable 'non-dgit upload' 982s + DEBEMAIL=dgit-tests@example.org 982s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v2.2 --distribution unstable 'non-dgit upload' 982s + 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 982s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 982s libdistro-info-perl is not installed, Debian release names are not known. 982s libdistro-info-perl is not installed, Ubuntu release names are not known. 982s + git add debian/changelog 982s + debcommit 983s git commit -m 'non-dgit upload' 983s [nondgit f9f283c] non-dgit upload 983s 1 file changed, 6 insertions(+) 983s + revision=3 983s + t-non-dgit-upload 983s + t-dgit -wgf build-source 983s + local dgit=dgit 983s + pwd 983s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 983s + : ' 983s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 983s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf build-source 983s | git rev-parse --show-toplevel 983s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 983s | git config -z --get-regexp --local '.*' 983s | git config -z --get-regexp --local '.*' 983s | git config -z --get-regexp --global '.*' 983s | git config -z --get-regexp --system '.*' 983s format , quilt mode linear 983s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 983s warning: could not open directory 'debian/source/': No such file or directory 983s => `' 983s + git diff --quiet HEAD 983s | git clean -dn 983s => `' 983s | git rev-parse 'HEAD~0' 983s => `f9f283c05d70ccdeafb6ce29433c21a951e1c754' 983s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 983s CD work 983s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 983s + git reset -q --hard f9f283c05d70ccdeafb6ce29433c21a951e1c754 983s CD .. 983s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 983s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 983s dpkg-source: warning: source directory 'work' is not - 'example-2.2' 983s dpkg-source: info: using source format '1.0' 983s dpkg-source: info: building example in example_2.2.tar.gz 983s dpkg-source: info: building example in example_2.2.dsc 983s CD work 983s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 983s changelog will contain changes since 2.1 983s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.2_source.changes dpkg-genchanges -S -v2.1 983s dpkg-genchanges: info: including full source code in upload 983s CD .. 983s moving example_2.2.dsc, example_2.2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 983s renaming (Files) example_2.2.tar.gz 983s renaming (dsc) example_2.2.dsc 983s renaming (changes) example_2.2_source.changes 983s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 983s dgit ok: source built, results in example_2.2.dsc and example_2.2_source.changes 983s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 983s ' 983s + cd .. 983s + c=example_2.2_source.changes 983s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A example_2.2_source.changes 983s signfile dsc example_2.2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 983s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 983s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 983s 983s fixup_changes dsc example_2.2.dsc example_2.2_source.changes 983s signfile changes example_2.2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 983s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 983s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 983s 983s Successfully signed dsc, changes files 983s + dput -c /tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy example_2.2_source.changes 984s gpg: /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example_2.2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 984s gpg: /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example_2.2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 984s D: Setting host argument. 984s Checking signature on .changes 984s Checking signature on .dsc 984s Uploading to test-dummy (via local to localhost): 984s Successfully uploaded packages. 984s + t-archive-process-incoming sid 984s + local suite=sid 984s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.2.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.2_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 984s + t-archive-query sid 984s + local suite=sid 984s + local dscf=main/example_2.2.dsc 984s + t-archive-query-aq sid example 2.2 main/example_2.2.dsc 984s + local suite=sid 984s + local p=example 984s + local v=2.2 984s + local dscf=main/example_2.2.dsc 984s + local sha 984s ++ sha256sum 984s + sha='5a90f885a18fb47ff7c956da87b765aef06d3304efba11d4c73fa9da7d7b3c7b -' 984s + echo '2.2 5a90f885a18fb47ff7c956da87b765aef06d3304efba11d4c73fa9da7d7b3c7b main/example_2.2.dsc' 984s + t-aq-archive-updated sid example 984s + local suite=sid 984s + local p=example 984s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 984s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 984s + perl -wne ' 984s use JSON; 984s use strict; 984s our @v; 984s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 984s push @v, { 984s "version" => "$1", 984s "sha256sum" => "$2", 984s "component" => "$3", 984s "filename" => "$4", 984s }; 984s END { 984s my $json = JSON->new->canonical(); 984s print $json->encode(\@v) or die $!; 984s } 984s ' 984s + t-git-next-date 984s + GIT_COMMITTER_DATE='1530000001 +0100' 984s + GIT_AUTHOR_DATE='1530000001 +0100' 984s + cd example 984s + cd .. 984s + t-dgit clone example ./example.2 984s + local dgit=dgit 984s + pwd 984s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 984s + : ' 984s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 984s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone example ./example.2 984s | git config -z --get-regexp --global '.*' 984s | git config -z --get-regexp --system '.*' 984s clone main body 984s CD ./example.2 984s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 984s canonical suite name for unstable is sid 984s query: fetching http://127.0.0.1:43907/example.git/HEAD... 984s dgit-repos check_for_git => 1. 984s + git init -q 984s | git config -z --get-regexp --local '.*' 984s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 984s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 984s + git config user.name 'dgit test git user' 984s is_gitattrs_setup: found nothing 984s fetching existing git history 984s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 984s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 984s git_lrfetch_sane iteration 0 984s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 984s => d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 refs/dgit/sid 984s => d0b818884a8eaedec614b84b19a27b3f458b515b refs/tags/archive/test-dummy/1.1 984s => b0b916127aeda597f52d7e9b6b978a8dbf11cac0 refs/tags/archive/test-dummy/1.2 984s => 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 refs/tags/archive/test-dummy/2.0 984s => a76884198f9e5dec93121b0102b6d43b553fedab refs/tags/archive/test-dummy/2.1 984s => 33a8516eac48d6ae1daa0104446504d7136e2c9f refs/tags/test-dummy/1.1 984s => 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 refs/tags/test-dummy/1.2 984s => ab87ff4d38509178c14e017f987d907f149e1d68 refs/tags/test-dummy/2.0 984s => 42a2e8da3b3c729aeb061608e06306a3f4cab637 refs/tags/test-dummy/2.1 984s 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 984s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 984s | git for-each-ref refs/dgit-fetch/test-dummy 984s |> d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 commit refs/dgit-fetch/test-dummy/dgit/sid 984s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 984s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 984s |> 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 984s |> a76884198f9e5dec93121b0102b6d43b553fedab tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 984s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 984s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 984s |> ab87ff4d38509178c14e017f987d907f149e1d68 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 984s |> 42a2e8da3b3c729aeb061608e06306a3f4cab637 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 984s git_lrfetch_sane: tidying any old suite lrfetchrefs 984s | git for-each-ref refs/dgit-fetch/sid 984s git_lrfetch_sane: git fetch --no-insane emulation complete 984s $VAR1 = { 984s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0' => '37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7', 984s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => '33a8516eac48d6ae1daa0104446504d7136e2c9f', 984s 'refs/dgit-fetch/test-dummy/dgit/sid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 984s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.1' => '42a2e8da3b3c729aeb061608e06306a3f4cab637', 984s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => 'd0b818884a8eaedec614b84b19a27b3f458b515b', 984s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => 'b0b916127aeda597f52d7e9b6b978a8dbf11cac0', 984s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0' => 'ab87ff4d38509178c14e017f987d907f149e1d68', 984s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' => 'a76884198f9e5dec93121b0102b6d43b553fedab', 984s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => '1f87342067cb976b8ba8ea4ac5fd502aab26b0c1' 984s }; 984s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 984s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 984s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 984s offered refs/tags/archive/test-dummy/1.1=d0b818884a8eaedec614b84b19a27b3f458b515b 984s + git update-ref refs/tags/archive/test-dummy/1.1 d0b818884a8eaedec614b84b19a27b3f458b515b '' 984s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 984s offered refs/tags/archive/test-dummy/1.2=b0b916127aeda597f52d7e9b6b978a8dbf11cac0 984s + git update-ref refs/tags/archive/test-dummy/1.2 b0b916127aeda597f52d7e9b6b978a8dbf11cac0 '' 984s |> 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 984s offered refs/tags/archive/test-dummy/2.0=37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 984s + git update-ref refs/tags/archive/test-dummy/2.0 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 '' 984s |> a76884198f9e5dec93121b0102b6d43b553fedab tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 984s offered refs/tags/archive/test-dummy/2.1=a76884198f9e5dec93121b0102b6d43b553fedab 984s + git update-ref refs/tags/archive/test-dummy/2.1 a76884198f9e5dec93121b0102b6d43b553fedab '' 984s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 984s offered refs/tags/test-dummy/1.1=33a8516eac48d6ae1daa0104446504d7136e2c9f 984s + git update-ref refs/tags/test-dummy/1.1 33a8516eac48d6ae1daa0104446504d7136e2c9f '' 984s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 984s offered refs/tags/test-dummy/1.2=1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 984s + git update-ref refs/tags/test-dummy/1.2 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 '' 984s |> ab87ff4d38509178c14e017f987d907f149e1d68 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 984s offered refs/tags/test-dummy/2.0=ab87ff4d38509178c14e017f987d907f149e1d68 984s + git update-ref refs/tags/test-dummy/2.0 ab87ff4d38509178c14e017f987d907f149e1d68 '' 984s |> 42a2e8da3b3c729aeb061608e06306a3f4cab637 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 984s offered refs/tags/test-dummy/2.1=42a2e8da3b3c729aeb061608e06306a3f4cab637 984s + git update-ref refs/tags/test-dummy/2.1 42a2e8da3b3c729aeb061608e06306a3f4cab637 '' 984s + git config remote.dgit.skipdefaultupdate true 984s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 984s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.2.dsc... 984s get_archive_dsc: Version 2.2 984s last upload to archive: NO git hash 984s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 984s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 984s previous reference hash=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 984s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 984s => `' 984s fetch_from_archive: lastfetch= 984s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/unpack 984s considering reusing example_2.2.tar.gz: (No such file or directory) linked. 984s using existing example_2.2.tar.gz 984s considering saving example_2.2.tar.gz: (File exists) no need. 984s + dpkg-source --no-check -x -- example.dsc 984s dpkg-source: info: extracting example in example-2.2 984s dpkg-source: info: unpacking example_2.2.tar.gz 984s CD example-2.2 984s | find -name .git -prune -print0 984s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 984s + git add -Af . 984s | git write-tree 984s => `8ac575c6e3130344f4026dd12dec2c32922adfc2' 984s import clog search... 984s | dpkg-parsechangelog --format rfc822 --all 984s import clog 2.2 package changelog, entry no.1... 984s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 984s => `1530000000 +0000' 984s import main commit 984s | git hash-object -w -t commit ../commit.tmp 984s => `300feb37108f13148ad19d5656d9aef7a114e654' 984s synthesised git commit from .dsc 2.2 984s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgitclog; exec "$@"' x git cat-file blob d5d72bd268117528fdb90dd8ee4f0f2fe5432b61:debian/changelog 984s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2 984s fetch mergeinfos: 984s commit 300feb37108f13148ad19d5656d9aef7a114e654 Import of source package 984s commit d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 dgit suite branch on dgit git server 984s ReverseParents=1 Message=Record example (2.2) in archive suite sid 984s | git cat-file commit 300feb37108f13148ad19d5656d9aef7a114e654 984s => `tree 8ac575c6e3130344f4026dd12dec2c32922adfc2'... 984s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgitclog; exec "$@"' x git cat-file blob 300feb37108f13148ad19d5656d9aef7a114e654:debian/changelog 984s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 984s => `1530000000 +0000' 984s | git hash-object -w -t commit /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/mergecommit 984s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 984s fetch hash=da7fba676047c6a8e72a018a88c1ef8c1478aa47 984s | git merge-base d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 da7fba676047c6a8e72a018a88c1ef8c1478aa47 984s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 984s | git rev-parse 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61~0' 984s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 984s | git rev-parse 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61~0' 984s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 984s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE da7fba676047c6a8e72a018a88c1ef8c1478aa47 984s | git log -n2 da7fba676047c6a8e72a018a88c1ef8c1478aa47 984s => `commit da7fba676047c6a8e72a018a88c1ef8c1478aa47'... 984s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid da7fba676047c6a8e72a018a88c1ef8c1478aa47 984s => `' 984s + git reset --hard refs/remotes/dgit/dgit/sid 984s HEAD is now at da7fba6 Record example (2.2) in archive suite sid 984s + bash -ec ' set -o pipefail 984s git ls-tree -r --name-only -z HEAD | '\\' 984s xargs -0r touch -h -r . -- 984s ' 984s dgit ok: ready for work in ./example.2 984s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2 984s del_lrfetchrefs... 984s del_lrfetchrefs: d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 refs/dgit-fetch/test-dummy/dgit/sid 984s del_lrfetchrefs: d0b818884a8eaedec614b84b19a27b3f458b515b refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 984s del_lrfetchrefs: b0b916127aeda597f52d7e9b6b978a8dbf11cac0 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 984s del_lrfetchrefs: 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 984s del_lrfetchrefs: a76884198f9e5dec93121b0102b6d43b553fedab refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 984s del_lrfetchrefs: 33a8516eac48d6ae1daa0104446504d7136e2c9f refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 984s del_lrfetchrefs: 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 984s del_lrfetchrefs: ab87ff4d38509178c14e017f987d907f149e1d68 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 984s del_lrfetchrefs: 42a2e8da3b3c729aeb061608e06306a3f4cab637 refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 984s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 984s ' 984s + cd example.2 984s + t-commit 'now a dgit upload again' 984s + local 'msg=now a dgit upload again' 984s + v=2.3 984s + t-debchange --force-distribution -v2.3 --distribution unstable 'now a dgit upload again' 984s + DEBEMAIL=dgit-tests@example.org 984s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange --force-distribution -v2.3 --distribution unstable 'now a dgit upload again' 984s + 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 984s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 984s libdistro-info-perl is not installed, Debian release names are not known. 984s libdistro-info-perl is not installed, Ubuntu release names are not known. 984s + git add debian/changelog 984s + debcommit 984s git commit -m 'now a dgit upload again' 984s [dgit/sid 5ab2693] now a dgit upload again 984s 1 file changed, 6 insertions(+) 984s + revision=4 984s + t-dgit -wgf push-source 984s + local dgit=dgit 984s + pwd 984s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2 984s + : ' 984s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 984s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source 985s | git rev-parse --show-toplevel 985s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2' 985s | git config -z --get-regexp --local '.*' 985s | git config -z --get-regexp --local '.*' 985s | git config -z --get-regexp --global '.*' 985s | git config -z --get-regexp --system '.*' 985s format , quilt mode linear 985s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 985s warning: could not open directory 'debian/source/': No such file or directory 985s => `' 985s + git diff --quiet HEAD 985s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 985s canonical suite name for unstable is sid 985s | git rev-parse 'HEAD~0' 985s => `5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7' 985s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/unpack 985s CD work 985s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 985s + git reset -q --hard 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 985s CD .. 985s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 985s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 985s dpkg-source: warning: source directory 'work' is not - 'example-2.3' 985s dpkg-source: info: using source format '1.0' 985s dpkg-source: info: building example in example_2.3.tar.gz 985s dpkg-source: info: building example in example_2.3.dsc 985s CD work 985s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 985s changelog will contain changes since 2.2 985s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.3_source.changes dpkg-genchanges -S -v2.2 985s dpkg-genchanges: info: including full source code in upload 985s CD .. 985s moving example_2.3.dsc, example_2.3_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.. 985s renaming (Files) example_2.3.tar.gz 985s renaming (dsc) example_2.3.dsc 985s renaming (changes) example_2.3_source.changes 985s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2 985s actually entering push 985s query: fetching http://127.0.0.1:43907/example.git/HEAD... 985s dgit-repos check_for_git => 1. 985s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 985s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 985s git_lrfetch_sane iteration 0 985s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 985s => d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 refs/dgit/sid 985s => d0b818884a8eaedec614b84b19a27b3f458b515b refs/tags/archive/test-dummy/1.1 985s => b0b916127aeda597f52d7e9b6b978a8dbf11cac0 refs/tags/archive/test-dummy/1.2 985s => 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 refs/tags/archive/test-dummy/2.0 985s => a76884198f9e5dec93121b0102b6d43b553fedab refs/tags/archive/test-dummy/2.1 985s => 33a8516eac48d6ae1daa0104446504d7136e2c9f refs/tags/test-dummy/1.1 985s => 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 refs/tags/test-dummy/1.2 985s => ab87ff4d38509178c14e017f987d907f149e1d68 refs/tags/test-dummy/2.0 985s => 42a2e8da3b3c729aeb061608e06306a3f4cab637 refs/tags/test-dummy/2.1 985s 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 985s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 985s | git for-each-ref refs/dgit-fetch/test-dummy 985s |> d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 commit refs/dgit-fetch/test-dummy/dgit/sid 985s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 985s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 985s |> 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 985s |> a76884198f9e5dec93121b0102b6d43b553fedab tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 985s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 985s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 985s |> ab87ff4d38509178c14e017f987d907f149e1d68 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 985s |> 42a2e8da3b3c729aeb061608e06306a3f4cab637 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 985s git_lrfetch_sane: tidying any old suite lrfetchrefs 985s | git for-each-ref refs/dgit-fetch/sid 985s git_lrfetch_sane: git fetch --no-insane emulation complete 985s $VAR1 = { 985s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => 'd0b818884a8eaedec614b84b19a27b3f458b515b', 985s 'refs/dgit-fetch/test-dummy/dgit/sid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 985s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0' => '37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7', 985s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => '33a8516eac48d6ae1daa0104446504d7136e2c9f', 985s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.1' => '42a2e8da3b3c729aeb061608e06306a3f4cab637', 985s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' => 'a76884198f9e5dec93121b0102b6d43b553fedab', 985s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => 'b0b916127aeda597f52d7e9b6b978a8dbf11cac0', 985s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0' => 'ab87ff4d38509178c14e017f987d907f149e1d68', 985s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => '1f87342067cb976b8ba8ea4ac5fd502aab26b0c1' 985s }; 985s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 985s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/tags/archive/test-dummy/1.1 985s currently refs/tags/archive/test-dummy/1.1=d0b818884a8eaedec614b84b19a27b3f458b515b 985s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/tags/archive/test-dummy/1.2 985s currently refs/tags/archive/test-dummy/1.2=b0b916127aeda597f52d7e9b6b978a8dbf11cac0 985s |> 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 tag refs/tags/archive/test-dummy/2.0 985s currently refs/tags/archive/test-dummy/2.0=37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 985s |> a76884198f9e5dec93121b0102b6d43b553fedab tag refs/tags/archive/test-dummy/2.1 985s currently refs/tags/archive/test-dummy/2.1=a76884198f9e5dec93121b0102b6d43b553fedab 985s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/tags/test-dummy/1.1 985s currently refs/tags/test-dummy/1.1=33a8516eac48d6ae1daa0104446504d7136e2c9f 985s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/tags/test-dummy/1.2 985s currently refs/tags/test-dummy/1.2=1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 985s |> ab87ff4d38509178c14e017f987d907f149e1d68 tag refs/tags/test-dummy/2.0 985s currently refs/tags/test-dummy/2.0=ab87ff4d38509178c14e017f987d907f149e1d68 985s |> 42a2e8da3b3c729aeb061608e06306a3f4cab637 tag refs/tags/test-dummy/2.1 985s currently refs/tags/test-dummy/2.1=42a2e8da3b3c729aeb061608e06306a3f4cab637 985s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 985s |> d0b818884a8eaedec614b84b19a27b3f458b515b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 985s offered refs/tags/archive/test-dummy/1.1=d0b818884a8eaedec614b84b19a27b3f458b515b 985s |> b0b916127aeda597f52d7e9b6b978a8dbf11cac0 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 985s offered refs/tags/archive/test-dummy/1.2=b0b916127aeda597f52d7e9b6b978a8dbf11cac0 985s |> 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 985s offered refs/tags/archive/test-dummy/2.0=37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 985s |> a76884198f9e5dec93121b0102b6d43b553fedab tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 985s offered refs/tags/archive/test-dummy/2.1=a76884198f9e5dec93121b0102b6d43b553fedab 985s |> 33a8516eac48d6ae1daa0104446504d7136e2c9f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 985s offered refs/tags/test-dummy/1.1=33a8516eac48d6ae1daa0104446504d7136e2c9f 985s |> 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 985s offered refs/tags/test-dummy/1.2=1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 985s |> ab87ff4d38509178c14e017f987d907f149e1d68 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 985s offered refs/tags/test-dummy/2.0=ab87ff4d38509178c14e017f987d907f149e1d68 985s |> 42a2e8da3b3c729aeb061608e06306a3f4cab637 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 985s offered refs/tags/test-dummy/2.1=42a2e8da3b3c729aeb061608e06306a3f4cab637 985s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 985s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.2.dsc... 985s get_archive_dsc: Version 2.2 985s last upload to archive: NO git hash 985s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 985s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 985s previous reference hash=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 985s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 985s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 985s fetch_from_archive: lastfetch=da7fba676047c6a8e72a018a88c1ef8c1478aa47 985s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/unpack 985s considering reusing example_2.2.tar.gz: (No such file or directory) linked. 985s using existing example_2.2.tar.gz 985s considering saving example_2.2.tar.gz: (File exists) no need. 985s + dpkg-source --no-check -x -- example.dsc 985s dpkg-source: info: extracting example in example-2.2 985s dpkg-source: info: unpacking example_2.2.tar.gz 985s CD example-2.2 985s | find -name .git -prune -print0 985s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 985s + git add -Af . 985s | git write-tree 985s => `8ac575c6e3130344f4026dd12dec2c32922adfc2' 985s import clog search... 985s | dpkg-parsechangelog --format rfc822 --all 985s import clog 2.2 package changelog, entry no.1... 985s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 985s => `1530000000 +0000' 985s import main commit 985s | git hash-object -w -t commit ../commit.tmp 985s => `300feb37108f13148ad19d5656d9aef7a114e654' 985s synthesised git commit from .dsc 2.2 985s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgitclog; exec "$@"' x git cat-file blob d5d72bd268117528fdb90dd8ee4f0f2fe5432b61:debian/changelog 985s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2 985s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgitclog; exec "$@"' x git cat-file blob da7fba676047c6a8e72a018a88c1ef8c1478aa47:debian/changelog 985s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgitclog; exec "$@"' x git cat-file blob 300feb37108f13148ad19d5656d9aef7a114e654:debian/changelog 985s | git merge-base da7fba676047c6a8e72a018a88c1ef8c1478aa47 da7fba676047c6a8e72a018a88c1ef8c1478aa47 985s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 985s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 985s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 985s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 985s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 985s fetch mergeinfos: 985s commit da7fba676047c6a8e72a018a88c1ef8c1478aa47 dgit client's archive history view 985s fetch hash=da7fba676047c6a8e72a018a88c1ef8c1478aa47 985s | git merge-base d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 da7fba676047c6a8e72a018a88c1ef8c1478aa47 985s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 985s | git rev-parse 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61~0' 985s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 985s | git rev-parse 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61~0' 985s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 985s | git merge-base da7fba676047c6a8e72a018a88c1ef8c1478aa47 da7fba676047c6a8e72a018a88c1ef8c1478aa47 985s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 985s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 985s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 985s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 985s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 985s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE da7fba676047c6a8e72a018a88c1ef8c1478aa47 985s | git log -n2 da7fba676047c6a8e72a018a88c1ef8c1478aa47 985s => `commit da7fba676047c6a8e72a018a88c1ef8c1478aa47'... 985s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 985s + git check-ref-format archive/test-dummy/2.3 985s | git symbolic-ref -q HEAD 985s => `refs/heads/dgit/sid' 985s | git rev-parse 'HEAD~0' 985s => `5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7' 985s ffq_prev_branchinfo branch current refs/heads/dgit/sid 985s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/dgit/sid' 985s => `' 985s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/dgit/sid' 985s => `' 985s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 985s warning: could not open directory 'debian/source/': No such file or directory 985s => `' 985s + git diff --quiet HEAD 985s | git merge-base da7fba676047c6a8e72a018a88c1ef8c1478aa47 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 985s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 985s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 985s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 985s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 985s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 985s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.3' 985s => `' 985s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/unpack 985s checking that example_2.3.dsc corresponds to HEAD 985s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/../example_2.3.dsc 985s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/../example_2.3.dsc) 985s dpkg-source: info: extracting example in example-2.3 985s dpkg-source: info: unpacking example_2.3.tar.gz 985s CD example-2.3 985s | find -name .git -prune -print0 985s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 985s + git add -Af . 985s | git write-tree 985s => `87a6e85eba896ce0fe1e99518f9e66ff869db7a5' 985s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2 985s + git diff --quiet 87a6e85eba896ce0fe1e99518f9e66ff869db7a5 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 985s files_compare_inputs example_2.3.dsc 985s files_compare_inputs example_2.3.dsc Checksums-Sha256 985s files_compare_inputs example_2.3.dsc Checksums-Sha256 example_2.3.tar.gz 985s files_compare_inputs example_2.3.dsc Checksums-Sha1 985s files_compare_inputs example_2.3.dsc Checksums-Sha1 example_2.3.tar.gz 985s files_compare_inputs example_2.3.dsc Files 985s files_compare_inputs example_2.3.dsc Files example_2.3.tar.gz 985s files_compare_inputs example_2.3_source.changes 985s files_compare_inputs example_2.3_source.changes Checksums-Sha256 985s files_compare_inputs example_2.3_source.changes Checksums-Sha256 example_2.3.dsc 985s files_compare_inputs example_2.3_source.changes Checksums-Sha256 example_2.3.tar.gz 985s files_compare_inputs example_2.3_source.changes Checksums-Sha1 985s files_compare_inputs example_2.3_source.changes Checksums-Sha1 example_2.3.dsc 985s files_compare_inputs example_2.3_source.changes Checksums-Sha1 example_2.3.tar.gz 985s files_compare_inputs example_2.3_source.changes Files 985s files_compare_inputs example_2.3_source.changes Files example_2.3.dsc 985s files_compare_inputs example_2.3_source.changes Files example_2.3.tar.gz 985s checking origs needed (2.3)... 985s checking origs needed placement 'devel extra'... 985s origs example_2.3.tar.gz | 7952d6120e93764a807b1021f9a85d28 1051 example_2.3.tar.gz 985s ../example_2.3_source.changes already has appropriate .orig(s) (if any) 985s push_tagwants: $VAR1 = [ 985s '2.3', 985s '5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7', 985s undef, 985s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag' 985s ]; 985s $VAR2 = [ 985s { 985s 'View' => 'dgit', 985s 'TagFn' => sub { "DUMMY" }, 985s 'Objid' => '5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7', 985s 'Tfn' => sub { "DUMMY" }, 985s 'Tag' => 'archive/test-dummy/2.3', 985s 'TfSuffix' => '' 985s }, 985s { 985s 'Tfn' => sub { "DUMMY" }, 985s 'Objid' => '5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7', 985s 'TfSuffix' => '-dgit', 985s 'Tag' => 'test-dummy/2.3', 985s 'View' => 'dgit', 985s 'TagFn' => sub { "DUMMY" } 985s } 985s ]; 985s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 985s => `1530000001 +0000' 985s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag.tmp 985s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 985s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag.tmp.asc 985s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag-dgit.tmp 985s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 985s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag-dgit.tmp.asc 985s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag.signed.tmp 985s => `a87e9ae33521ed6270a6f036136d6f8de0430870' 985s + git verify-tag a87e9ae33521ed6270a6f036136d6f8de0430870 986s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 986s gpg: Signature made Mon Mar 31 23:03:35 2025 UTC 986s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 986s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 986s gpg: WARNING: This key is not certified with a trusted signature! 986s gpg: There is no indication that the signature belongs to the owner. 986s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 986s + git update-ref refs/tags/archive/test-dummy/2.3 a87e9ae33521ed6270a6f036136d6f8de0430870 986s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2/.git/dgit/tag-dgit.signed.tmp 986s => `7c538e9e7b00c6aa9905a09df2d68ddeda417ac7' 986s + git verify-tag 7c538e9e7b00c6aa9905a09df2d68ddeda417ac7 986s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 986s gpg: Signature made Mon Mar 31 23:03:35 2025 UTC 986s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 986s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 986s gpg: WARNING: This key is not certified with a trusted signature! 986s gpg: There is no indication that the signature belongs to the owner. 986s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 986s + git update-ref refs/tags/test-dummy/2.3 7c538e9e7b00c6aa9905a09df2d68ddeda417ac7 986s query: fetching http://127.0.0.1:43907/example.git/HEAD... 986s dgit-repos check_for_git => 1. 986s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7:refs/dgit/sid refs/tags/archive/test-dummy/2.3 refs/tags/test-dummy/2.3 986s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 986s d5d72bd..5ab2693 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 -> refs/dgit/sid 986s * [new tag] archive/test-dummy/2.3 -> archive/test-dummy/2.3 986s * [new tag] test-dummy/2.3 -> test-dummy/2.3 986s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.3_source.changes 986s signfile dsc ../example_2.3.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 986s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 986s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 986s 986s fixup_changes dsc ../example_2.3.dsc ../example_2.3_source.changes 986s signfile changes ../example_2.3_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 986s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 986s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 986s 986s Successfully signed dsc, changes files 986s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.3_source.changes 986s gpg: ../example_2.3_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 986s gpg: ../example_2.3.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 986s D: Setting host argument. 986s Checking signature on .changes 986s Checking signature on .dsc 986s Uploading to test-dummy (via local to localhost): 986s Successfully uploaded packages. 986s dgit ok: pushed and uploaded 2.3 986s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2 986s del_lrfetchrefs... 986s del_lrfetchrefs: d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 refs/dgit-fetch/test-dummy/dgit/sid 986s del_lrfetchrefs: d0b818884a8eaedec614b84b19a27b3f458b515b refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 986s del_lrfetchrefs: b0b916127aeda597f52d7e9b6b978a8dbf11cac0 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 986s del_lrfetchrefs: 37f6fa5cbd9dcc1387f286b4f0a013f504ed26d7 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 986s del_lrfetchrefs: a76884198f9e5dec93121b0102b6d43b553fedab refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 986s del_lrfetchrefs: 33a8516eac48d6ae1daa0104446504d7136e2c9f refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 986s del_lrfetchrefs: 1f87342067cb976b8ba8ea4ac5fd502aab26b0c1 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 986s del_lrfetchrefs: ab87ff4d38509178c14e017f987d907f149e1d68 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 986s del_lrfetchrefs: 42a2e8da3b3c729aeb061608e06306a3f4cab637 refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 986s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 986s ' 986s + t-refs-same-start 986s + unset t_ref_val 986s + t_ref_names=() 986s + t-pushed-good dgit/sid 986s + local branch=dgit/sid 986s + local suite=sid 986s + t-refs-same refs/heads/dgit/sid 986s + local g 986s + for g in $* 986s + t-ref-same refs/heads/dgit/sid 986s + local name=refs/heads/dgit/sid 986s + local val 986s ++ t-git-get-ref refs/heads/dgit/sid 986s ++ local ref=refs/heads/dgit/sid 986s ++ case "$ref" in 986s ++ git show-ref -d refs/heads/dgit/sid 986s ++ perl -ne ' 986s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 986s END { print "$x\n" if length $x; } 986s ' 986s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t-ref-same-val refs/heads/dgit/sid 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + local name=refs/heads/dgit/sid 986s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + case "${t_ref_val-unset}" in 986s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t_ref_names+=("$name") 986s + t-pushed-good-core 986s + t-ref-dsc-dgit 986s + t-incoming-dsc 986s + local dsc=example_2.3.dsc 986s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.3.dsc 986s + local val 986s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.3.dsc Dgit 986s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.3.dsc 986s ++ local field=Dgit 986s ++ perl -e ' 986s use Dpkg::Control::Hash; 986s my $h = new Dpkg::Control::Hash allow_pgp=>1; 986s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.3.dsc"); 986s my $val = $h->{"Dgit"},"\n"; 986s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.3.dsc Dgit" unless defined $val; 986s print $val,"\n"; 986s ' 986s + val='5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 test-dummy archive/test-dummy/2.3 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 986s ++ perl -e ' 986s $_=shift @ARGV; 986s die "Dgit $_ ?" unless m/^\w+\b/; 986s print $&,"\n" or die $!; 986s ' '5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 test-dummy archive/test-dummy/2.3 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git' 986s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.3.dsc 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.3.dsc 986s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + case "${t_ref_val-unset}" in 986s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t_ref_names+=("$name") 986s ++ t-v-tag 986s ++ echo refs/tags/archive/test-dummy/2.3 986s + t-refs-same refs/tags/archive/test-dummy/2.3 refs/remotes/dgit/dgit/sid 986s + local g 986s + for g in $* 986s + t-ref-same refs/tags/archive/test-dummy/2.3 986s + local name=refs/tags/archive/test-dummy/2.3 986s + local val 986s ++ t-git-get-ref refs/tags/archive/test-dummy/2.3 986s ++ local ref=refs/tags/archive/test-dummy/2.3 986s ++ case "$ref" in 986s ++ git show-ref -d refs/tags/archive/test-dummy/2.3 986s ++ perl -ne ' 986s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.3\E(?:\^\{\})?$#; 986s END { print "$x\n" if length $x; } 986s ' 986s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t-ref-same-val refs/tags/archive/test-dummy/2.3 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + local name=refs/tags/archive/test-dummy/2.3 986s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + case "${t_ref_val-unset}" in 986s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t_ref_names+=("$name") 986s + for g in $* 986s + t-ref-same refs/remotes/dgit/dgit/sid 986s + local name=refs/remotes/dgit/dgit/sid 986s + local val 986s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 986s ++ local ref=refs/remotes/dgit/dgit/sid 986s ++ case "$ref" in 986s ++ git show-ref -d refs/remotes/dgit/dgit/sid 986s ++ perl -ne ' 986s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 986s END { print "$x\n" if length $x; } 986s ' 986s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t-ref-same-val refs/remotes/dgit/dgit/sid 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + local name=refs/remotes/dgit/dgit/sid 986s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + case "${t_ref_val-unset}" in 986s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t_ref_names+=("$name") 986s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 986s + local val 986s + for g in $* 986s ++ t-git-get-ref refs/heads/dgit/unstable 986s ++ local ref=refs/heads/dgit/unstable 986s ++ case "$ref" in 986s ++ git show-ref -d refs/heads/dgit/unstable 986s ++ perl -ne ' 986s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 986s END { print "$x\n" if length $x; } 986s ' 986s ++ test 1 = 1 986s + val= 986s + '[' x '!=' x ']' 986s + for g in $* 986s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 986s ++ local ref=refs/remotes/dgit/dgit/unstable 986s ++ case "$ref" in 986s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 986s ++ perl -ne ' 986s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 986s END { print "$x\n" if length $x; } 986s ' 986s ++ test 1 = 1 986s + val= 986s + '[' x '!=' x ']' 986s + set -e 986s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 986s ++ t-v-tag 986s ++ echo refs/tags/archive/test-dummy/2.3 986s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/2.3 986s + local g 986s + for g in $* 986s + t-ref-same refs/dgit/sid 986s + local name=refs/dgit/sid 986s + local val 986s ++ t-git-get-ref refs/dgit/sid 986s ++ local ref=refs/dgit/sid 986s ++ case "$ref" in 986s ++ git show-ref -d refs/dgit/sid 986s ++ perl -ne ' 986s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 986s END { print "$x\n" if length $x; } 986s ' 986s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t-ref-same-val refs/dgit/sid 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + local name=refs/dgit/sid 986s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + case "${t_ref_val-unset}" in 986s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t_ref_names+=("$name") 986s + for g in $* 986s + t-ref-same refs/tags/archive/test-dummy/2.3 986s + local name=refs/tags/archive/test-dummy/2.3 986s + local val 986s ++ t-git-get-ref refs/tags/archive/test-dummy/2.3 986s ++ local ref=refs/tags/archive/test-dummy/2.3 986s ++ case "$ref" in 986s ++ git show-ref -d refs/tags/archive/test-dummy/2.3 986s ++ perl -ne ' 986s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.3\E(?:\^\{\})?$#; 986s END { print "$x\n" if length $x; } 986s ' 986s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t-ref-same-val refs/tags/archive/test-dummy/2.3 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + local name=refs/tags/archive/test-dummy/2.3 986s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + case "${t_ref_val-unset}" in 986s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 986s + t_ref_names+=("$name") 986s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 986s + t-refs-notexist refs/dgit/unstable 986s + local val 986s + for g in $* 986s ++ t-git-get-ref refs/dgit/unstable 986s ++ local ref=refs/dgit/unstable 986s ++ case "$ref" in 986s ++ git show-ref -d refs/dgit/unstable 986s ++ perl -ne ' 986s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 986s END { print "$x\n" if length $x; } 986s ' 986s ++ test 1 = 1 986s + val= 986s + '[' x '!=' x ']' 986s ++ t-v-tag 986s ++ echo refs/tags/archive/test-dummy/2.3 986s + git verify-tag refs/tags/archive/test-dummy/2.3 986s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 986s gpg: Signature made Mon Mar 31 23:03:35 2025 UTC 986s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 986s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 986s gpg: WARNING: This key is not certified with a trusted signature! 986s gpg: There is no indication that the signature belongs to the owner. 986s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 986s + t-ok 986s + : ======================================== 986s + t-check-only-bpd 986s + '[' .. = .. ']' 986s + return 986s + t-fscks 986s + shopt -s nullglob 986s + for d in $tmp/*/.git $tmp/git/*.git 986s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2 986s + t-git-fsck 986s ++ git rev-parse --git-dir 986s + local fsckerrs=.git/dgit-test-fsck.errs 986s + set +e 986s + LC_MESSAGES=C 986s + git fsck --no-dangling --strict 986s + tee .git/dgit-test-fsck.errs 986s + ps='0 0' 986s + set -e 986s + local pats 986s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 986s + test '0 0' = '0 0' 986s + pats+=(-e 'notice: HEAD points to an unborn branch') 986s + pats+=(-e 'notice: No default references') 986s + set +e 986s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 986s + rc=1 986s + set -e 986s + case $rc in 986s + for d in $tmp/*/.git $tmp/git/*.git 986s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 986s + t-git-fsck 986s ++ git rev-parse --git-dir 986s + local fsckerrs=.git/dgit-test-fsck.errs 986s + set +e 986s + LC_MESSAGES=C 986s + git fsck --no-dangling --strict 986s + tee .git/dgit-test-fsck.errs 986s + ps='0 0' 986s + set -e 986s + local pats 986s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 986s + test '0 0' = '0 0' 986s + pats+=(-e 'notice: HEAD points to an unborn branch') 986s + pats+=(-e 'notice: No default references') 986s + set +e 986s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 986s + rc=1 986s + set -e 986s + case $rc in 986s + for d in $tmp/*/.git $tmp/git/*.git 986s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 986s + t-git-fsck 986s ++ git rev-parse --git-dir 986s + local fsckerrs=./dgit-test-fsck.errs 986s + set +e 986s + LC_MESSAGES=C 986s + git fsck --no-dangling --strict 986s + tee ./dgit-test-fsck.errs 986s notice: HEAD points to an unborn branch (master) 986s + ps='0 0' 986s + set -e 986s + local pats 986s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 986s + test '0 0' = '0 0' 986s + pats+=(-e 'notice: HEAD points to an unborn branch') 986s + pats+=(-e 'notice: No default references') 986s + set +e 986s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 986s + rc=1 986s + set -e 986s + case $rc in 986s + t-save-artifacts 986s + artifacts=/tmp/autopkgtest.XK8uun/alternating-dgit-artifacts 986s + '[' x/tmp/autopkgtest.XK8uun/alternating-dgit-artifacts = x ']' 986s + '[' xtmp = x ']' 986s + GZIP=-1v 986s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/alternating-dgit-artifacts/alternating-dgit.tar.gz '--exclude=*.tar' . 986s gzip: warning: GZIP environment variable is deprecated; use an alias or script 986s 80.3% 986s + echo ok. 986s ok. 986s + rc=0 986s + set +x 986s + set +e 986s + pwd 986s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example.2 986s + '[' x '!=' x ']' 986s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 986s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 986s + set -e 986s + test 0 = 0 986s /tmp/autopkgtest.XK8uun/wrapper.sh: Killing leaked background processes: 6872 986s PID TTY STAT TIME COMMAND 986s 6872 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 987s autopkgtest [23:03:37]: test alternating-dgit: -----------------------] 987s autopkgtest [23:03:37]: test alternating-dgit: - - - - - - - - - - results - - - - - - - - - - 987s alternating-dgit PASS 988s autopkgtest [23:03:38]: test clone-gitnosuite: preparing testbed 988s Reading package lists... 988s Building dependency tree... 988s Reading state information... 989s Starting pkgProblemResolver with broken count: 0 989s Starting 2 pkgProblemResolver with broken count: 0 989s Done 989s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 990s autopkgtest [23:03:40]: test clone-gitnosuite: [----------------------- 990s ++ set -o pipefail 990s ++ . tests/lib-core 990s ++ . tests/lib-restricts 990s ++ trap ' 990s rc=$? 990s set +x 990s test $rc = 0 || echo " 990s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 990s 990s Most relevant logs are just before assignment rc=$rc 990s Will now do cleanup etc. 990s " 990s set -x 990s set +e 990s pwd 990s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 990s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 990s set -e 990s test $rc = 0 || t-report-failure 990s ' EXIT 990s ++ t-filter-out-git-hyphen-dir 990s ++ local pathent 990s +++ type -p git-rev-parse 990s +++ : 990s ++ pathent= 990s ++ case "$pathent" in 990s ++ return 990s ++ t-set-intree 990s ++ '[' x = x ']' 990s ++ return 990s ++ : -D 990s ++ export DGIT_TEST_DEBUG 990s ++ : x 990s ++ export DGIT_TEST_DEBPUSH_DEBUG 990s ++ : 990s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 990s ++ GIT_COMMITTER_DATE='1530000000 +0100' 990s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 990s ++ GIT_AUTHOR_DATE='1530000000 +0100' 990s ++ export LC_CTYPE=C.UTF-8 990s ++ LC_CTYPE=C.UTF-8 990s ++ unset CDPATH 990s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 990s ++ FILTER_BRANCH_SQUELCH_WARNING=1 990s +++ pwd 990s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 990s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 990s ++ testname=clone-gitnosuite 990s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 990s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 990s ++ bpd=.. 990s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 990s ++ '[' x '!=' x ']' 990s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s +++ pwd 990s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ t-set-using-tmp 990s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 990s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 990s ++ export 'DEBFULLNAME=dgit test git user' 990s ++ DEBFULLNAME='dgit test git user' 990s ++ git config --global user.email dgit-test@debian.example.net 990s ++ git config --global user.name 'dgit test git user' 990s ++ git config --global protocol.ext.allow always 990s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 990s ++ env -0 990s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 990s ++ export DEBCHANGE_VENDOR=dpkg 990s ++ DEBCHANGE_VENDOR=dpkg 990s ++ unset VISUAL 990s ++ unset GIT_EDITOR 990s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 990s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 990s ++ cat 990s ++ schroot=build 990s ++ : aq 990s ++ : archive/test-dummy 990s ++ : sid:unstable 990s ++ t-git-config dgit.default.old-dsc-distro test-dummy 990s ++ git config --global dgit.default.old-dsc-distro test-dummy 990s ++ for import in ${autoimport-gnupg} 990s ++ case "$0" in 990s ++ t-setup-import gnupg 990s ++ local setupname=gnupg 990s ++ local setupsrc 990s ++ local lock 990s ++ '[' x = x ']' 990s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 990s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 990s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 990s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 990s cd "$1"; shift 990s setupname="$1"; shift 990s simport="$1"; shift 990s if [ -e "$simport" ]; then exit 0; fi 990s env - "$@" \ 990s "tests/setup/$setupname" 990s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 990s + cd /tmp/autopkgtest.XK8uun/build.980/src 990s + shift 990s + setupname=gnupg 990s + shift 990s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 990s + shift 990s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 990s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/clone-gitnosuite-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/clone-gitnosuite-stderr --stdout=/tmp/autopkgtest.XK8uun/clone-gitnosuite-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/clone-gitnosuite -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/clone-gitnosuite' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/clone-gitnosuite-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 990s ++ set -o pipefail 990s ++ . tests/lib-core 990s ++ . tests/lib-restricts 990s ++ trap ' 990s rc=$? 990s set +x 990s test $rc = 0 || echo " 990s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 990s 990s Most relevant logs are just before assignment rc=$rc 990s Will now do cleanup etc. 990s " 990s set -x 990s set +e 990s pwd 990s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 990s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 990s set -e 990s test $rc = 0 || t-report-failure 990s ' EXIT 990s ++ t-filter-out-git-hyphen-dir 990s ++ local pathent 990s +++ type -p git-rev-parse 990s +++ : 990s ++ pathent= 990s ++ case "$pathent" in 990s ++ return 990s ++ t-set-intree 990s ++ '[' x = x ']' 990s ++ return 990s ++ : -D 990s ++ export DGIT_TEST_DEBUG 990s ++ : x 990s ++ export DGIT_TEST_DEBPUSH_DEBUG 990s ++ : 990s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 990s ++ GIT_COMMITTER_DATE='1530000000 +0100' 990s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 990s ++ GIT_AUTHOR_DATE='1530000000 +0100' 990s ++ export LC_CTYPE=C.UTF-8 990s ++ LC_CTYPE=C.UTF-8 990s ++ unset CDPATH 990s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 990s ++ FILTER_BRANCH_SQUELCH_WARNING=1 990s +++ pwd 990s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 990s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 990s ++ testname=gnupg 990s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 990s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 990s ++ bpd=.. 990s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 990s ++ '[' x '!=' x ']' 990s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s +++ pwd 990s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ t-set-using-tmp 990s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 990s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 990s ++ export 'DEBFULLNAME=dgit test git user' 990s ++ DEBFULLNAME='dgit test git user' 990s ++ git config --global user.email dgit-test@debian.example.net 990s ++ git config --global user.name 'dgit test git user' 990s ++ git config --global protocol.ext.allow always 990s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 990s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 990s ++ export DEBCHANGE_VENDOR=dpkg 990s ++ DEBCHANGE_VENDOR=dpkg 990s ++ unset VISUAL 990s ++ unset GIT_EDITOR 990s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 990s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 990s ++ cat 990s ++ schroot=build 990s ++ : aq 990s ++ : archive/test-dummy 990s ++ : sid:unstable 990s ++ t-git-config dgit.default.old-dsc-distro test-dummy 990s ++ git config --global dgit.default.old-dsc-distro test-dummy 990s ++ for import in ${autoimport-gnupg} 990s ++ case "$0" in 990s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 990s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 990s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 990s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 990s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 990s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 990s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 990s + setup=' 990s export GNUPGHOME=$tmp/gnupg 990s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 990s 990s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 990s ssb rsa2048 2013-11-17 [E] 990s 990s sec rsa2048 2014-01-26 [SC] 990s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 990s uid [ultimate] Populus Romanus (test key) 990s ssb rsa2048 2014-01-26 [E] 990s 990s sec rsa2048 2014-01-26 [SC] 990s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 990s uid [ unknown] Hannibal (test key) 990s ssb rsa2048 2014-01-26 [E] 990s 990s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 990s export GNUPGHOME=$tmp/gnupg 990s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 990s 990s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/must-clean/git-check.port $tmp/git 990s read <$tmp/must-clean/git-check.port git_check_port 990s 990s t-git-config --global dgit-distro.test-dummy.git-check url 990s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 990s t-git-config --global dgit-distro.test-dummy.git-check-url \ 990s http://127.0.0.1:$git_check_port 990s ' 990s + local savevars= 990s + local savedirs=--files-from=/dev/null 990s + local 'importeval= 990s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 990s read <$tmp/must-clean/git-check.port git_check_port 990s 990s t-git-config --global dgit-distro.test-dummy.git-check url 990s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 990s t-git-config --global dgit-distro.test-dummy.git-check-url \ 990s http://127.0.0.1:$git_check_port 990s ' 990s + local import=IMPORT.http-git-check 990s + exec 990s + local vn 990s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 990s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 990s print STDERR "saving-exporting $vn\n"; 990s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 990s or die $!; 990s } 990s ' 990s saving-exporting DGIT_TEST_REAL_GPG_AGENT 990s saving-exporting DGIT_TEST_REAL_GPG 990s + set -e 990s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 990s + printf '\n%s\n' ' 990s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 990s read <$tmp/must-clean/git-check.port git_check_port 990s 990s t-git-config --global dgit-distro.test-dummy.git-check url 990s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 990s t-git-config --global dgit-distro.test-dummy.git-check-url \ 990s http://127.0.0.1:$git_check_port 990s ' 990s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 990s + rc=0 990s + set +x 990s + set +e 990s + pwd 990s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 990s + '[' x '!=' x ']' 990s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 990s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 990s + set -e 990s + test 0 = 0 990s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 990s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 990s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 990s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 990s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 990s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 990s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 990s ++ /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 990s ++ read git_check_port 990s ++ t-git-config --global dgit-distro.test-dummy.git-check url 990s ++ git config --global --global dgit-distro.test-dummy.git-check url 990s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 990s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 990s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:41441 990s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:41441 990s + t-archive pari-extra 3-1 990s + t-archive-none pari-extra 990s + t-select-package pari-extra 990s + p=pari-extra 990s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 990s + t-archive-none-aq 990s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 990s + : 990s + local 'jsondelim=[' 990s + local suitespec 990s + for suitespec in $suitespecs 990s + local suite=sid 990s + local sname=unstable 990s + t-aq-archive-updated sid pari-extra 990s + local suite=sid 990s + local p=pari-extra 990s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 990s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 990s + perl -wne ' 990s use JSON; 990s use strict; 990s our @v; 990s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 990s push @v, { 990s "version" => "$1", 990s "sha256sum" => "$2", 990s "component" => "$3", 990s "filename" => "$4", 990s }; 990s END { 990s my $json = JSON->new->canonical(); 990s print $json->encode(\@v) or die $!; 990s } 990s ' 990s + t-aq-archive-updated new pari-extra 990s + local suite=new 990s + local p=pari-extra 990s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 990s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 990s + perl -wne ' 990s use JSON; 990s use strict; 990s our @v; 990s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 990s push @v, { 990s "version" => "$1", 990s "sha256sum" => "$2", 990s "component" => "$3", 990s "filename" => "$4", 990s }; 990s END { 990s my $json = JSON->new->canonical(); 990s print $json->encode(\@v) or die $!; 990s } 990s ' 990s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 990s + cat 990s + jsondelim=' },' 990s + cat 990s + v=3-1 990s + local dscf=pari-extra_3-1.dsc 990s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/pari-extra_*' 990s + ln -s /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-1.diff.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 990s + t-archive-query 990s + local suite=sid 990s + local dscf=main/pari-extra_3-1.dsc 990s + t-archive-query-aq sid pari-extra 3-1 main/pari-extra_3-1.dsc 990s + local suite=sid 990s + local p=pari-extra 990s + local v=3-1 990s + local dscf=main/pari-extra_3-1.dsc 990s + local sha 990s ++ sha256sum 990s + sha='c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 -' 990s + echo '3-1 c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 main/pari-extra_3-1.dsc' 990s + t-aq-archive-updated sid pari-extra 990s + local suite=sid 990s + local p=pari-extra 990s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 990s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 990s + perl -wne ' 990s use JSON; 990s use strict; 990s our @v; 990s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 990s push @v, { 990s "version" => "$1", 990s "sha256sum" => "$2", 990s "component" => "$3", 990s "filename" => "$4", 990s }; 990s END { 990s my $json = JSON->new->canonical(); 990s print $json->encode(\@v) or die $!; 990s } 990s ' 990s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 990s + mkdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 990s + set -e 990s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 990s + dpkg-source -x ../mirror/pool/main/pari-extra_3-1.dsc 991s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/pari-extra_3-1.dsc) 991s dpkg-source: info: extracting pari-extra in pari-extra-3 991s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 991s dpkg-source: info: applying pari-extra_3-1.diff.gz 991s + t-git-none 991s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 991s + set -e 991s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 991s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 991s + cp -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_template /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 991s + t-dgit clone pari-extra 991s + local dgit=dgit 991s + pwd 991s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 991s + : ' 991s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 991s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone pari-extra 991s | git config -z --get-regexp --global '.*' 991s | git config -z --get-regexp --system '.*' 991s clone main body 991s CD pari-extra 991s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 991s canonical suite name for unstable is sid 991s query: fetching http://127.0.0.1:41441/pari-extra.git/HEAD... 991s dgit-repos check_for_git => 1. 991s + git init -q 991s | git config -z --get-regexp --local '.*' 991s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 991s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 991s + git config user.name 'dgit test git user' 991s is_gitattrs_setup: found nothing 991s fetching existing git history 991s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 991s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 991s git_lrfetch_sane iteration 0 991s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 991s 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/* 991s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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/*' 991s | git for-each-ref refs/dgit-fetch/test-dummy 991s git_lrfetch_sane: tidying any old suite lrfetchrefs 991s | git for-each-ref refs/dgit-fetch/sid 991s git_lrfetch_sane: git fetch --no-insane emulation complete 991s $VAR1 = {}; 991s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 991s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 991s + git config remote.dgit.skipdefaultupdate true 991s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 991s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 991s get_archive_dsc: Version 3-1 991s last upload to archive: NO git hash 991s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 991s => `' 991s previous reference hash= 991s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 991s => `' 991s fetch_from_archive: lastfetch= 991s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 991s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 991s ./pari-extra_3.orig.tar.gz does not exist, need to fetch 991s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3.orig.tar.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3.orig.tar.gz 991s % Total % Received % Xferd Average Speed Time Time Time Current 991s Dload Upload Total Spent Left Speed 991s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 121 100 121 0 0 1495k 0 --:--:-- --:--:-- --:--:-- 1495k 991s considering saving pari-extra_3.orig.tar.gz: linked. 991s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) (No such file or directory) absent. 991s ./pari-extra_3-1.diff.gz does not exist, need to fetch 991s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3-1.diff.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.diff.gz 991s % Total % Received % Xferd Average Speed Time Time Time Current 991s Dload Upload Total Spent Left Speed 991s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 2357 100 2357 0 0 25.5M 0 --:--:-- --:--:-- --:--:-- 25.5M 991s considering saving pari-extra_3-1.diff.gz: linked. 991s import considering pari-extra_3.orig.tar.gz Y .gz orig 991s + chmod -R '+rwX' _unpack-tar 991s CD _unpack-tar 991s | find -name .git -prune -print0 991s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 991s + git add -Af . 991s | git write-tree 991s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 991s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 991s => `' 991s multiple subtrees 991s CD .. 991s import considering pari-extra_3-1.diff.gz not tar 991s + dpkg-source --no-check -x -- pari-extra.dsc 991s dpkg-source: info: extracting pari-extra in pari-extra-3 991s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 991s dpkg-source: info: applying pari-extra_3-1.diff.gz 991s CD pari-extra-3 991s | find -name .git -prune -print0 991s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 991s + git add -Af . 991s | git write-tree 991s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 991s import clog search... 991s | dpkg-parsechangelog --format rfc822 --all 991s import clog 3-1 package changelog, entry no.1... 991s import clog 3-1 vs 3... 991s import clog 3-1 becomes r1 991s import clog 2.1-1 package changelog, entry no.2... 991s import clog 2.1-1 vs 3... 991s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 991s => `1312546022 +0000' 991s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 991s => `1312546022 +0000' 991s import tartrees authline Bill Allombert 1312546022 +0000 991s import tartrees r1authline Bill Allombert 1312546022 +0000 991s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 991s | git hash-object -w -t commit --stdin 991s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 991s import main commit 991s | git hash-object -w -t commit ../commit.tmp 991s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 991s synthesised git commit from .dsc 3-1 991s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 991s fetch mergeinfos: 991s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 Import of source package 991s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 991s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 991s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 991s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 991s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 991s => `' 991s + git reset --hard refs/remotes/dgit/dgit/sid 991s HEAD is now at 3d33f8b pari-extra (3-1) unstable; urgency=low 991s + bash -ec ' set -o pipefail 991s git ls-tree -r --name-only -z HEAD | '\\' 991s xargs -0r touch -h -r . -- 991s ' 991s dgit ok: ready for work in pari-extra 991s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 991s del_lrfetchrefs... 991s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 991s ' 991s + t-ok 991s + : ======================================== 991s + t-check-only-bpd 991s + '[' .. = .. ']' 991s + return 991s + t-fscks 991s + shopt -s nullglob 991s + for d in $tmp/*/.git $tmp/git/*.git 991s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 991s + t-git-fsck 991s ++ git rev-parse --git-dir 991s + local fsckerrs=.git/dgit-test-fsck.errs 991s + set +e 991s + tee .git/dgit-test-fsck.errs 991s + LC_MESSAGES=C 991s + git fsck --no-dangling --strict 991s + ps='0 0' 991s + set -e 991s + local pats 991s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 991s + test '0 0' = '0 0' 991s + pats+=(-e 'notice: HEAD points to an unborn branch') 991s + pats+=(-e 'notice: No default references') 991s + set +e 991s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 991s + rc=1 991s + set -e 991s + case $rc in 991s + for d in $tmp/*/.git $tmp/git/*.git 991s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 991s + t-git-fsck 991s ++ git rev-parse --git-dir 991s + local fsckerrs=./dgit-test-fsck.errs 991s + set +e 991s + LC_MESSAGES=C 991s + git fsck --no-dangling --strict 991s + tee ./dgit-test-fsck.errs 991s notice: HEAD points to an unborn branch (master) 991s notice: No default references 991s + ps='0 0' 991s + set -e 991s + local pats 991s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 991s + test '0 0' = '0 0' 991s + pats+=(-e 'notice: HEAD points to an unborn branch') 991s + pats+=(-e 'notice: No default references') 991s + set +e 991s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 991s + rc=1 991s + set -e 991s + case $rc in 991s + t-save-artifacts 991s + artifacts=/tmp/autopkgtest.XK8uun/clone-gitnosuite-artifacts 991s + '[' x/tmp/autopkgtest.XK8uun/clone-gitnosuite-artifacts = x ']' 991s + '[' xtmp = x ']' 991s + GZIP=-1v 991s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/clone-gitnosuite-artifacts/clone-gitnosuite.tar.gz '--exclude=*.tar' . 991s gzip: warning: GZIP environment variable is deprecated; use an alias or script 991s 75.7% 991s + echo ok. 991s ok. 991s + rc=0 991s + set +x 991s + set +e 991s + pwd 991s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 991s + '[' x '!=' x ']' 991s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 991s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 991s + set -e 991s + test 0 = 0 991s /tmp/autopkgtest.XK8uun/wrapper.sh: Killing leaked background processes: 8459 991s PID TTY STAT TIME COMMAND 991s 8459 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 992s autopkgtest [23:03:42]: test clone-gitnosuite: -----------------------] 992s clone-gitnosuite PASS 992s autopkgtest [23:03:42]: test clone-gitnosuite: - - - - - - - - - - results - - - - - - - - - - 992s autopkgtest [23:03:42]: test clone-nogit: preparing testbed 993s Reading package lists... 993s Building dependency tree... 993s Reading state information... 993s Starting pkgProblemResolver with broken count: 0 993s Starting 2 pkgProblemResolver with broken count: 0 993s Done 993s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 994s autopkgtest [23:03:44]: test clone-nogit: [----------------------- 994s ++ set -o pipefail 994s ++ . tests/lib-core 994s ++ . tests/lib-restricts 994s ++ trap ' 994s rc=$? 994s set +x 994s test $rc = 0 || echo " 994s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 994s 994s Most relevant logs are just before assignment rc=$rc 994s Will now do cleanup etc. 994s " 994s set -x 994s set +e 994s pwd 994s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 994s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 994s set -e 994s test $rc = 0 || t-report-failure 994s ' EXIT 994s ++ t-filter-out-git-hyphen-dir 994s ++ local pathent 994s +++ type -p git-rev-parse 994s +++ : 994s ++ pathent= 994s ++ case "$pathent" in 994s ++ return 994s ++ t-set-intree 994s ++ '[' x = x ']' 994s ++ return 994s ++ : -D 994s ++ export DGIT_TEST_DEBUG 994s ++ : x 994s ++ export DGIT_TEST_DEBPUSH_DEBUG 994s ++ : 994s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 994s ++ GIT_COMMITTER_DATE='1530000000 +0100' 994s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 994s ++ GIT_AUTHOR_DATE='1530000000 +0100' 994s ++ export LC_CTYPE=C.UTF-8 994s ++ LC_CTYPE=C.UTF-8 994s ++ unset CDPATH 994s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 994s ++ FILTER_BRANCH_SQUELCH_WARNING=1 994s +++ pwd 994s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 994s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 994s ++ testname=clone-nogit 994s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 994s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 994s ++ bpd=.. 994s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 994s ++ '[' x '!=' x ']' 994s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s +++ pwd 994s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ t-set-using-tmp 994s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 994s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 994s ++ export 'DEBFULLNAME=dgit test git user' 994s ++ DEBFULLNAME='dgit test git user' 994s ++ git config --global user.email dgit-test@debian.example.net 994s ++ git config --global user.name 'dgit test git user' 994s ++ git config --global protocol.ext.allow always 994s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 994s ++ env -0 994s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 994s ++ export DEBCHANGE_VENDOR=dpkg 994s ++ DEBCHANGE_VENDOR=dpkg 994s ++ unset VISUAL 994s ++ unset GIT_EDITOR 994s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 994s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 994s ++ cat 994s ++ schroot=build 994s ++ : aq 994s ++ : archive/test-dummy 994s ++ : sid:unstable 994s ++ t-git-config dgit.default.old-dsc-distro test-dummy 994s ++ git config --global dgit.default.old-dsc-distro test-dummy 994s ++ for import in ${autoimport-gnupg} 994s ++ case "$0" in 994s ++ t-setup-import gnupg 994s ++ local setupname=gnupg 994s ++ local setupsrc 994s ++ local lock 994s ++ '[' x = x ']' 994s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 994s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 994s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 994s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 994s cd "$1"; shift 994s setupname="$1"; shift 994s simport="$1"; shift 994s if [ -e "$simport" ]; then exit 0; fi 994s env - "$@" \ 994s "tests/setup/$setupname" 994s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 994s + cd /tmp/autopkgtest.XK8uun/build.980/src 994s + shift 994s + setupname=gnupg 994s + shift 994s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 994s + shift 994s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 994s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/clone-nogit-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/clone-nogit-stderr --stdout=/tmp/autopkgtest.XK8uun/clone-nogit-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/clone-nogit -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/clone-nogit' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/clone-nogit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 994s ++ set -o pipefail 994s ++ . tests/lib-core 994s ++ . tests/lib-restricts 994s ++ trap ' 994s rc=$? 994s set +x 994s test $rc = 0 || echo " 994s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 994s 994s Most relevant logs are just before assignment rc=$rc 994s Will now do cleanup etc. 994s " 994s set -x 994s set +e 994s pwd 994s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 994s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 994s set -e 994s test $rc = 0 || t-report-failure 994s ' EXIT 994s ++ t-filter-out-git-hyphen-dir 994s ++ local pathent 994s +++ type -p git-rev-parse 994s +++ : 994s ++ pathent= 994s ++ case "$pathent" in 994s ++ return 994s ++ t-set-intree 994s ++ '[' x = x ']' 994s ++ return 994s ++ : -D 994s ++ export DGIT_TEST_DEBUG 994s ++ : x 994s ++ export DGIT_TEST_DEBPUSH_DEBUG 994s ++ : 994s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 994s ++ GIT_COMMITTER_DATE='1530000000 +0100' 994s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 994s ++ GIT_AUTHOR_DATE='1530000000 +0100' 994s ++ export LC_CTYPE=C.UTF-8 994s ++ LC_CTYPE=C.UTF-8 994s ++ unset CDPATH 994s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 994s ++ FILTER_BRANCH_SQUELCH_WARNING=1 994s +++ pwd 994s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 994s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 994s ++ testname=gnupg 994s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 994s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 994s ++ bpd=.. 994s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 994s ++ '[' x '!=' x ']' 994s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s +++ pwd 994s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ t-set-using-tmp 994s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 994s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 994s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 994s ++ export 'DEBFULLNAME=dgit test git user' 994s ++ DEBFULLNAME='dgit test git user' 994s ++ git config --global user.email dgit-test@debian.example.net 994s ++ git config --global user.name 'dgit test git user' 994s ++ git config --global protocol.ext.allow always 994s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 994s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 994s ++ export DEBCHANGE_VENDOR=dpkg 994s ++ DEBCHANGE_VENDOR=dpkg 994s ++ unset VISUAL 994s ++ unset GIT_EDITOR 994s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 994s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 994s ++ cat 994s ++ schroot=build 994s ++ : aq 994s ++ : archive/test-dummy 994s ++ : sid:unstable 994s ++ t-git-config dgit.default.old-dsc-distro test-dummy 994s ++ git config --global dgit.default.old-dsc-distro test-dummy 994s ++ for import in ${autoimport-gnupg} 994s ++ case "$0" in 994s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 994s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 994s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 994s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 994s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 994s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 994s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 994s + setup=' 994s export GNUPGHOME=$tmp/gnupg 994s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 994s 994s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 995s ssb rsa2048 2013-11-17 [E] 995s 995s sec rsa2048 2014-01-26 [SC] 995s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 995s uid [ultimate] Populus Romanus (test key) 995s ssb rsa2048 2014-01-26 [E] 995s 995s sec rsa2048 2014-01-26 [SC] 995s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 995s uid [ unknown] Hannibal (test key) 995s ssb rsa2048 2014-01-26 [E] 995s 995s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 995s export GNUPGHOME=$tmp/gnupg 995s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 995s 995s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/must-clean/git-check.port $tmp/git 995s read <$tmp/must-clean/git-check.port git_check_port 995s 995s t-git-config --global dgit-distro.test-dummy.git-check url 995s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 995s t-git-config --global dgit-distro.test-dummy.git-check-url \ 995s http://127.0.0.1:$git_check_port 995s ' 995s + local savevars= 995s + local savedirs=--files-from=/dev/null 995s + local 'importeval= 995s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 995s read <$tmp/must-clean/git-check.port git_check_port 995s 995s t-git-config --global dgit-distro.test-dummy.git-check url 995s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 995s t-git-config --global dgit-distro.test-dummy.git-check-url \ 995s http://127.0.0.1:$git_check_port 995s ' 995s + local import=IMPORT.http-git-check 995s + exec 995s + local vn 995s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 995s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 995s print STDERR "saving-exporting $vn\n"; 995s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 995s or die $!; 995s } 995s ' 995s saving-exporting DGIT_TEST_REAL_GPG 995s saving-exporting DGIT_TEST_REAL_GPG_AGENT 995s + set -e 995s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 995s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 995s + printf '\n%s\n' ' 995s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 995s read <$tmp/must-clean/git-check.port git_check_port 995s 995s t-git-config --global dgit-distro.test-dummy.git-check url 995s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 995s t-git-config --global dgit-distro.test-dummy.git-check-url \ 995s http://127.0.0.1:$git_check_port 995s ' 995s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 995s + rc=0 995s + set +x 995s + set +e 995s + pwd 995s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 995s + '[' x '!=' x ']' 995s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 995s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 995s + set -e 995s + test 0 = 0 995s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 995s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 995s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 995s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 995s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 995s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 995s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 995s ++ /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 995s ++ read git_check_port 995s ++ t-git-config --global dgit-distro.test-dummy.git-check url 995s ++ git config --global --global dgit-distro.test-dummy.git-check url 995s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 995s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 995s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:35943 995s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:35943 995s + t-archive pari-extra 3-1 995s + t-archive-none pari-extra 995s + t-select-package pari-extra 995s + p=pari-extra 995s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 995s + t-archive-none-aq 995s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 995s + : 995s + local 'jsondelim=[' 995s + local suitespec 995s + for suitespec in $suitespecs 995s + local suite=sid 995s + local sname=unstable 995s + t-aq-archive-updated sid pari-extra 995s + local suite=sid 995s + local p=pari-extra 995s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 995s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 995s + perl -wne ' 995s use JSON; 995s use strict; 995s our @v; 995s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 995s push @v, { 995s "version" => "$1", 995s "sha256sum" => "$2", 995s "component" => "$3", 995s "filename" => "$4", 995s }; 995s END { 995s my $json = JSON->new->canonical(); 995s print $json->encode(\@v) or die $!; 995s } 995s ' 995s + t-aq-archive-updated new pari-extra 995s + local suite=new 995s + local p=pari-extra 995s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 995s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 995s + perl -wne ' 995s use JSON; 995s use strict; 995s our @v; 995s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 995s push @v, { 995s "version" => "$1", 995s "sha256sum" => "$2", 995s "component" => "$3", 995s "filename" => "$4", 995s }; 995s END { 995s my $json = JSON->new->canonical(); 995s print $json->encode(\@v) or die $!; 995s } 995s ' 995s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 995s + cat 995s + jsondelim=' },' 995s + cat 995s + v=3-1 995s + local dscf=pari-extra_3-1.dsc 995s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/pari-extra_*' 995s + ln -s /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-1.diff.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 995s + t-archive-query 995s + local suite=sid 995s + local dscf=main/pari-extra_3-1.dsc 995s + t-archive-query-aq sid pari-extra 3-1 main/pari-extra_3-1.dsc 995s + local suite=sid 995s + local p=pari-extra 995s + local v=3-1 995s + local dscf=main/pari-extra_3-1.dsc 995s + local sha 995s ++ sha256sum 995s + sha='c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 -' 995s + echo '3-1 c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 main/pari-extra_3-1.dsc' 995s + t-aq-archive-updated sid pari-extra 995s + local suite=sid 995s + local p=pari-extra 995s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 995s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 995s + perl -wne ' 995s use JSON; 995s use strict; 995s our @v; 995s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 995s push @v, { 995s "version" => "$1", 995s "sha256sum" => "$2", 995s "component" => "$3", 995s "filename" => "$4", 995s }; 995s END { 995s my $json = JSON->new->canonical(); 995s print $json->encode(\@v) or die $!; 995s } 995s ' 995s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 995s + mkdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 995s + set -e 995s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 995s + dpkg-source -x ../mirror/pool/main/pari-extra_3-1.dsc 995s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/pari-extra_3-1.dsc) 995s dpkg-source: info: extracting pari-extra in pari-extra-3 995s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 995s dpkg-source: info: applying pari-extra_3-1.diff.gz 995s + t-git-none 995s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 995s + set -e 995s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 995s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 995s + t-dgit clone pari-extra 995s + local dgit=dgit 995s + pwd 995s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 995s + : ' 995s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 995s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone pari-extra 995s | git config -z --get-regexp --global '.*' 995s | git config -z --get-regexp --system '.*' 995s clone main body 995s CD pari-extra 995s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 995s canonical suite name for unstable is sid 995s query: fetching http://127.0.0.1:35943/pari-extra.git/HEAD... 995s dgit-repos check_for_git => . 995s + git init -q 995s | git config -z --get-regexp --local '.*' 995s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 995s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 995s + git config user.name 'dgit test git user' 995s is_gitattrs_setup: found nothing 995s starting new git history 995s + git config remote.dgit.skipdefaultupdate true 995s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 995s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 995s get_archive_dsc: Version 3-1 995s last upload to archive: NO git hash 995s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 995s => `' 995s previous reference hash= 995s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 995s => `' 995s fetch_from_archive: lastfetch= 995s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 995s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 995s ./pari-extra_3.orig.tar.gz does not exist, need to fetch 995s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3.orig.tar.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3.orig.tar.gz 995s % Total % Received % Xferd Average Speed Time Time Time Current 995s Dload Upload Total Spent Left Speed 995s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 121 100 121 0 0 1846k 0 --:--:-- --:--:-- --:--:-- 1846k 995s considering saving pari-extra_3.orig.tar.gz: linked. 995s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) (No such file or directory) absent. 995s ./pari-extra_3-1.diff.gz does not exist, need to fetch 995s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3-1.diff.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.diff.gz 995s % Total % Received % Xferd Average Speed Time Time Time Current 995s Dload Upload Total Spent Left Speed 995s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 2357 100 2357 0 0 39.4M 0 --:--:-- --:--:-- --:--:-- 39.4M 995s considering saving pari-extra_3-1.diff.gz: linked. 995s import considering pari-extra_3.orig.tar.gz Y .gz orig 995s + chmod -R '+rwX' _unpack-tar 995s CD _unpack-tar 995s | find -name .git -prune -print0 995s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 995s + git add -Af . 995s | git write-tree 995s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 995s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 995s => `' 995s multiple subtrees 995s CD .. 995s import considering pari-extra_3-1.diff.gz not tar 995s + dpkg-source --no-check -x -- pari-extra.dsc 996s dpkg-source: info: extracting pari-extra in pari-extra-3 996s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 996s dpkg-source: info: applying pari-extra_3-1.diff.gz 996s CD pari-extra-3 996s | find -name .git -prune -print0 996s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 996s + git add -Af . 996s | git write-tree 996s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 996s import clog search... 996s | dpkg-parsechangelog --format rfc822 --all 996s import clog 3-1 package changelog, entry no.1... 996s import clog 3-1 vs 3... 996s import clog 3-1 becomes r1 996s import clog 2.1-1 package changelog, entry no.2... 996s import clog 2.1-1 vs 3... 996s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 996s => `1312546022 +0000' 996s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 996s => `1312546022 +0000' 996s import tartrees authline Bill Allombert 1312546022 +0000 996s import tartrees r1authline Bill Allombert 1312546022 +0000 996s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 996s | git hash-object -w -t commit --stdin 996s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 996s import main commit 996s | git hash-object -w -t commit ../commit.tmp 996s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 996s synthesised git commit from .dsc 3-1 996s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 996s fetch mergeinfos: 996s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 Import of source package 996s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 996s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s => `' 996s + git reset --hard refs/remotes/dgit/dgit/sid 996s HEAD is now at 3d33f8b pari-extra (3-1) unstable; urgency=low 996s + bash -ec ' set -o pipefail 996s git ls-tree -r --name-only -z HEAD | '\\' 996s xargs -0r touch -h -r . -- 996s ' 996s dgit ok: ready for work in pari-extra 996s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 996s del_lrfetchrefs... 996s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 996s ' 996s + cd pari-extra 996s + t-cloned-fetched-good 996s + t-diff-nogit ../extract/pari-extra-3 . 996s + diff --exclude=.git --exclude=.pc -ruN ../extract/pari-extra-3 . 996s + t-clean-on-branch dgit/sid 996s + t-output '## dgit/sid' git status -b --porcelain 996s + printf '%s\n' '## dgit/sid' 996s + shift 996s + git status -b --porcelain 996s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 996s + t-refs-same-start 996s + unset t_ref_val 996s + t_ref_names=() 996s + t-refs-same refs/heads/dgit/sid refs/remotes/dgit/dgit/sid 996s + local g 996s + for g in $* 996s + t-ref-same refs/heads/dgit/sid 996s + local name=refs/heads/dgit/sid 996s + local val 996s ++ t-git-get-ref refs/heads/dgit/sid 996s ++ local ref=refs/heads/dgit/sid 996s ++ case "$ref" in 996s ++ perl -ne ' 996s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 996s END { print "$x\n" if length $x; } 996s ' 996s ++ git show-ref -d refs/heads/dgit/sid 996s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s + t-ref-same-val refs/heads/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s + local name=refs/heads/dgit/sid 996s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s + case "${t_ref_val-unset}" in 996s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s + t_ref_names+=("$name") 996s + for g in $* 996s + t-ref-same refs/remotes/dgit/dgit/sid 996s + local name=refs/remotes/dgit/dgit/sid 996s + local val 996s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 996s ++ local ref=refs/remotes/dgit/dgit/sid 996s ++ case "$ref" in 996s ++ git show-ref -d refs/remotes/dgit/dgit/sid 996s ++ perl -ne ' 996s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 996s END { print "$x\n" if length $x; } 996s ' 996s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s + t-ref-same-val refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s + local name=refs/remotes/dgit/dgit/sid 996s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s + case "${t_ref_val-unset}" in 996s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 996s + t_ref_names+=("$name") 996s + t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable 996s + local val 996s + for g in $* 996s ++ t-git-get-ref refs/dgit/unstable 996s ++ local ref=refs/dgit/unstable 996s ++ case "$ref" in 996s ++ git show-ref -d refs/dgit/unstable 996s ++ perl -ne ' 996s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 996s END { print "$x\n" if length $x; } 996s ' 996s ++ test 1 = 1 996s + val= 996s + '[' x '!=' x ']' 996s + for g in $* 996s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 996s ++ local ref=refs/remotes/dgit/dgit/unstable 996s ++ case "$ref" in 996s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 996s ++ perl -ne ' 996s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 996s END { print "$x\n" if length $x; } 996s ' 996s ++ test 1 = 1 996s + val= 996s + '[' x '!=' x ']' 996s + v=3-2~dummy1 996s + t-apply-diff 3-1 3-2~dummy1 996s + local v1=3-1 996s + local v2=3-2~dummy1 996s + cd /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs 996s + debdiff pari-extra_3-1.dsc pari-extra_3-2~dummy1.dsc 996s + patch -p1 -u 996s + test 1 = 1 996s patching file debian/changelog 996s patching file debian/control 996s + debcommit -a 996s git commit -m 'Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow.' -a 996s [dgit/sid 6cfbeb5] Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow. 996s 2 files changed, 8 insertions(+), 1 deletion(-) 996s + t-refs-same-start 996s + unset t_ref_val 996s + t_ref_names=() 996s + t-ref-head 996s + local val 996s ++ git rev-parse HEAD 996s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 996s + t-ref-same-val HEAD 6cfbeb52ce126ee40067fe8fa263446a79082de7 996s + local name=HEAD 996s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 996s + case "${t_ref_val-unset}" in 996s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 996s + t_ref_names+=("$name") 996s + t-dgit --dpkg-buildpackage:-d build 996s + local dgit=dgit 996s + pwd 996s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 996s + : ' 996s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 996s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --dpkg-buildpackage:-d build 996s | git rev-parse --show-toplevel 996s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra' 996s | git config -z --get-regexp --local '.*' 996s | git config -z --get-regexp --local '.*' 996s | git config -z --get-regexp --global '.*' 996s | git config -z --get-regexp --system '.*' 996s format , quilt mode linear 996s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 996s warning: could not open directory 'debian/source/': No such file or directory 996s => `' 996s + git diff --quiet HEAD 996s massage split -F. 996s massage done 3 -b. 996s format , quilt mode linear 996s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 996s warning: could not open directory 'debian/source/': No such file or directory 996s => `' 996s + git diff --quiet HEAD 996s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 996s dpkg-buildpackage: info: source package pari-extra 996s dpkg-buildpackage: info: source version 3-2~dummy1 996s dpkg-buildpackage: info: source distribution unstable 996s dpkg-buildpackage: info: source changed by Senatus Romanus 996s fakeroot debian/rules clean 996s dh_testdir 996s dh_testroot 996s rm -f build-stamp 996s dh_clean 996s | git clean -dn 996s => `' 996s | git rev-parse 'HEAD~0' 996s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 996s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 996s QF linkorigs pari-extra_3.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/../pari-extra_3.orig.tar.gz Y 996s CD work 996s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 996s + git reset -q --hard 6cfbeb52ce126ee40067fe8fa263446a79082de7 996s CD .. 996s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 997s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 997s dpkg-source: warning: source directory 'work' is not - 'pari-extra-3' 997s dpkg-source: warning: .orig directory name work.orig is not - (wanted pari-extra-3.orig) 997s dpkg-source: info: using source format '1.0' 997s dpkg-source: info: building pari-extra using existing pari-extra_3.orig.tar.gz 997s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.diff.gz 997s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.dsc 997s CD work 997s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 997s changelog will contain changes since 3-1 997s + sh -ec 'exec >../$1; shift; exec "$@"' x 'pari-extra_3-2~dummy1_source.changes' dpkg-genchanges -S -v3-1 997s dpkg-genchanges: info: not including original source code in upload 997s CD .. 997s moving pari-extra_3-2~dummy1.dsc, pari-extra_3-2~dummy1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.. 997s renaming (Files) pari-extra_3.orig.tar.gz 997s renaming (Files) pari-extra_3-2~dummy1.diff.gz 997s renaming (dsc) pari-extra_3-2~dummy1.dsc 997s renaming (changes) pari-extra_3-2~dummy1_source.changes 997s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 997s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -us -uc -nc -b -v3-1 997s dpkg-buildpackage: info: source package pari-extra 997s dpkg-buildpackage: info: source version 3-2~dummy1 997s dpkg-buildpackage: info: source distribution unstable 997s dpkg-buildpackage: info: source changed by Senatus Romanus 997s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 997s dpkg-buildpackage: info: host architecture ppc64el 997s debian/rules build 997s dh_testdir 997s touch build-stamp 997s fakeroot debian/rules binary 997s dh_testdir 997s dh_testroot 997s dh_prep 997s dh_installdirs 997s dh_testdir 997s dh_testroot 997s dh_installdocs 997s dh_installexamples 997s dh_installchangelogs 997s dh_link 997s dh_strip 997s dh_compress 997s dh_fixperms 998s dh_installdeb 998s dh_gencontrol 998s dh_md5sums 998s dh_builddeb 998s dpkg-deb: building package 'pari-extra' in '../pari-extra_3-2~dummy1_all.deb'. 998s dpkg-genbuildinfo --build=binary -O../pari-extra_3-2~dummy1_ppc64el.buildinfo 998s dpkg-genchanges --build=binary -v3-1 -O../pari-extra_3-2~dummy1_ppc64el.changes 998s dpkg-genchanges: info: binary-only upload (no source code included) 998s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 998s dpkg-buildpackage: info: binary-only upload (no source included) 998s CD .. 998s + mergechanges -f 'pari-extra_3-2~dummy1_source.changes' 'pari-extra_3-2~dummy1_ppc64el.changes' 999s dgit ok: build successful, results in pari-extra_3-2~dummy1_multi.changes 999s 999s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 999s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 999s ' 999s + t-dgit push 999s + local dgit=dgit 999s + pwd 999s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 999s + : ' 999s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 999s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push 999s | git rev-parse --show-toplevel 999s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra' 999s | git config -z --get-regexp --local '.*' 999s | git config -z --get-regexp --local '.*' 999s | git config -z --get-regexp --global '.*' 999s | git config -z --get-regexp --system '.*' 999s format , quilt mode linear 999s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 999s warning: could not open directory 'debian/source/': No such file or directory 999s => `' 999s + git diff --quiet HEAD 999s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 999s canonical suite name for unstable is sid 999s actually entering push 999s query: fetching http://127.0.0.1:35943/pari-extra.git/HEAD... 999s dgit-repos check_for_git => . 999s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 999s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 999s get_archive_dsc: Version 3-1 999s last upload to archive: NO git hash 999s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 999s => `' 999s previous reference hash= 999s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s fetch_from_archive: lastfetch=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 999s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 999s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) linked. 999s using existing pari-extra_3.orig.tar.gz 999s considering saving pari-extra_3.orig.tar.gz: (File exists) no need. 999s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) linked. 999s using existing pari-extra_3-1.diff.gz 999s considering saving pari-extra_3-1.diff.gz: (File exists) no need. 999s import considering pari-extra_3.orig.tar.gz Y .gz orig 999s + chmod -R '+rwX' _unpack-tar 999s CD _unpack-tar 999s | find -name .git -prune -print0 999s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 999s + git add -Af . 999s | git write-tree 999s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 999s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 999s => `' 999s multiple subtrees 999s CD .. 999s import considering pari-extra_3-1.diff.gz not tar 999s + dpkg-source --no-check -x -- pari-extra.dsc 999s dpkg-source: info: extracting pari-extra in pari-extra-3 999s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 999s dpkg-source: info: applying pari-extra_3-1.diff.gz 999s CD pari-extra-3 999s | find -name .git -prune -print0 999s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 999s + git add -Af . 999s | git write-tree 999s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 999s import clog search... 999s | dpkg-parsechangelog --format rfc822 --all 999s import clog 3-1 package changelog, entry no.1... 999s import clog 3-1 vs 3... 999s import clog 3-1 becomes r1 999s import clog 2.1-1 package changelog, entry no.2... 999s import clog 2.1-1 vs 3... 999s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 999s => `1312546022 +0000' 999s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 999s => `1312546022 +0000' 999s import tartrees authline Bill Allombert 1312546022 +0000 999s import tartrees r1authline Bill Allombert 1312546022 +0000 999s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 999s | git hash-object -w -t commit --stdin 999s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 999s import main commit 999s | git hash-object -w -t commit ../commit.tmp 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s synthesised git commit from .dsc 3-1 999s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 999s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgitclog; exec "$@"' x git cat-file blob 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0:debian/changelog 999s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s fetch mergeinfos: 999s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 dgit client's archive history view 999s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 999s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 999s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 999s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 999s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 999s + git check-ref-format archive/test-dummy/3-2_dummy1 999s | git symbolic-ref -q HEAD 999s => `refs/heads/dgit/sid' 999s | git rev-parse 'HEAD~0' 999s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 999s ffq_prev_branchinfo branch current refs/heads/dgit/sid 999s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/dgit/sid' 999s => `' 999s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/dgit/sid' 999s => `' 999s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 999s warning: could not open directory 'debian/source/': No such file or directory 999s => `' 999s + git diff --quiet HEAD 999s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 6cfbeb52ce126ee40067fe8fa263446a79082de7 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 999s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 999s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/3-2_dummy1' 999s => `' 999s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 999s checking that pari-extra_3-2~dummy1.dsc corresponds to HEAD 999s + dpkg-source -x -- '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc' 1000s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc) 1000s dpkg-source: info: extracting pari-extra in pari-extra-3 1000s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 1000s dpkg-source: info: applying pari-extra_3-2~dummy1.diff.gz 1000s CD pari-extra-3 1000s | find -name .git -prune -print0 1000s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1000s + git add -Af . 1000s | git write-tree 1000s => `59d0825204e6551ec6bcd704839aae32586014f4' 1000s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1000s + git diff --quiet 59d0825204e6551ec6bcd704839aae32586014f4 6cfbeb52ce126ee40067fe8fa263446a79082de7 1000s files_compare_inputs pari-extra_3-2~dummy1.dsc 1000s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 1000s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3.orig.tar.gz 1000s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 1000s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 1000s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3.orig.tar.gz 1000s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 1000s files_compare_inputs pari-extra_3-2~dummy1.dsc Files 1000s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3.orig.tar.gz 1000s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3-2~dummy1.diff.gz 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.dsc 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_all.deb 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_ppc64el.buildinfo 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.dsc 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_all.deb 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_ppc64el.buildinfo 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.dsc 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.diff.gz 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_all.deb 1000s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_ppc64el.buildinfo 1000s checking origs needed (3)... 1000s checking origs needed placement 'math optional'... 1000s origs pari-extra_3.orig.tar.gz | 76bcf03be979d3331f9051aa88439b8b 121 pari-extra_3.orig.tar.gz 1000s origs pari-extra_3.orig.tar.gz is_orig 1000s -| sh -ec 'cd "$1"; shift 1000s 1000s find -name "$1" -print0 | 1000s xargs -0r sha256sum 1000s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ pari-extra_3.orig.tar.gz 1000s | ac1ef39f9da80b582d1c0b2adfb09b041e3860ed20ddcf57a0e922e3305239df ./pool/main/pari-extra_3.orig.tar.gz 1000s origs pari-extra_3.orig.tar.gz $#$have=0 1000s origs pari-extra_3.orig.tar.gz f.same=1 #f._differ=-1 1000s origs pari-extra_3-2~dummy1.diff.gz | 53d67266a6a9646cb1d0d40722249214 2522 pari-extra_3-2~dummy1.diff.gz 1000s ../pari-extra_3-2~dummy1_multi.changes already has appropriate .orig(s) (if any) 1000s push_tagwants: $VAR1 = [ 1000s '3-2~dummy1', 1000s '6cfbeb52ce126ee40067fe8fa263446a79082de7', 1000s undef, 1000s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag' 1000s ]; 1000s $VAR2 = [ 1000s { 1000s 'Tfn' => sub { "DUMMY" }, 1000s 'TfSuffix' => '', 1000s 'View' => 'dgit', 1000s 'TagFn' => sub { "DUMMY" }, 1000s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 1000s 'Tag' => 'archive/test-dummy/3-2_dummy1' 1000s }, 1000s { 1000s 'Tag' => 'test-dummy/3-2_dummy1', 1000s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 1000s 'TagFn' => sub { "DUMMY" }, 1000s 'View' => 'dgit', 1000s 'TfSuffix' => '-dgit', 1000s 'Tfn' => sub { "DUMMY" } 1000s } 1000s ]; 1000s | date '+%s %z' -d 'Sun, 17 Nov 2013 14:34:17 +0000' 1000s => `1384698857 +0000' 1000s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp 1000s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1000s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp.asc 1000s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp 1000s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1000s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp.asc 1000s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp 1000s => `8244100a1de5bd4a244b4cedb86bc87d4902981b' 1000s + git verify-tag 8244100a1de5bd4a244b4cedb86bc87d4902981b 1000s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1000s gpg: Signature made Mon Mar 31 23:03:50 2025 UTC 1000s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1000s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1000s gpg: WARNING: This key is not certified with a trusted signature! 1000s gpg: There is no indication that the signature belongs to the owner. 1000s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1000s + git update-ref refs/tags/archive/test-dummy/3-2_dummy1 8244100a1de5bd4a244b4cedb86bc87d4902981b 1000s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp 1000s => `ffbb11326adecf0d6cb3a3f280f2b9ae57a0c1ea' 1000s + git verify-tag ffbb11326adecf0d6cb3a3f280f2b9ae57a0c1ea 1000s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1000s gpg: Signature made Mon Mar 31 23:03:50 2025 UTC 1000s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1000s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1000s gpg: WARNING: This key is not certified with a trusted signature! 1000s gpg: There is no indication that the signature belongs to the owner. 1000s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1000s + git update-ref refs/tags/test-dummy/3-2_dummy1 ffbb11326adecf0d6cb3a3f280f2b9ae57a0c1ea 1000s query: fetching http://127.0.0.1:35943/pari-extra.git/HEAD... 1000s dgit-repos check_for_git => . 1000s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create pari-extra ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template pari-extra.git' 1000s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/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 1000s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 1000s * [new reference] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> refs/dgit/sid 1000s * [new tag] archive/test-dummy/3-2_dummy1 -> archive/test-dummy/3-2_dummy1 1000s * [new tag] test-dummy/3-2_dummy1 -> test-dummy/3-2_dummy1 1000s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1000s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A '../pari-extra_3-2~dummy1_multi.changes' 1000s signfile dsc ../pari-extra_3-2~dummy1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1000s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1000s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1000s 1000s signfile buildinfo ../pari-extra_3-2~dummy1_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1000s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1000s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1000s 1000s fixup_changes dsc ../pari-extra_3-2~dummy1.dsc ../pari-extra_3-2~dummy1_multi.changes 1000s fixup_changes buildinfo ../pari-extra_3-2~dummy1_ppc64el.buildinfo ../pari-extra_3-2~dummy1_multi.changes 1000s signfile changes ../pari-extra_3-2~dummy1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1000s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1001s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1001s 1001s Successfully signed dsc, buildinfo, changes files 1001s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy '../pari-extra_3-2~dummy1_multi.changes' 1001s gpg: ../pari-extra_3-2~dummy1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1001s gpg: ../pari-extra_3-2~dummy1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1001s D: Setting host argument. 1001s Checking signature on .changes 1001s Checking signature on .dsc 1001s Uploading to test-dummy (via local to localhost): 1001s Successfully uploaded packages. 1001s dgit ok: pushed and uploaded 3-2~dummy1 1001s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1001s del_lrfetchrefs... 1001s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1001s ' 1001s + t-pushed-good dgit/sid 1001s + local branch=dgit/sid 1001s + local suite=sid 1001s + t-refs-same refs/heads/dgit/sid 1001s + local g 1001s + for g in $* 1001s + t-ref-same refs/heads/dgit/sid 1001s + local name=refs/heads/dgit/sid 1001s + local val 1001s ++ t-git-get-ref refs/heads/dgit/sid 1001s ++ local ref=refs/heads/dgit/sid 1001s ++ case "$ref" in 1001s ++ git show-ref -d refs/heads/dgit/sid 1001s ++ perl -ne ' 1001s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 1001s END { print "$x\n" if length $x; } 1001s ' 1001s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t-ref-same-val refs/heads/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + local name=refs/heads/dgit/sid 1001s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + case "${t_ref_val-unset}" in 1001s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t_ref_names+=("$name") 1001s + t-pushed-good-core 1001s + t-ref-dsc-dgit 1001s + t-incoming-dsc 1001s + local dsc=pari-extra_3-2~dummy1.dsc 1001s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 1001s + local val 1001s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit 1001s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 1001s ++ local field=Dgit 1001s ++ perl -e ' 1001s use Dpkg::Control::Hash; 1001s my $h = new Dpkg::Control::Hash allow_pgp=>1; 1001s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc"); 1001s my $val = $h->{"Dgit"},"\n"; 1001s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit" unless defined $val; 1001s print $val,"\n"; 1001s ' 1001s + val='6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git' 1001s ++ perl -e ' 1001s $_=shift @ARGV; 1001s die "Dgit $_ ?" unless m/^\w+\b/; 1001s print $&,"\n" or die $!; 1001s ' '6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git' 1001s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 1001s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + case "${t_ref_val-unset}" in 1001s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t_ref_names+=("$name") 1001s ++ t-v-tag 1001s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 1001s + t-refs-same refs/tags/archive/test-dummy/3-2_dummy1 refs/remotes/dgit/dgit/sid 1001s + local g 1001s + for g in $* 1001s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 1001s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1001s + local val 1001s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 1001s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 1001s ++ case "$ref" in 1001s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 1001s ++ perl -ne ' 1001s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 1001s END { print "$x\n" if length $x; } 1001s ' 1001s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1001s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + case "${t_ref_val-unset}" in 1001s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t_ref_names+=("$name") 1001s + for g in $* 1001s + t-ref-same refs/remotes/dgit/dgit/sid 1001s + local name=refs/remotes/dgit/dgit/sid 1001s + local val 1001s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 1001s ++ local ref=refs/remotes/dgit/dgit/sid 1001s ++ case "$ref" in 1001s ++ git show-ref -d refs/remotes/dgit/dgit/sid 1001s ++ perl -ne ' 1001s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 1001s END { print "$x\n" if length $x; } 1001s ' 1001s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t-ref-same-val refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + local name=refs/remotes/dgit/dgit/sid 1001s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + case "${t_ref_val-unset}" in 1001s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t_ref_names+=("$name") 1001s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 1001s + local val 1001s + for g in $* 1001s ++ t-git-get-ref refs/heads/dgit/unstable 1001s ++ local ref=refs/heads/dgit/unstable 1001s ++ case "$ref" in 1001s ++ git show-ref -d refs/heads/dgit/unstable 1001s ++ perl -ne ' 1001s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 1001s END { print "$x\n" if length $x; } 1001s ' 1001s ++ test 1 = 1 1001s + val= 1001s + '[' x '!=' x ']' 1001s + for g in $* 1001s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 1001s ++ local ref=refs/remotes/dgit/dgit/unstable 1001s ++ case "$ref" in 1001s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 1001s ++ perl -ne ' 1001s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 1001s END { print "$x\n" if length $x; } 1001s ' 1001s ++ test 1 = 1 1001s + val= 1001s + '[' x '!=' x ']' 1001s + set -e 1001s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 1001s ++ t-v-tag 1001s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 1001s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/3-2_dummy1 1001s + local g 1001s + for g in $* 1001s + t-ref-same refs/dgit/sid 1001s + local name=refs/dgit/sid 1001s + local val 1001s ++ t-git-get-ref refs/dgit/sid 1001s ++ local ref=refs/dgit/sid 1001s ++ case "$ref" in 1001s ++ git show-ref -d refs/dgit/sid 1001s ++ perl -ne ' 1001s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 1001s END { print "$x\n" if length $x; } 1001s ' 1001s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t-ref-same-val refs/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + local name=refs/dgit/sid 1001s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + case "${t_ref_val-unset}" in 1001s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t_ref_names+=("$name") 1001s + for g in $* 1001s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 1001s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1001s + local val 1001s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 1001s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 1001s ++ case "$ref" in 1001s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 1001s ++ perl -ne ' 1001s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 1001s END { print "$x\n" if length $x; } 1001s ' 1001s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1001s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + case "${t_ref_val-unset}" in 1001s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1001s + t_ref_names+=("$name") 1001s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 1001s + t-refs-notexist refs/dgit/unstable 1001s + local val 1001s + for g in $* 1001s ++ t-git-get-ref refs/dgit/unstable 1001s ++ local ref=refs/dgit/unstable 1001s ++ case "$ref" in 1001s ++ git show-ref -d refs/dgit/unstable 1001s ++ perl -ne ' 1001s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 1001s END { print "$x\n" if length $x; } 1001s ' 1001s ++ test 1 = 1 1001s + val= 1001s + '[' x '!=' x ']' 1001s ++ t-v-tag 1001s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 1001s + git verify-tag refs/tags/archive/test-dummy/3-2_dummy1 1001s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1001s gpg: Signature made Mon Mar 31 23:03:50 2025 UTC 1001s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1001s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1001s gpg: WARNING: This key is not certified with a trusted signature! 1001s gpg: There is no indication that the signature belongs to the owner. 1001s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1001s + t-ok 1001s + : ======================================== 1001s + t-check-only-bpd 1001s + '[' .. = .. ']' 1001s + return 1001s + t-fscks 1001s + shopt -s nullglob 1001s + for d in $tmp/*/.git $tmp/git/*.git 1001s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1001s + t-git-fsck 1001s ++ git rev-parse --git-dir 1001s + local fsckerrs=.git/dgit-test-fsck.errs 1001s + set +e 1001s + LC_MESSAGES=C 1001s + git fsck --no-dangling --strict 1001s + tee .git/dgit-test-fsck.errs 1001s + ps='0 0' 1001s + set -e 1001s + local pats 1001s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1001s + test '0 0' = '0 0' 1001s + pats+=(-e 'notice: HEAD points to an unborn branch') 1001s + pats+=(-e 'notice: No default references') 1001s + set +e 1001s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1001s + rc=1 1001s + set -e 1001s + case $rc in 1001s + for d in $tmp/*/.git $tmp/git/*.git 1001s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 1001s + t-git-fsck 1001s ++ git rev-parse --git-dir 1001s + local fsckerrs=./dgit-test-fsck.errs 1001s + set +e 1001s + LC_MESSAGES=C 1001s + git fsck --no-dangling --strict 1001s + tee ./dgit-test-fsck.errs 1001s notice: HEAD points to an unborn branch (master) 1001s + ps='0 0' 1001s + set -e 1001s + local pats 1001s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1001s + test '0 0' = '0 0' 1001s + pats+=(-e 'notice: HEAD points to an unborn branch') 1001s + pats+=(-e 'notice: No default references') 1001s + set +e 1001s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1001s + rc=1 1001s + set -e 1001s + case $rc in 1001s + t-save-artifacts 1001s + artifacts=/tmp/autopkgtest.XK8uun/clone-nogit-artifacts 1001s + '[' x/tmp/autopkgtest.XK8uun/clone-nogit-artifacts = x ']' 1001s + '[' xtmp = x ']' 1001s + GZIP=-1v 1001s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/clone-nogit-artifacts/clone-nogit.tar.gz '--exclude=*.tar' . 1001s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1001s 74.7% 1001s + echo ok. 1001s ok. 1001s + rc=0 1001s + set +x 1001s + set +e 1001s + pwd 1001s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1001s + '[' x '!=' x ']' 1001s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1001s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1001s + set -e 1001s + test 0 = 0 1001s /tmp/autopkgtest.XK8uun/wrapper.sh: Killing leaked background processes: 8929 1001s PID TTY STAT TIME COMMAND 1001s 8929 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1001s autopkgtest [23:03:51]: test clone-nogit: -----------------------] 1002s autopkgtest [23:03:52]: test clone-nogit: - - - - - - - - - - results - - - - - - - - - - 1002s clone-nogit PASS 1002s autopkgtest [23:03:52]: test clone-skew: preparing testbed 1002s Reading package lists... 1003s Building dependency tree... 1003s Reading state information... 1003s Starting pkgProblemResolver with broken count: 0 1003s Starting 2 pkgProblemResolver with broken count: 0 1003s Done 1003s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1004s autopkgtest [23:03:54]: test clone-skew: [----------------------- 1004s ++ set -o pipefail 1004s ++ . tests/lib-core 1004s ++ . tests/lib-restricts 1004s ++ trap ' 1004s rc=$? 1004s set +x 1004s test $rc = 0 || echo " 1004s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1004s 1004s Most relevant logs are just before assignment rc=$rc 1004s Will now do cleanup etc. 1004s " 1004s set -x 1004s set +e 1004s pwd 1004s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1004s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1004s set -e 1004s test $rc = 0 || t-report-failure 1004s ' EXIT 1004s ++ t-filter-out-git-hyphen-dir 1004s ++ local pathent 1004s +++ type -p git-rev-parse 1004s +++ : 1004s ++ pathent= 1004s ++ case "$pathent" in 1004s ++ return 1004s ++ t-set-intree 1004s ++ '[' x = x ']' 1004s ++ return 1004s ++ : -D 1004s ++ export DGIT_TEST_DEBUG 1004s ++ : x 1004s ++ export DGIT_TEST_DEBPUSH_DEBUG 1004s ++ : 1004s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1004s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1004s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1004s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1004s ++ export LC_CTYPE=C.UTF-8 1004s ++ LC_CTYPE=C.UTF-8 1004s ++ unset CDPATH 1004s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1004s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1004s +++ pwd 1004s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1004s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1004s ++ testname=clone-skew 1004s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1004s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1004s ++ bpd=.. 1004s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1004s ++ '[' x '!=' x ']' 1004s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s +++ pwd 1004s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ t-set-using-tmp 1004s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1004s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1004s ++ export 'DEBFULLNAME=dgit test git user' 1004s ++ DEBFULLNAME='dgit test git user' 1004s ++ git config --global user.email dgit-test@debian.example.net 1004s ++ git config --global user.name 'dgit test git user' 1004s ++ git config --global protocol.ext.allow always 1004s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1004s ++ env -0 1004s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1004s ++ export DEBCHANGE_VENDOR=dpkg 1004s ++ DEBCHANGE_VENDOR=dpkg 1004s ++ unset VISUAL 1004s ++ unset GIT_EDITOR 1004s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1004s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1004s ++ cat 1004s ++ schroot=build 1004s ++ : aq 1004s ++ : archive/test-dummy 1004s ++ : sid:unstable 1004s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1004s ++ git config --global dgit.default.old-dsc-distro test-dummy 1004s ++ for import in ${autoimport-gnupg} 1004s ++ case "$0" in 1004s ++ t-setup-import gnupg 1004s ++ local setupname=gnupg 1004s ++ local setupsrc 1004s ++ local lock 1004s ++ '[' x = x ']' 1004s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1004s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1004s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1004s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1004s cd "$1"; shift 1004s setupname="$1"; shift 1004s simport="$1"; shift 1004s if [ -e "$simport" ]; then exit 0; fi 1004s env - "$@" \ 1004s "tests/setup/$setupname" 1004s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1004s + cd /tmp/autopkgtest.XK8uun/build.980/src 1004s + shift 1004s + setupname=gnupg 1004s + shift 1004s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1004s + shift 1004s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1004s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/clone-skew-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/clone-skew-stderr --stdout=/tmp/autopkgtest.XK8uun/clone-skew-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/clone-skew -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/clone-skew' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/clone-skew-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1004s ++ set -o pipefail 1004s ++ . tests/lib-core 1004s ++ . tests/lib-restricts 1004s ++ trap ' 1004s rc=$? 1004s set +x 1004s test $rc = 0 || echo " 1004s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1004s 1004s Most relevant logs are just before assignment rc=$rc 1004s Will now do cleanup etc. 1004s " 1004s set -x 1004s set +e 1004s pwd 1004s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1004s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1004s set -e 1004s test $rc = 0 || t-report-failure 1004s ' EXIT 1004s ++ t-filter-out-git-hyphen-dir 1004s ++ local pathent 1004s +++ type -p git-rev-parse 1004s +++ : 1004s ++ pathent= 1004s ++ case "$pathent" in 1004s ++ return 1004s ++ t-set-intree 1004s ++ '[' x = x ']' 1004s ++ return 1004s ++ : -D 1004s ++ export DGIT_TEST_DEBUG 1004s ++ : x 1004s ++ export DGIT_TEST_DEBPUSH_DEBUG 1004s ++ : 1004s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1004s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1004s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1004s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1004s ++ export LC_CTYPE=C.UTF-8 1004s ++ LC_CTYPE=C.UTF-8 1004s ++ unset CDPATH 1004s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1004s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1004s +++ pwd 1004s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1004s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1004s ++ testname=gnupg 1004s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1004s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1004s ++ bpd=.. 1004s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1004s ++ '[' x '!=' x ']' 1004s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s +++ pwd 1004s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ t-set-using-tmp 1004s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1004s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1004s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1004s ++ export 'DEBFULLNAME=dgit test git user' 1004s ++ DEBFULLNAME='dgit test git user' 1004s ++ git config --global user.email dgit-test@debian.example.net 1004s ++ git config --global user.name 'dgit test git user' 1004s ++ git config --global protocol.ext.allow always 1004s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1004s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1004s ++ export DEBCHANGE_VENDOR=dpkg 1004s ++ DEBCHANGE_VENDOR=dpkg 1004s ++ unset VISUAL 1004s ++ unset GIT_EDITOR 1004s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1004s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1004s ++ cat 1004s ++ schroot=build 1004s ++ : aq 1004s ++ : archive/test-dummy 1004s ++ : sid:unstable 1004s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1004s ++ git config --global dgit.default.old-dsc-distro test-dummy 1004s ++ for import in ${autoimport-gnupg} 1004s ++ case "$0" in 1004s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1004s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1004s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1004s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1004s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1004s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1004s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1004s + setup=' 1004s export GNUPGHOME=$tmp/gnupg 1004s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1004s 1004s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1004s ssb rsa2048 2013-11-17 [E] 1004s 1004s sec rsa2048 2014-01-26 [SC] 1004s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1004s uid [ultimate] Populus Romanus (test key) 1004s ssb rsa2048 2014-01-26 [E] 1004s 1004s sec rsa2048 2014-01-26 [SC] 1004s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1004s uid [ unknown] Hannibal (test key) 1004s ssb rsa2048 2014-01-26 [E] 1004s 1004s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1004s export GNUPGHOME=$tmp/gnupg 1004s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1004s 1004s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 1005s "sha256sum" => "$2", 1005s "component" => "$3", 1005s "filename" => "$4", 1005s }; 1005s END { 1005s my $json = JSON->new->canonical(); 1005s print $json->encode(\@v) or die $!; 1005s } 1005s ' 1005s + t-aq-archive-updated new example 1005s + local suite=new 1005s + local p=example 1005s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1005s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1005s + perl -wne ' 1005s use JSON; 1005s use strict; 1005s our @v; 1005s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1005s push @v, { 1005s "version" => "$1", 1005s "sha256sum" => "$2", 1005s "component" => "$3", 1005s "filename" => "$4", 1005s }; 1005s END { 1005s my $json = JSON->new->canonical(); 1005s print $json->encode(\@v) or die $!; 1005s } 1005s ' 1005s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1005s + cat 1005s + jsondelim=' },' 1005s + cat 1005s + v=1.0-1 1005s + local dscf=example_1.0-1.dsc 1005s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_*' 1005s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1+absurd.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1+brokenmeta.debian.tar.xz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1+brokenmeta.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1.100.debian.tar.xz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1.100.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1.debian.tar.xz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0.orig-docs.tar.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1005s + t-archive-query 1005s + local suite=sid 1005s + local dscf=main/example_1.0-1.dsc 1005s + t-archive-query-aq sid example 1.0-1 main/example_1.0-1.dsc 1005s + local suite=sid 1005s + local p=example 1005s + local v=1.0-1 1005s + local dscf=main/example_1.0-1.dsc 1005s + local sha 1005s ++ sha256sum 1005s + sha='f58be8985abfc91613b38db1263979e53cf9172276fcdee68d20e930e681a0a4 -' 1005s + echo '1.0-1 f58be8985abfc91613b38db1263979e53cf9172276fcdee68d20e930e681a0a4 main/example_1.0-1.dsc' 1005s + t-aq-archive-updated sid example 1005s + local suite=sid 1005s + local p=example 1005s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1005s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1005s + perl -wne ' 1005s use JSON; 1005s use strict; 1005s our @v; 1005s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1005s push @v, { 1005s "version" => "$1", 1005s "sha256sum" => "$2", 1005s "component" => "$3", 1005s "filename" => "$4", 1005s }; 1005s END { 1005s my $json = JSON->new->canonical(); 1005s print $json->encode(\@v) or die $!; 1005s } 1005s ' 1005s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1005s + mkdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1005s + set -e 1005s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1005s + dpkg-source -x ../mirror/pool/main/example_1.0-1.dsc 1005s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/example_1.0-1.dsc) 1005s dpkg-source: info: extracting example in example-1.0 1005s dpkg-source: info: unpacking example_1.0.orig.tar.gz 1005s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 1005s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 1005s dpkg-source: info: using patch list from debian/patches/series 1005s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1005s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1005s dpkg-source: info: applying auto-gitignore 1005s + t-git-none 1005s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1005s + set -e 1005s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1005s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1005s + perl -i -ne ' 1005s print or die $!; 1005s s/1.0-1/1.0-1+0.1/g; 1005s s/ \w/ sprintf " %x", $& ^ 1 /e; 1005s print or die $!; 1005s ' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/package.sid.example 1005s + t-aq-archive-updated sid example 1005s + local suite=sid 1005s + local p=example 1005s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1005s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1005s + perl -wne ' 1005s use JSON; 1005s use strict; 1005s our @v; 1005s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1005s push @v, { 1005s "version" => "$1", 1005s "sha256sum" => "$2", 1005s "component" => "$3", 1005s "filename" => "$4", 1005s }; 1005s END { 1005s my $json = JSON->new->canonical(); 1005s print $json->encode(\@v) or die $!; 1005s } 1005s ' 1005s + LC_MESSAGES=C 1005s + t-dgit clone example 1005s + tee got.message 1005s + local dgit=dgit 1005s + pwd 1005s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1005s + : ' 1005s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1005s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone example 1005s | git config -z --get-regexp --global '.*' 1005s | git config -z --get-regexp --system '.*' 1005s clone main body 1005s CD example 1005s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1005s canonical suite name for unstable is sid 1005s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1005s => `0' 1005s + git init -q 1005s | git config -z --get-regexp --local '.*' 1005s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 1005s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 1005s + git config user.name 'dgit test git user' 1005s is_gitattrs_setup: found nothing 1005s starting new git history 1005s + git config remote.dgit.skipdefaultupdate true 1005s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1005s query: fetching http://127.0.0.1:39461//pool/main/example_1.0-1+0.1.dsc... 1005s query: fetching http://127.0.0.1:39461//pool/main/example_1.0-1.dsc... 1005s get_archive_dsc: Version 1.0-1 1005s last upload to archive: NO git hash 1005s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1005s => `' 1005s previous reference hash= 1005s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1005s => `' 1005s fetch_from_archive: lastfetch= 1005s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1005s considering reusing example_1.0.orig-docs.tar.gz: (No such file or directory) (No such file or directory) absent. 1005s ./example_1.0.orig-docs.tar.gz does not exist, need to fetch 1005s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig-docs.tar.gz -- http://127.0.0.1:39461//pool/main/example_1.0.orig-docs.tar.gz 1005s % Total % Received % Xferd Average Speed Time Time Time Current 1005s Dload Upload Total Spent Left Speed 1005s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 236 100 236 0 0 176k 0 --:--:-- --:--:-- --:--:-- 230k 1005s considering saving example_1.0.orig-docs.tar.gz: linked. 1005s considering reusing example_1.0.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 1005s ./example_1.0.orig.tar.gz does not exist, need to fetch 1005s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig.tar.gz -- http://127.0.0.1:39461//pool/main/example_1.0.orig.tar.gz 1005s % Total % Received % Xferd Average Speed Time Time Time Current 1005s Dload Upload Total Spent Left Speed 1005s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 373 100 373 0 0 239k 0 --:--:-- --:--:-- --:--:-- 364k 1005s considering saving example_1.0.orig.tar.gz: linked. 1005s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) (No such file or directory) absent. 1005s ./example_1.0-1.debian.tar.xz does not exist, need to fetch 1005s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0-1.debian.tar.xz -- http://127.0.0.1:39461//pool/main/example_1.0-1.debian.tar.xz 1005s % Total % Received % Xferd Average Speed Time Time Time Current 1005s Dload Upload Total Spent Left Speed 1005s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 1300 100 1300 0 0 1138k 0 --:--:-- --:--:-- --:--:-- 1269k 1005s considering saving example_1.0-1.debian.tar.xz: linked. 1005s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 1005s + chmod -R '+rwX' _unpack-tar 1005s CD _unpack-tar 1005s | find -name .git -prune -print0 1005s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1005s + git add -Af . 1005s | git write-tree 1005s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 1005s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 1005s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 1005s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 1005s CD .. 1005s import considering example_1.0.orig.tar.gz Y .gz orig 1005s + chmod -R '+rwX' _unpack-tar 1005s CD _unpack-tar 1005s | find -name .git -prune -print0 1005s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1005s + git add -Af . 1005s | git write-tree 1005s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 1005s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 1005s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 1005s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 1005s CD .. 1005s import considering example_1.0-1.debian.tar.xz Y .xz (none) 1005s + chmod -R '+rwX' _unpack-tar 1005s CD _unpack-tar 1005s | find -name .git -prune -print0 1005s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1005s + git add -Af . 1005s | git write-tree 1005s => `2e32e7dba6662d7204cb623f0685496d9e18ed39' 1005s | git ls-tree -z 2e32e7dba6662d7204cb623f0685496d9e18ed39 1005s => `040000 tree 4fdcc744fa631b40c7178eee72a6f59c8ca72600\x09debian\x00' 1005s one subtree 4fdcc744fa631b40c7178eee72a6f59c8ca72600 1005s CD .. 1005s + dpkg-source --no-check --skip-patches -x -- example.dsc 1005s dpkg-source: info: extracting example in example-1.0 1005s dpkg-source: info: unpacking example_1.0.orig.tar.gz 1005s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 1005s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 1005s CD example-1.0 1005s | find -name .git -prune -print0 1005s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1005s + git add -Af . 1005s | git write-tree 1005s => `faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4' 1005s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1005s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1005s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1005s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 1006s + git add -Af . 1006s | git write-tree 1006s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 1006s import clog search... 1006s | dpkg-parsechangelog --format rfc822 --all 1006s import clog 1.0-1 package changelog, entry no.1... 1006s import clog 1.0-1 vs 1.0... 1006s import clog 1.0-1 becomes r1 1006s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 1006s => `1431548802 +0000' 1006s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 1006s => `1431548802 +0000' 1006s import tartrees authline Ian Jackson 1431548802 +0000 1006s import tartrees r1authline Ian Jackson 1431548802 +0000 1006s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 1006s | git hash-object -w -t commit --stdin 1006s => 94c010931d011cbd6c1861bb9d453aa12d826298 1006s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 1006s | git hash-object -w -t commit --stdin 1006s => a5bb1f49c872a76a5d703570fd5352e424719bda 1006s import tartree example_1.0-1.debian.tar.xz 4fdcc744fa631b40c7178eee72a6f59c8ca72600 1006s | git hash-object -w -t commit --stdin 1006s => c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 1006s import main commit 1006s | git hash-object -w -t commit ../commit.tmp 1006s => `1d9c1ab6696b5b0b297493e1cce63577b4834b04' 1006s import apply patches... 1006s | git hash-object -w -t commit --stdin 1006s => 8a6a176760396ad6e2e096974469aa6cf7671956 1006s + git checkout -q -b dapplied 8a6a176760396ad6e2e096974469aa6cf7671956 1006s + git checkout -q -b unpa 1d9c1ab6696b5b0b297493e1cce63577b4834b04 1006s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 1006s => `1431548802 +0000' 1006s + git checkout -q unpa 1006s + git update-ref -d refs/heads/patch-queue/unpa 1006s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 1006s | git rev-parse 'HEAD~0' 1006s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 1006s | git rev-parse HEAD: 1006s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 1006s synthesised git commit from .dsc 1.0-1 1006s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1006s fetch mergeinfos: 1006s commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 Import of source package 1006s fetch hash=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s | git log -n2 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s => `commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6'... 1006s SKEW CHECK WANT 1.0-1+0.1 1006s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6:debian/changelog 1006s SKEW CHECK GOT 1.0-1 1006s 1006s Warning: archive skew detected. Using the available version: 1006s Archive allegedly contains 1.0-1+0.1 1006s We were able to obtain only 1.0-1 1006s 1006s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s => `' 1006s + git reset --hard refs/remotes/dgit/dgit/sid 1006s HEAD is now at 9af62d3 Update .gitignore from Debian packaging branch 1006s + bash -ec ' set -o pipefail 1006s git ls-tree -r --name-only -z HEAD | '\\' 1006s xargs -0r touch -h -r . -- 1006s ' 1006s dgit ok: ready for work in example 1006s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1006s del_lrfetchrefs... 1006s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1006s ' 1006s + grep 'Warning: archive skew detected.' got.message 1006s Warning: archive skew detected. Using the available version: 1006s + egrep 'We were able to obtain only *1.0-1$' got.message 1006s We were able to obtain only 1.0-1 1006s + cd example 1006s + t-cloned-fetched-good 1006s + t-diff-nogit ../extract/example-1.0 . 1006s + diff --exclude=.git --exclude=.pc -ruN ../extract/example-1.0 . 1006s + t-clean-on-branch dgit/sid 1006s + t-output '## dgit/sid' git status -b --porcelain 1006s + printf '%s\n' '## dgit/sid' 1006s + shift 1006s + git status -b --porcelain 1006s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1006s + t-refs-same-start 1006s + unset t_ref_val 1006s + t_ref_names=() 1006s + t-refs-same refs/heads/dgit/sid refs/remotes/dgit/dgit/sid 1006s + local g 1006s + for g in $* 1006s + t-ref-same refs/heads/dgit/sid 1006s + local name=refs/heads/dgit/sid 1006s + local val 1006s ++ t-git-get-ref refs/heads/dgit/sid 1006s ++ local ref=refs/heads/dgit/sid 1006s ++ case "$ref" in 1006s ++ perl -ne ' 1006s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 1006s END { print "$x\n" if length $x; } 1006s ' 1006s ++ git show-ref -d refs/heads/dgit/sid 1006s + val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s + t-ref-same-val refs/heads/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s + local name=refs/heads/dgit/sid 1006s + local val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s + case "${t_ref_val-unset}" in 1006s + t_ref_val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s + t_ref_names+=("$name") 1006s + for g in $* 1006s + t-ref-same refs/remotes/dgit/dgit/sid 1006s + local name=refs/remotes/dgit/dgit/sid 1006s + local val 1006s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 1006s ++ local ref=refs/remotes/dgit/dgit/sid 1006s ++ case "$ref" in 1006s ++ git show-ref -d refs/remotes/dgit/dgit/sid 1006s ++ perl -ne ' 1006s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 1006s END { print "$x\n" if length $x; } 1006s ' 1006s + val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s + t-ref-same-val refs/remotes/dgit/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s + local name=refs/remotes/dgit/dgit/sid 1006s + local val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s + case "${t_ref_val-unset}" in 1006s + t_ref_val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1006s + t_ref_names+=("$name") 1006s + t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable 1006s + local val 1006s + for g in $* 1006s ++ t-git-get-ref refs/dgit/unstable 1006s ++ local ref=refs/dgit/unstable 1006s ++ case "$ref" in 1006s ++ perl -ne ' 1006s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 1006s END { print "$x\n" if length $x; } 1006s ' 1006s ++ git show-ref -d refs/dgit/unstable 1006s ++ test 1 = 1 1006s + val= 1006s + '[' x '!=' x ']' 1006s + for g in $* 1006s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 1006s ++ local ref=refs/remotes/dgit/dgit/unstable 1006s ++ case "$ref" in 1006s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 1006s ++ perl -ne ' 1006s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 1006s END { print "$x\n" if length $x; } 1006s ' 1006s ++ test 1 = 1 1006s + val= 1006s + '[' x '!=' x ']' 1006s + t-ok 1006s + : ======================================== 1006s + t-check-only-bpd 1006s + '[' .. = .. ']' 1006s + return 1006s + t-fscks 1006s + shopt -s nullglob 1006s + for d in $tmp/*/.git $tmp/git/*.git 1006s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1006s + t-git-fsck 1006s ++ git rev-parse --git-dir 1006s + local fsckerrs=.git/dgit-test-fsck.errs 1006s + set +e 1006s + LC_MESSAGES=C 1006s + git fsck --no-dangling --strict 1006s + tee .git/dgit-test-fsck.errs 1006s + ps='0 0' 1006s + set -e 1006s + local pats 1006s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1006s + test '0 0' = '0 0' 1006s + pats+=(-e 'notice: HEAD points to an unborn branch') 1006s + pats+=(-e 'notice: No default references') 1006s + set +e 1006s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1006s + rc=1 1006s + set -e 1006s + case $rc in 1006s + t-save-artifacts 1006s + artifacts=/tmp/autopkgtest.XK8uun/clone-skew-artifacts 1006s + '[' x/tmp/autopkgtest.XK8uun/clone-skew-artifacts = x ']' 1006s + '[' xtmp = x ']' 1006s + GZIP=-1v 1006s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/clone-skew-artifacts/clone-skew.tar.gz '--exclude=*.tar' . 1006s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1006s 76.8% 1006s + echo ok. 1006s ok. 1006s + rc=0 1006s + set +x 1006s + set +e 1006s + pwd 1006s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1006s + '[' x '!=' x ']' 1006s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1006s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1006s + set -e 1006s + test 0 = 0 1006s /tmp/autopkgtest.XK8uun/wrapper.sh: Killing leaked background processes: 10635 1006s PID TTY STAT TIME COMMAND 1006s 10635 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror 1006s autopkgtest [23:03:56]: test clone-skew: -----------------------] 1007s autopkgtest [23:03:57]: test clone-skew: - - - - - - - - - - results - - - - - - - - - - 1007s clone-skew PASS 1007s autopkgtest [23:03:57]: test drs-clone-nogit: preparing testbed 1007s Reading package lists... 1008s Building dependency tree... 1008s 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. 1009s autopkgtest [23:03:59]: test drs-clone-nogit: [----------------------- 1009s ++ set -o pipefail 1009s ++ . tests/lib-core 1009s ++ . tests/lib-restricts 1009s ++ trap ' 1009s rc=$? 1009s set +x 1009s test $rc = 0 || echo " 1009s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1009s 1009s Most relevant logs are just before assignment rc=$rc 1009s Will now do cleanup etc. 1009s " 1009s set -x 1009s set +e 1009s pwd 1009s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1009s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1009s set -e 1009s test $rc = 0 || t-report-failure 1009s ' EXIT 1009s ++ t-filter-out-git-hyphen-dir 1009s ++ local pathent 1009s +++ type -p git-rev-parse 1009s +++ : 1009s ++ pathent= 1009s ++ case "$pathent" in 1009s ++ return 1009s ++ t-set-intree 1009s ++ '[' x = x ']' 1009s ++ return 1009s ++ : -D 1009s ++ export DGIT_TEST_DEBUG 1009s ++ : x 1009s ++ export DGIT_TEST_DEBPUSH_DEBUG 1009s ++ : 1009s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1009s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1009s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1009s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1009s ++ export LC_CTYPE=C.UTF-8 1009s ++ LC_CTYPE=C.UTF-8 1009s ++ unset CDPATH 1009s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1009s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1009s +++ pwd 1009s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1009s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1009s ++ testname=drs-clone-nogit 1009s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1009s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1009s ++ bpd=.. 1009s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1009s ++ '[' x '!=' x ']' 1009s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s +++ pwd 1009s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ t-set-using-tmp 1009s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1009s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1009s ++ export 'DEBFULLNAME=dgit test git user' 1009s ++ DEBFULLNAME='dgit test git user' 1009s ++ git config --global user.email dgit-test@debian.example.net 1009s ++ git config --global user.name 'dgit test git user' 1009s ++ git config --global protocol.ext.allow always 1009s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1009s ++ env -0 1009s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1009s ++ export DEBCHANGE_VENDOR=dpkg 1009s ++ DEBCHANGE_VENDOR=dpkg 1009s ++ unset VISUAL 1009s ++ unset GIT_EDITOR 1009s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1009s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1009s ++ cat 1009s ++ schroot=build 1009s ++ : aq 1009s ++ : archive/test-dummy 1009s ++ : sid:unstable 1009s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1009s ++ git config --global dgit.default.old-dsc-distro test-dummy 1009s ++ for import in ${autoimport-gnupg} 1009s ++ case "$0" in 1009s ++ t-setup-import gnupg 1009s ++ local setupname=gnupg 1009s ++ local setupsrc 1009s ++ local lock 1009s ++ '[' x = x ']' 1009s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1009s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1009s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1009s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1009s cd "$1"; shift 1009s setupname="$1"; shift 1009s simport="$1"; shift 1009s if [ -e "$simport" ]; then exit 0; fi 1009s env - "$@" \ 1009s "tests/setup/$setupname" 1009s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1009s + cd /tmp/autopkgtest.XK8uun/build.980/src 1009s + shift 1009s + setupname=gnupg 1009s + shift 1009s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1009s + shift 1009s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1009s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/drs-clone-nogit-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/drs-clone-nogit-stderr --stdout=/tmp/autopkgtest.XK8uun/drs-clone-nogit-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/drs-clone-nogit -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/drs-clone-nogit' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/drs-clone-nogit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1009s ++ set -o pipefail 1009s ++ . tests/lib-core 1009s ++ . tests/lib-restricts 1009s ++ trap ' 1009s rc=$? 1009s set +x 1009s test $rc = 0 || echo " 1009s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1009s 1009s Most relevant logs are just before assignment rc=$rc 1009s Will now do cleanup etc. 1009s " 1009s set -x 1009s set +e 1009s pwd 1009s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1009s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1009s set -e 1009s test $rc = 0 || t-report-failure 1009s ' EXIT 1009s ++ t-filter-out-git-hyphen-dir 1009s ++ local pathent 1009s +++ type -p git-rev-parse 1009s +++ : 1009s ++ pathent= 1009s ++ case "$pathent" in 1009s ++ return 1009s ++ t-set-intree 1009s ++ '[' x = x ']' 1009s ++ return 1009s ++ : -D 1009s ++ export DGIT_TEST_DEBUG 1009s ++ : x 1009s ++ export DGIT_TEST_DEBPUSH_DEBUG 1009s ++ : 1009s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1009s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1009s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1009s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1009s ++ export LC_CTYPE=C.UTF-8 1009s ++ LC_CTYPE=C.UTF-8 1009s ++ unset CDPATH 1009s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1009s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1009s +++ pwd 1009s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1009s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1009s ++ testname=gnupg 1009s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1009s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1009s ++ bpd=.. 1009s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1009s ++ '[' x '!=' x ']' 1009s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s +++ pwd 1009s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ t-set-using-tmp 1009s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1009s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1009s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1009s ++ export 'DEBFULLNAME=dgit test git user' 1009s ++ DEBFULLNAME='dgit test git user' 1009s ++ git config --global user.email dgit-test@debian.example.net 1009s ++ git config --global user.name 'dgit test git user' 1009s ++ git config --global protocol.ext.allow always 1009s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1009s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1009s ++ export DEBCHANGE_VENDOR=dpkg 1009s ++ DEBCHANGE_VENDOR=dpkg 1009s ++ unset VISUAL 1009s ++ unset GIT_EDITOR 1009s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1009s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1009s ++ cat 1009s ++ schroot=build 1009s ++ : aq 1009s ++ : archive/test-dummy 1009s ++ : sid:unstable 1009s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1009s ++ git config --global dgit.default.old-dsc-distro test-dummy 1009s ++ for import in ${autoimport-gnupg} 1009s ++ case "$0" in 1009s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1009s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1009s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1009s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1009s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1009s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1009s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1009s + setup=' 1009s export GNUPGHOME=$tmp/gnupg 1009s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1009s 1009s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1009s ssb rsa2048 2013-11-17 [E] 1009s 1009s sec rsa2048 2014-01-26 [SC] 1009s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1009s uid [ultimate] Populus Romanus (test key) 1009s ssb rsa2048 2014-01-26 [E] 1009s 1009s sec rsa2048 2014-01-26 [SC] 1009s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1009s uid [ unknown] Hannibal (test key) 1009s ssb rsa2048 2014-01-26 [E] 1009s 1009s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1009s export GNUPGHOME=$tmp/gnupg 1009s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1009s 1009s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/must-clean/git-check.port $tmp/git 1010s read <$tmp/must-clean/git-check.port git_check_port 1010s 1010s t-git-config --global dgit-distro.test-dummy.git-check url 1010s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1010s t-git-config --global dgit-distro.test-dummy.git-check-url \ 1010s http://127.0.0.1:$git_check_port 1010s ' 1010s + local savevars= 1010s + local savedirs=--files-from=/dev/null 1010s + local 'importeval= 1010s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 1010s read <$tmp/must-clean/git-check.port git_check_port 1010s 1010s t-git-config --global dgit-distro.test-dummy.git-check url 1010s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1010s t-git-config --global dgit-distro.test-dummy.git-check-url \ 1010s http://127.0.0.1:$git_check_port 1010s ' 1010s + local import=IMPORT.http-git-check 1010s + exec 1010s + local vn 1010s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1010s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1010s print STDERR "saving-exporting $vn\n"; 1010s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1010s or die $!; 1010s } 1010s ' 1010s saving-exporting DGIT_TEST_REAL_GPG 1010s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1010s + set -e 1010s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1010s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 1010s + printf '\n%s\n' ' 1010s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 1010s read <$tmp/must-clean/git-check.port git_check_port 1010s 1010s t-git-config --global dgit-distro.test-dummy.git-check url 1010s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1010s t-git-config --global dgit-distro.test-dummy.git-check-url \ 1010s http://127.0.0.1:$git_check_port 1010s ' 1010s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 1010s + rc=0 1010s + set +x 1010s + set +e 1010s + pwd 1010s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1010s + '[' x '!=' x ']' 1010s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1010s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1010s + set -e 1010s + test 0 = 0 1010s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1010s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1010s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 1010s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1010s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1010s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1010s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1010s ++ /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1010s ++ read git_check_port 1010s ++ t-git-config --global dgit-distro.test-dummy.git-check url 1010s ++ git config --global --global dgit-distro.test-dummy.git-check url 1010s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1010s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1010s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:46549 1010s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:46549 1010s + t-archive pari-extra 3-1 1010s + t-archive-none pari-extra 1010s + t-select-package pari-extra 1010s + p=pari-extra 1010s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 1010s + t-archive-none-aq 1010s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 1010s + : 1010s + local 'jsondelim=[' 1010s + local suitespec 1010s + for suitespec in $suitespecs 1010s + local suite=sid 1010s + local sname=unstable 1010s + t-aq-archive-updated sid pari-extra 1010s + local suite=sid 1010s + local p=pari-extra 1010s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1010s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1010s + perl -wne ' 1010s use JSON; 1010s use strict; 1010s our @v; 1010s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1010s push @v, { 1010s "version" => "$1", 1010s "sha256sum" => "$2", 1010s "component" => "$3", 1010s "filename" => "$4", 1010s }; 1010s END { 1010s my $json = JSON->new->canonical(); 1010s print $json->encode(\@v) or die $!; 1010s } 1010s ' 1010s + t-aq-archive-updated new pari-extra 1010s + local suite=new 1010s + local p=pari-extra 1010s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1010s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1010s + perl -wne ' 1010s use JSON; 1010s use strict; 1010s our @v; 1010s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1010s push @v, { 1010s "version" => "$1", 1010s "sha256sum" => "$2", 1010s "component" => "$3", 1010s "filename" => "$4", 1010s }; 1010s END { 1010s my $json = JSON->new->canonical(); 1010s print $json->encode(\@v) or die $!; 1010s } 1010s ' 1010s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1010s + cat 1010s + jsondelim=' },' 1010s + cat 1010s + v=3-1 1010s + local dscf=pari-extra_3-1.dsc 1010s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/pari-extra_*' 1010s + ln -s /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-1.diff.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1010s + t-archive-query 1010s + local suite=sid 1010s + local dscf=main/pari-extra_3-1.dsc 1010s + t-archive-query-aq sid pari-extra 3-1 main/pari-extra_3-1.dsc 1010s + local suite=sid 1010s + local p=pari-extra 1010s + local v=3-1 1010s + local dscf=main/pari-extra_3-1.dsc 1010s + local sha 1010s ++ sha256sum 1010s + sha='c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 -' 1010s + echo '3-1 c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 main/pari-extra_3-1.dsc' 1010s + t-aq-archive-updated sid pari-extra 1010s + local suite=sid 1010s + local p=pari-extra 1010s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1010s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1010s + perl -wne ' 1010s use JSON; 1010s use strict; 1010s our @v; 1010s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1010s push @v, { 1010s "version" => "$1", 1010s "sha256sum" => "$2", 1010s "component" => "$3", 1010s "filename" => "$4", 1010s }; 1010s END { 1010s my $json = JSON->new->canonical(); 1010s print $json->encode(\@v) or die $!; 1010s } 1010s ' 1010s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1010s + mkdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1010s + set -e 1010s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1010s + dpkg-source -x ../mirror/pool/main/pari-extra_3-1.dsc 1010s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/pari-extra_3-1.dsc) 1010s dpkg-source: info: extracting pari-extra in pari-extra-3 1010s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 1010s dpkg-source: info: applying pari-extra_3-1.diff.gz 1010s + t-git-none 1010s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1010s + set -e 1010s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1010s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1010s + t-dgit clone pari-extra 1010s + local dgit=dgit 1010s + pwd 1010s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1010s + : ' 1010s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1010s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone pari-extra 1010s | git config -z --get-regexp --global '.*' 1010s | git config -z --get-regexp --system '.*' 1010s clone main body 1010s CD pari-extra 1010s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1010s canonical suite name for unstable is sid 1010s query: fetching http://127.0.0.1:46549/pari-extra.git/HEAD... 1010s dgit-repos check_for_git => . 1010s + git init -q 1010s | git config -z --get-regexp --local '.*' 1010s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 1010s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 1010s + git config user.name 'dgit test git user' 1010s is_gitattrs_setup: found nothing 1010s starting new git history 1010s + git config remote.dgit.skipdefaultupdate true 1010s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 1010s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 1010s get_archive_dsc: Version 3-1 1010s last upload to archive: NO git hash 1010s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1010s => `' 1010s previous reference hash= 1010s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1010s => `' 1010s fetch_from_archive: lastfetch= 1010s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 1010s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 1010s ./pari-extra_3.orig.tar.gz does not exist, need to fetch 1010s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3.orig.tar.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3.orig.tar.gz 1010s % Total % Received % Xferd Average Speed Time Time Time Current 1010s Dload Upload Total Spent Left Speed 1010s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 121 100 121 0 0 1618k 0 --:--:-- --:--:-- --:--:-- 1618k 1010s considering saving pari-extra_3.orig.tar.gz: linked. 1010s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) (No such file or directory) absent. 1010s ./pari-extra_3-1.diff.gz does not exist, need to fetch 1010s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3-1.diff.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.diff.gz 1010s % Total % Received % Xferd Average Speed Time Time Time Current 1010s Dload Upload Total Spent Left Speed 1010s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 2357 100 2357 0 0 39.4M 0 --:--:-- --:--:-- --:--:-- 39.4M 1010s considering saving pari-extra_3-1.diff.gz: linked. 1010s import considering pari-extra_3.orig.tar.gz Y .gz orig 1010s + chmod -R '+rwX' _unpack-tar 1010s CD _unpack-tar 1010s | find -name .git -prune -print0 1010s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1010s + git add -Af . 1010s | git write-tree 1010s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 1010s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 1010s => `' 1010s multiple subtrees 1010s CD .. 1010s import considering pari-extra_3-1.diff.gz not tar 1010s + dpkg-source --no-check -x -- pari-extra.dsc 1010s dpkg-source: info: extracting pari-extra in pari-extra-3 1010s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 1010s dpkg-source: info: applying pari-extra_3-1.diff.gz 1010s CD pari-extra-3 1010s | find -name .git -prune -print0 1010s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1010s + git add -Af . 1010s | git write-tree 1010s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 1010s import clog search... 1010s | dpkg-parsechangelog --format rfc822 --all 1011s import clog 3-1 package changelog, entry no.1... 1011s import clog 3-1 vs 3... 1011s import clog 3-1 becomes r1 1011s import clog 2.1-1 package changelog, entry no.2... 1011s import clog 2.1-1 vs 3... 1011s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 1011s => `1312546022 +0000' 1011s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 1011s => `1312546022 +0000' 1011s import tartrees authline Bill Allombert 1312546022 +0000 1011s import tartrees r1authline Bill Allombert 1312546022 +0000 1011s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 1011s | git hash-object -w -t commit --stdin 1011s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 1011s import main commit 1011s | git hash-object -w -t commit ../commit.tmp 1011s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1011s synthesised git commit from .dsc 3-1 1011s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1011s fetch mergeinfos: 1011s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 Import of source package 1011s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 1011s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s => `' 1011s + git reset --hard refs/remotes/dgit/dgit/sid 1011s HEAD is now at 3d33f8b pari-extra (3-1) unstable; urgency=low 1011s + bash -ec ' set -o pipefail 1011s git ls-tree -r --name-only -z HEAD | '\\' 1011s xargs -0r touch -h -r . -- 1011s ' 1011s dgit ok: ready for work in pari-extra 1011s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1011s del_lrfetchrefs... 1011s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1011s ' 1011s + cd pari-extra 1011s + t-cloned-fetched-good 1011s + t-diff-nogit ../extract/pari-extra-3 . 1011s + diff --exclude=.git --exclude=.pc -ruN ../extract/pari-extra-3 . 1011s + t-clean-on-branch dgit/sid 1011s + t-output '## dgit/sid' git status -b --porcelain 1011s + printf '%s\n' '## dgit/sid' 1011s + shift 1011s + git status -b --porcelain 1011s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1011s + t-refs-same-start 1011s + unset t_ref_val 1011s + t_ref_names=() 1011s + t-refs-same refs/heads/dgit/sid refs/remotes/dgit/dgit/sid 1011s + local g 1011s + for g in $* 1011s + t-ref-same refs/heads/dgit/sid 1011s + local name=refs/heads/dgit/sid 1011s + local val 1011s ++ t-git-get-ref refs/heads/dgit/sid 1011s ++ local ref=refs/heads/dgit/sid 1011s ++ case "$ref" in 1011s ++ git show-ref -d refs/heads/dgit/sid 1011s ++ perl -ne ' 1011s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 1011s END { print "$x\n" if length $x; } 1011s ' 1011s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s + t-ref-same-val refs/heads/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s + local name=refs/heads/dgit/sid 1011s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s + case "${t_ref_val-unset}" in 1011s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s + t_ref_names+=("$name") 1011s + for g in $* 1011s + t-ref-same refs/remotes/dgit/dgit/sid 1011s + local name=refs/remotes/dgit/dgit/sid 1011s + local val 1011s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 1011s ++ local ref=refs/remotes/dgit/dgit/sid 1011s ++ case "$ref" in 1011s ++ git show-ref -d refs/remotes/dgit/dgit/sid 1011s ++ perl -ne ' 1011s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 1011s END { print "$x\n" if length $x; } 1011s ' 1011s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s + t-ref-same-val refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s + local name=refs/remotes/dgit/dgit/sid 1011s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s + case "${t_ref_val-unset}" in 1011s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1011s + t_ref_names+=("$name") 1011s + t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable 1011s + local val 1011s + for g in $* 1011s ++ t-git-get-ref refs/dgit/unstable 1011s ++ local ref=refs/dgit/unstable 1011s ++ case "$ref" in 1011s ++ perl -ne ' 1011s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 1011s END { print "$x\n" if length $x; } 1011s ' 1011s ++ git show-ref -d refs/dgit/unstable 1011s ++ test 1 = 1 1011s + val= 1011s + '[' x '!=' x ']' 1011s + for g in $* 1011s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 1011s ++ local ref=refs/remotes/dgit/dgit/unstable 1011s ++ case "$ref" in 1011s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 1011s ++ perl -ne ' 1011s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 1011s END { print "$x\n" if length $x; } 1011s ' 1011s ++ test 1 = 1 1011s + val= 1011s + '[' x '!=' x ']' 1011s + v=3-2~dummy1 1011s + t-apply-diff 3-1 3-2~dummy1 1011s + local v1=3-1 1011s + local v2=3-2~dummy1 1011s + cd /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs 1011s + debdiff pari-extra_3-1.dsc pari-extra_3-2~dummy1.dsc 1011s + patch -p1 -u 1011s + test 1 = 1 1011s patching file debian/changelog 1011s patching file debian/control 1011s + debcommit -a 1011s git commit -m 'Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow.' -a 1011s [dgit/sid 6cfbeb5] Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow. 1011s 2 files changed, 8 insertions(+), 1 deletion(-) 1011s + t-refs-same-start 1011s + unset t_ref_val 1011s + t_ref_names=() 1011s + t-ref-head 1011s + local val 1011s ++ git rev-parse HEAD 1011s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1011s + t-ref-same-val HEAD 6cfbeb52ce126ee40067fe8fa263446a79082de7 1011s + local name=HEAD 1011s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1011s + case "${t_ref_val-unset}" in 1011s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1011s + t_ref_names+=("$name") 1011s + t-dgit --dpkg-buildpackage:-d build 1011s + local dgit=dgit 1011s + pwd 1011s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1011s + : ' 1011s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1011s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --dpkg-buildpackage:-d build 1011s | git rev-parse --show-toplevel 1011s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra' 1011s | git config -z --get-regexp --local '.*' 1011s | git config -z --get-regexp --local '.*' 1011s | git config -z --get-regexp --global '.*' 1011s | git config -z --get-regexp --system '.*' 1011s format , quilt mode linear 1011s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1011s warning: could not open directory 'debian/source/': No such file or directory 1011s => `' 1011s + git diff --quiet HEAD 1011s massage split -F. 1011s massage done 3 -b. 1011s format , quilt mode linear 1011s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1011s warning: could not open directory 'debian/source/': No such file or directory 1011s => `' 1011s + git diff --quiet HEAD 1011s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 1011s dpkg-buildpackage: info: source package pari-extra 1011s dpkg-buildpackage: info: source version 3-2~dummy1 1011s dpkg-buildpackage: info: source distribution unstable 1011s dpkg-buildpackage: info: source changed by Senatus Romanus 1011s fakeroot debian/rules clean 1011s dh_testdir 1011s dh_testroot 1011s rm -f build-stamp 1011s dh_clean 1011s | git clean -dn 1011s => `' 1011s | git rev-parse 'HEAD~0' 1011s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 1011s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 1011s QF linkorigs pari-extra_3.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/../pari-extra_3.orig.tar.gz Y 1011s CD work 1011s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1011s + git reset -q --hard 6cfbeb52ce126ee40067fe8fa263446a79082de7 1011s CD .. 1011s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1011s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 1011s dpkg-source: warning: source directory 'work' is not - 'pari-extra-3' 1011s dpkg-source: warning: .orig directory name work.orig is not - (wanted pari-extra-3.orig) 1011s dpkg-source: info: using source format '1.0' 1011s dpkg-source: info: building pari-extra using existing pari-extra_3.orig.tar.gz 1011s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.diff.gz 1011s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.dsc 1011s CD work 1011s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 1011s changelog will contain changes since 3-1 1011s + sh -ec 'exec >../$1; shift; exec "$@"' x 'pari-extra_3-2~dummy1_source.changes' dpkg-genchanges -S -v3-1 1012s dpkg-genchanges: info: not including original source code in upload 1012s CD .. 1012s moving pari-extra_3-2~dummy1.dsc, pari-extra_3-2~dummy1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.. 1012s renaming (Files) pari-extra_3.orig.tar.gz 1012s renaming (Files) pari-extra_3-2~dummy1.diff.gz 1012s renaming (dsc) pari-extra_3-2~dummy1.dsc 1012s renaming (changes) pari-extra_3-2~dummy1_source.changes 1012s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1012s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -us -uc -nc -b -v3-1 1012s dpkg-buildpackage: info: source package pari-extra 1012s dpkg-buildpackage: info: source version 3-2~dummy1 1012s dpkg-buildpackage: info: source distribution unstable 1012s dpkg-buildpackage: info: source changed by Senatus Romanus 1012s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 1012s dpkg-buildpackage: info: host architecture ppc64el 1012s debian/rules build 1012s dh_testdir 1012s touch build-stamp 1012s fakeroot debian/rules binary 1012s dh_testdir 1012s dh_testroot 1012s dh_prep 1012s dh_installdirs 1012s dh_testdir 1012s dh_testroot 1012s dh_installdocs 1012s dh_installexamples 1012s dh_installchangelogs 1012s dh_link 1012s dh_strip 1012s dh_compress 1012s dh_fixperms 1012s dh_installdeb 1012s dh_gencontrol 1013s dh_md5sums 1013s dh_builddeb 1013s dpkg-deb: building package 'pari-extra' in '../pari-extra_3-2~dummy1_all.deb'. 1013s dpkg-genbuildinfo --build=binary -O../pari-extra_3-2~dummy1_ppc64el.buildinfo 1013s dpkg-genchanges --build=binary -v3-1 -O../pari-extra_3-2~dummy1_ppc64el.changes 1013s dpkg-genchanges: info: binary-only upload (no source code included) 1013s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 1013s dpkg-buildpackage: info: binary-only upload (no source included) 1013s CD .. 1013s + mergechanges -f 'pari-extra_3-2~dummy1_source.changes' 'pari-extra_3-2~dummy1_ppc64el.changes' 1014s dgit ok: build successful, results in pari-extra_3-2~dummy1_multi.changes 1014s 1014s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1014s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1014s ' 1014s + t-dgit push 1014s + local dgit=dgit 1014s + pwd 1014s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1014s + : ' 1014s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1014s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push 1014s | git rev-parse --show-toplevel 1014s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra' 1014s | git config -z --get-regexp --local '.*' 1014s | git config -z --get-regexp --local '.*' 1014s | git config -z --get-regexp --global '.*' 1014s | git config -z --get-regexp --system '.*' 1014s format , quilt mode linear 1014s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1014s warning: could not open directory 'debian/source/': No such file or directory 1014s => `' 1014s + git diff --quiet HEAD 1014s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1014s canonical suite name for unstable is sid 1014s actually entering push 1014s query: fetching http://127.0.0.1:46549/pari-extra.git/HEAD... 1014s dgit-repos check_for_git => . 1014s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 1014s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 1014s get_archive_dsc: Version 3-1 1014s last upload to archive: NO git hash 1014s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1014s => `' 1014s previous reference hash= 1014s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s fetch_from_archive: lastfetch=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1014s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 1014s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) linked. 1014s using existing pari-extra_3.orig.tar.gz 1014s considering saving pari-extra_3.orig.tar.gz: (File exists) no need. 1014s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) linked. 1014s using existing pari-extra_3-1.diff.gz 1014s considering saving pari-extra_3-1.diff.gz: (File exists) no need. 1014s import considering pari-extra_3.orig.tar.gz Y .gz orig 1014s + chmod -R '+rwX' _unpack-tar 1014s CD _unpack-tar 1014s | find -name .git -prune -print0 1014s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1014s + git add -Af . 1014s | git write-tree 1014s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 1014s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 1014s => `' 1014s multiple subtrees 1014s CD .. 1014s import considering pari-extra_3-1.diff.gz not tar 1014s + dpkg-source --no-check -x -- pari-extra.dsc 1014s dpkg-source: info: extracting pari-extra in pari-extra-3 1014s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 1014s dpkg-source: info: applying pari-extra_3-1.diff.gz 1014s CD pari-extra-3 1014s | find -name .git -prune -print0 1014s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1014s + git add -Af . 1014s | git write-tree 1014s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 1014s import clog search... 1014s | dpkg-parsechangelog --format rfc822 --all 1014s import clog 3-1 package changelog, entry no.1... 1014s import clog 3-1 vs 3... 1014s import clog 3-1 becomes r1 1014s import clog 2.1-1 package changelog, entry no.2... 1014s import clog 2.1-1 vs 3... 1014s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 1014s => `1312546022 +0000' 1014s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 1014s => `1312546022 +0000' 1014s import tartrees authline Bill Allombert 1312546022 +0000 1014s import tartrees r1authline Bill Allombert 1312546022 +0000 1014s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 1014s | git hash-object -w -t commit --stdin 1014s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 1014s import main commit 1014s | git hash-object -w -t commit ../commit.tmp 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s synthesised git commit from .dsc 3-1 1014s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1014s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgitclog; exec "$@"' x git cat-file blob 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0:debian/changelog 1014s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s fetch mergeinfos: 1014s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 dgit client's archive history view 1014s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1014s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1014s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1014s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 1014s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1014s + git check-ref-format archive/test-dummy/3-2_dummy1 1014s | git symbolic-ref -q HEAD 1014s => `refs/heads/dgit/sid' 1014s | git rev-parse 'HEAD~0' 1014s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 1014s ffq_prev_branchinfo branch current refs/heads/dgit/sid 1014s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/dgit/sid' 1014s => `' 1014s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/dgit/sid' 1014s => `' 1014s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1014s warning: could not open directory 'debian/source/': No such file or directory 1014s => `' 1014s + git diff --quiet HEAD 1014s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 6cfbeb52ce126ee40067fe8fa263446a79082de7 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1014s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1014s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/3-2_dummy1' 1014s => `' 1014s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 1014s checking that pari-extra_3-2~dummy1.dsc corresponds to HEAD 1014s + dpkg-source -x -- '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc' 1014s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc) 1015s dpkg-source: info: extracting pari-extra in pari-extra-3 1015s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 1015s dpkg-source: info: applying pari-extra_3-2~dummy1.diff.gz 1015s CD pari-extra-3 1015s | find -name .git -prune -print0 1015s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1015s + git add -Af . 1015s | git write-tree 1015s => `59d0825204e6551ec6bcd704839aae32586014f4' 1015s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1015s + git diff --quiet 59d0825204e6551ec6bcd704839aae32586014f4 6cfbeb52ce126ee40067fe8fa263446a79082de7 1015s files_compare_inputs pari-extra_3-2~dummy1.dsc 1015s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 1015s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3.orig.tar.gz 1015s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 1015s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 1015s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3.orig.tar.gz 1015s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 1015s files_compare_inputs pari-extra_3-2~dummy1.dsc Files 1015s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3.orig.tar.gz 1015s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3-2~dummy1.diff.gz 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.dsc 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_all.deb 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_ppc64el.buildinfo 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.dsc 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_all.deb 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_ppc64el.buildinfo 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.dsc 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.diff.gz 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_all.deb 1015s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_ppc64el.buildinfo 1015s checking origs needed (3)... 1015s checking origs needed placement 'math optional'... 1015s origs pari-extra_3.orig.tar.gz | 76bcf03be979d3331f9051aa88439b8b 121 pari-extra_3.orig.tar.gz 1015s origs pari-extra_3.orig.tar.gz is_orig 1015s -| sh -ec 'cd "$1"; shift 1015s 1015s find -name "$1" -print0 | 1015s xargs -0r sha256sum 1015s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ pari-extra_3.orig.tar.gz 1015s | ac1ef39f9da80b582d1c0b2adfb09b041e3860ed20ddcf57a0e922e3305239df ./pool/main/pari-extra_3.orig.tar.gz 1015s origs pari-extra_3.orig.tar.gz $#$have=0 1015s origs pari-extra_3.orig.tar.gz f.same=1 #f._differ=-1 1015s origs pari-extra_3-2~dummy1.diff.gz | 53d67266a6a9646cb1d0d40722249214 2522 pari-extra_3-2~dummy1.diff.gz 1015s ../pari-extra_3-2~dummy1_multi.changes already has appropriate .orig(s) (if any) 1015s push_tagwants: $VAR1 = [ 1015s '3-2~dummy1', 1015s '6cfbeb52ce126ee40067fe8fa263446a79082de7', 1015s undef, 1015s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag' 1015s ]; 1015s $VAR2 = [ 1015s { 1015s 'Tfn' => sub { "DUMMY" }, 1015s 'TagFn' => sub { "DUMMY" }, 1015s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 1015s 'Tag' => 'archive/test-dummy/3-2_dummy1', 1015s 'View' => 'dgit', 1015s 'TfSuffix' => '' 1015s }, 1015s { 1015s 'TfSuffix' => '-dgit', 1015s 'View' => 'dgit', 1015s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 1015s 'Tag' => 'test-dummy/3-2_dummy1', 1015s 'Tfn' => sub { "DUMMY" }, 1015s 'TagFn' => sub { "DUMMY" } 1015s } 1015s ]; 1015s | date '+%s %z' -d 'Sun, 17 Nov 2013 14:34:17 +0000' 1015s => `1384698857 +0000' 1015s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp 1015s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1015s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp.asc 1015s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp 1015s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1015s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp.asc 1015s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp 1015s => `bd93dd64554cd7aa1c417b2a53a21ef588a0cd32' 1015s + git verify-tag bd93dd64554cd7aa1c417b2a53a21ef588a0cd32 1015s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1015s gpg: Signature made Mon Mar 31 23:04:05 2025 UTC 1015s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1015s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1015s gpg: WARNING: This key is not certified with a trusted signature! 1015s gpg: There is no indication that the signature belongs to the owner. 1015s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1015s + git update-ref refs/tags/archive/test-dummy/3-2_dummy1 bd93dd64554cd7aa1c417b2a53a21ef588a0cd32 1015s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp 1015s => `b64ce935b38b468d712a7b6554a074387c80f462' 1015s + git verify-tag b64ce935b38b468d712a7b6554a074387c80f462 1015s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1015s gpg: Signature made Mon Mar 31 23:04:05 2025 UTC 1015s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1015s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1015s gpg: WARNING: This key is not certified with a trusted signature! 1015s gpg: There is no indication that the signature belongs to the owner. 1015s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1015s + git update-ref refs/tags/test-dummy/3-2_dummy1 b64ce935b38b468d712a7b6554a074387c80f462 1015s query: fetching http://127.0.0.1:46549/pari-extra.git/HEAD... 1015s dgit-repos check_for_git => . 1015s + git -c push.followTags=false push 'ext::/tmp/autopkgtest.XK8uun/build.980/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 1015s (((((((((((((((((((((((((((((((((((((((( 1015s + export SSH_ORIGINAL_COMMAND=git-receive-pack /pari-extra.git 1015s + dgit-repos-server test-dummy /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy /tmp/autopkgtest.XK8uun/autopkgtest_tmp/dd.gpg,a:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dm.gpg,m/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dm.txt --repos=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git --suites=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/suites --ssh 1015s locking /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git.lock 1 1015s +M /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/policy-hook test-dummy /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/dgit-live /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy check-package pari-extra 1015s hook => 0 1015s fixmissing git_receive_pack 1015s locking /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective.lock 1 1015s locking /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_template.lock 1 1015s copy template /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_template -> /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective 1015s running main git_receive_pack 1015s locking /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_incoming12226.lock 1 1015s locking /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git.lock 1 1015s + git clone -l -q --mirror /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_incoming12226 1015s warning: You appear to have cloned an empty repository. 1015s stunt hook set up /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_incoming12226/hooks/pre-receive 1015s + git receive-pack /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_incoming12226 1015s remote: =in stunthook --pre-receive-hook pari-extra 1015s remote: =DGIT_DRS_DEBUG=1 1015s remote: =DGIT_DRS_DEST=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective 1015s remote: =DGIT_DRS_DGITLIVE=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/dgit-live 1015s remote: =DGIT_DRS_DGITREPOS=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1015s remote: =DGIT_DRS_DISTRO=test-dummy 1015s remote: =DGIT_DRS_DISTRODIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy 1015s remote: =DGIT_DRS_KEYRINGS=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dd.gpg,a:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dm.gpg,m/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dm.txt 1015s remote: =DGIT_DRS_MIRRORHOOK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/mirror-hook 1015s remote: =DGIT_DRS_POLICYHOOK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/policy-hook 1015s remote: =DGIT_DRS_SUITESFILE=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/suites 1015s remote: =DGIT_DRS_SUITESFORMASTERFILE=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/suites-master 1015s remote: =DGIT_DRS_WORK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_incoming12226 1015s remote: =DGIT_STUNT_AGENT=/tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/gpg-agent 1015s remote: =DGIT_TEST_DEBPUSH_DEBUG=x 1015s remote: =DGIT_TEST_DEBUG=-D 1015s remote: =DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1015s remote: =DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1015s remote: =DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1015s remote: =DGIT_TEST_REAL_GPG=/usr/bin/gpg 1015s remote: =DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1015s remote: =DGIT_TEST_TESTNAME=drs-clone-nogit 1015s remote: =DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1015s remote: =DGIT_TEST_TMPBASE= 1015s remote: =DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1015s remote: =stunthook in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_incoming12226 1015s remote: = updates ... 1015s remote: = upd.| 0000000000000000000000000000000000000000 6cfbeb52ce126ee40067fe8fa263446a79082de7 refs/dgit/sid 1015s remote: = upd.| 0000000000000000000000000000000000000000 bd93dd64554cd7aa1c417b2a53a21ef588a0cd32 refs/tags/archive/test-dummy/3-2_dummy1 1015s remote: = upd.| 0000000000000000000000000000000000000000 b64ce935b38b468d712a7b6554a074387c80f462 refs/tags/test-dummy/3-2_dummy1 1015s remote: = updates ok. 1015s remote: = readtag... 1015s remote: = parsetag... 1015s remote: = parsetag ignoring unrecognised `no-split' 1015s remote: = parsetag ok. 1015s remote: =verifytag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/dd.gpg,a... 1015s remote: = checksig keyring /tmp/autopkgtest.XK8uun/autopkgtest_tmp/dd.gpg... 1015s remote: =| gpgv --status-fd=1 --keyring /tmp/autopkgtest.XK8uun/autopkgtest_tmp/dd.gpg dgit-tmp/plaintext.asc dgit-tmp/plaintext 1015s remote: gpgv: Signature made Mon Mar 31 23:04:05 2025 UTC 1015s remote: gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1015s remote: gpgv: Good signature from "Senatus Romanus (test key) " 1015s remote: = checksig| NEWSIG 1015s remote: = checksig| KEY_CONSIDERED BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 0 1015s remote: = checksig| SIG_ID cV0TDlTvGG42GaRp0ZfvHOVexhc 2025-03-31 1743462245 1015s remote: = checksig| KEY_CONSIDERED BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 0 1015s remote: = checksig| GOODSIG A3DBCBC039B13D8A Senatus Romanus (test key) 1015s remote: = checksig| VALIDSIG BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 2025-03-31 1743462245 0 4 0 1 10 00 BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1015s remote: = checksig ok=1 1015s remote: =verifytag a ok 1015s remote: =checks 1015s remote: =expected tag archive/test-dummy/3-2_dummy1 test-dummy/3-2_dummy1 1015s remote: =| git for-each-ref '--format=%(objectname)' '[r]efs/tags/test-dummy/3-2_dummy1' 1015s remote: ==> `' 1015s remote: =locking /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git.lock 1 1015s remote: =+M /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/policy-hook test-dummy /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/dgit-live /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy push pari-extra '3-2~dummy1' sid archive/test-dummy/3-2_dummy1 '' 1015s remote: =hook => 0 1015s remote: =checksuite (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/suites) 1015s remote: =suite_is_in (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/suites) 1015s remote: =oldcommit 0000000000000000000000000000000000000000 1015s remote: = ~NOCOMMITCHECK git log -z --pretty=tformat:%H%n%at%n%ct%n 6cfbeb52ce126ee40067fe8fa263446a79082de7 1015s remote: =+ git send-pack /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective --receive-pack=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_incoming12226/./objects/incoming-PL3NhI/dgit-recv-wrapper 6cfbeb52ce126ee40067fe8fa263446a79082de7:refs/dgit/sid bd93dd64554cd7aa1c417b2a53a21ef588a0cd32:refs/tags/archive/test-dummy/3-2_dummy1 b64ce935b38b468d712a7b6554a074387c80f462:refs/tags/test-dummy/3-2_dummy1 1015s remote: To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective 1015s remote: * [new reference] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> refs/dgit/sid 1015s remote: * [new tag] bd93dd64554cd7aa1c417b2a53a21ef588a0cd32 -> archive/test-dummy/3-2_dummy1 1015s remote: * [new tag] b64ce935b38b468d712a7b6554a074387c80f462 -> test-dummy/3-2_dummy1 1015s remote: =suite_is_in (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/suites-master) 1015s remote: =+ git send-pack /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective --receive-pack=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_incoming12226/./objects/incoming-PL3NhI/dgit-recv-wrapper 6cfbeb52ce126ee40067fe8fa263446a79082de7:refs/heads/master 1015s remote: To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective 1015s remote: * [new branch] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> master 1015s remote: =+M /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/policy-hook test-dummy /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/dgit-live /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy push-confirm pari-extra '3-2~dummy1' sid archive/test-dummy/3-2_dummy1 '' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective 1015s remote: =hook => 0 1015s remote: =stunthook done. 1015s show-ref (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective) ... 1015s show-refs| 6cfbeb52ce126ee40067fe8fa263446a79082de7 refs/dgit/sid 1015s show-refs| 6cfbeb52ce126ee40067fe8fa263446a79082de7 refs/heads/master 1015s show-refs| bd93dd64554cd7aa1c417b2a53a21ef588a0cd32 refs/tags/archive/test-dummy/3-2_dummy1 1015s show-refs| b64ce935b38b468d712a7b6554a074387c80f462 refs/tags/test-dummy/3-2_dummy1 1015s installprospective ? 1015s locking /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git.lock 1 1015s install /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/_tmp/pari-extra_prospective => /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 1015s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/mirror-hook /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy updated-hook pari-extra 1015s locking pari-extra_incoming12226.lock 0 1015s locking pari-extra_prospective.lock 0 1015s + : )))))))))))))))))))))))))))))))))))))))) 1015s To ext::/tmp/autopkgtest.XK8uun/build.980/src/tests/drs-git-ext %S /pari-extra.git 1015s * [new reference] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> refs/dgit/sid 1015s * [new tag] archive/test-dummy/3-2_dummy1 -> archive/test-dummy/3-2_dummy1 1015s * [new tag] test-dummy/3-2_dummy1 -> test-dummy/3-2_dummy1 1015s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1015s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A '../pari-extra_3-2~dummy1_multi.changes' 1015s signfile dsc ../pari-extra_3-2~dummy1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1015s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1015s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1015s 1015s signfile buildinfo ../pari-extra_3-2~dummy1_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1015s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1016s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1016s 1016s fixup_changes dsc ../pari-extra_3-2~dummy1.dsc ../pari-extra_3-2~dummy1_multi.changes 1016s fixup_changes buildinfo ../pari-extra_3-2~dummy1_ppc64el.buildinfo ../pari-extra_3-2~dummy1_multi.changes 1016s signfile changes ../pari-extra_3-2~dummy1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1016s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1016s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1016s 1016s Successfully signed dsc, buildinfo, changes files 1016s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy '../pari-extra_3-2~dummy1_multi.changes' 1016s gpg: ../pari-extra_3-2~dummy1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1016s gpg: ../pari-extra_3-2~dummy1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1016s D: Setting host argument. 1016s Checking signature on .changes 1016s Checking signature on .dsc 1016s Uploading to test-dummy (via local to localhost): 1016s Successfully uploaded packages. 1016s dgit ok: pushed and uploaded 3-2~dummy1 1016s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1016s del_lrfetchrefs... 1016s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1016s ' 1016s + t-pushed-good dgit/sid 1016s + local branch=dgit/sid 1016s + local suite=sid 1016s + t-refs-same refs/heads/dgit/sid 1016s + local g 1016s + for g in $* 1016s + t-ref-same refs/heads/dgit/sid 1016s + local name=refs/heads/dgit/sid 1016s + local val 1016s ++ t-git-get-ref refs/heads/dgit/sid 1016s ++ local ref=refs/heads/dgit/sid 1016s ++ case "$ref" in 1016s ++ git show-ref -d refs/heads/dgit/sid 1016s ++ perl -ne ' 1016s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 1016s END { print "$x\n" if length $x; } 1016s ' 1016s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t-ref-same-val refs/heads/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + local name=refs/heads/dgit/sid 1016s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + case "${t_ref_val-unset}" in 1016s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t_ref_names+=("$name") 1016s + t-pushed-good-core 1016s + t-ref-dsc-dgit 1016s + t-incoming-dsc 1016s + local dsc=pari-extra_3-2~dummy1.dsc 1016s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 1016s + local val 1016s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit 1016s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 1016s ++ local field=Dgit 1016s ++ perl -e ' 1016s use Dpkg::Control::Hash; 1016s my $h = new Dpkg::Control::Hash allow_pgp=>1; 1016s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc"); 1016s my $val = $h->{"Dgit"},"\n"; 1016s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit" unless defined $val; 1016s print $val,"\n"; 1016s ' 1016s + val='6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 ext::/tmp/autopkgtest.XK8uun/build.980/src/tests/drs-git-ext %S /pari-extra.git' 1016s ++ perl -e ' 1016s $_=shift @ARGV; 1016s die "Dgit $_ ?" unless m/^\w+\b/; 1016s print $&,"\n" or die $!; 1016s ' '6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 ext::/tmp/autopkgtest.XK8uun/build.980/src/tests/drs-git-ext %S /pari-extra.git' 1016s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 1016s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + case "${t_ref_val-unset}" in 1016s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t_ref_names+=("$name") 1016s ++ t-v-tag 1016s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 1016s + t-refs-same refs/tags/archive/test-dummy/3-2_dummy1 refs/remotes/dgit/dgit/sid 1016s + local g 1016s + for g in $* 1016s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 1016s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1016s + local val 1016s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 1016s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 1016s ++ case "$ref" in 1016s ++ perl -ne ' 1016s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 1016s END { print "$x\n" if length $x; } 1016s ' 1016s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 1016s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1016s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + case "${t_ref_val-unset}" in 1016s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t_ref_names+=("$name") 1016s + for g in $* 1016s + t-ref-same refs/remotes/dgit/dgit/sid 1016s + local name=refs/remotes/dgit/dgit/sid 1016s + local val 1016s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 1016s ++ local ref=refs/remotes/dgit/dgit/sid 1016s ++ case "$ref" in 1016s ++ perl -ne ' 1016s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 1016s END { print "$x\n" if length $x; } 1016s ' 1016s ++ git show-ref -d refs/remotes/dgit/dgit/sid 1016s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t-ref-same-val refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + local name=refs/remotes/dgit/dgit/sid 1016s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + case "${t_ref_val-unset}" in 1016s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t_ref_names+=("$name") 1016s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 1016s + local val 1016s + for g in $* 1016s ++ t-git-get-ref refs/heads/dgit/unstable 1016s ++ local ref=refs/heads/dgit/unstable 1016s ++ case "$ref" in 1016s ++ perl -ne ' 1016s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 1016s END { print "$x\n" if length $x; } 1016s ' 1016s ++ git show-ref -d refs/heads/dgit/unstable 1016s ++ test 1 = 1 1016s + val= 1016s + '[' x '!=' x ']' 1016s + for g in $* 1016s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 1016s ++ local ref=refs/remotes/dgit/dgit/unstable 1016s ++ case "$ref" in 1016s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 1016s ++ perl -ne ' 1016s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 1016s END { print "$x\n" if length $x; } 1016s ' 1016s ++ test 1 = 1 1016s + val= 1016s + '[' x '!=' x ']' 1016s + set -e 1016s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 1016s ++ t-v-tag 1016s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 1016s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/3-2_dummy1 1016s + local g 1016s + for g in $* 1016s + t-ref-same refs/dgit/sid 1016s + local name=refs/dgit/sid 1016s + local val 1016s ++ t-git-get-ref refs/dgit/sid 1016s ++ local ref=refs/dgit/sid 1016s ++ case "$ref" in 1016s ++ git show-ref -d refs/dgit/sid 1016s ++ perl -ne ' 1016s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 1016s END { print "$x\n" if length $x; } 1016s ' 1016s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t-ref-same-val refs/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + local name=refs/dgit/sid 1016s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + case "${t_ref_val-unset}" in 1016s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t_ref_names+=("$name") 1016s + for g in $* 1016s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 1016s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1016s + local val 1016s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 1016s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 1016s ++ case "$ref" in 1016s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 1016s ++ perl -ne ' 1016s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 1016s END { print "$x\n" if length $x; } 1016s ' 1016s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1016s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + case "${t_ref_val-unset}" in 1016s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + t_ref_names+=("$name") 1016s + t-check-pushed-master 1016s + local master 1016s ++ t-git-get-ref refs/heads/master 1016s ++ local ref=refs/heads/master 1016s ++ case "$ref" in 1016s ++ git show-ref -d refs/heads/master 1016s ++ perl -ne ' 1016s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 1016s END { print "$x\n" if length $x; } 1016s ' 1016s + master=6cfbeb52ce126ee40067fe8fa263446a79082de7 1016s + '[' x6cfbeb52ce126ee40067fe8fa263446a79082de7 = x6cfbeb52ce126ee40067fe8fa263446a79082de7 ']' 1016s + return 1016s + t-refs-notexist refs/dgit/unstable 1016s + local val 1016s + for g in $* 1016s ++ t-git-get-ref refs/dgit/unstable 1016s ++ local ref=refs/dgit/unstable 1016s ++ case "$ref" in 1016s ++ git show-ref -d refs/dgit/unstable 1016s ++ perl -ne ' 1016s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 1016s END { print "$x\n" if length $x; } 1016s ' 1016s ++ test 1 = 1 1016s + val= 1016s + '[' x '!=' x ']' 1016s ++ t-v-tag 1016s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 1016s + git verify-tag refs/tags/archive/test-dummy/3-2_dummy1 1016s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1016s gpg: Signature made Mon Mar 31 23:04:05 2025 UTC 1016s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1016s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1016s gpg: WARNING: This key is not certified with a trusted signature! 1016s gpg: There is no indication that the signature belongs to the owner. 1016s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1016s + t-ok 1016s + : ======================================== 1016s + t-check-only-bpd 1016s + '[' .. = .. ']' 1016s + return 1016s + t-fscks 1016s + shopt -s nullglob 1016s + for d in $tmp/*/.git $tmp/git/*.git 1016s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1016s + t-git-fsck 1016s ++ git rev-parse --git-dir 1016s + local fsckerrs=.git/dgit-test-fsck.errs 1016s + set +e 1016s + LC_MESSAGES=C 1016s + git fsck --no-dangling --strict 1016s + tee .git/dgit-test-fsck.errs 1016s + ps='0 0' 1016s + set -e 1016s + local pats 1016s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1016s + test '0 0' = '0 0' 1016s + pats+=(-e 'notice: HEAD points to an unborn branch') 1016s + pats+=(-e 'notice: No default references') 1016s + set +e 1016s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1016s + rc=1 1016s + set -e 1016s + case $rc in 1016s + for d in $tmp/*/.git $tmp/git/*.git 1016s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 1016s + t-git-fsck 1016s ++ git rev-parse --git-dir 1016s + local fsckerrs=./dgit-test-fsck.errs 1016s + set +e 1016s + LC_MESSAGES=C 1016s + git fsck --no-dangling --strict 1016s + tee ./dgit-test-fsck.errs 1016s + ps='0 0' 1016s + set -e 1016s + local pats 1016s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1016s + test '0 0' = '0 0' 1016s + pats+=(-e 'notice: HEAD points to an unborn branch') 1016s + pats+=(-e 'notice: No default references') 1016s + set +e 1016s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1016s + rc=1 1016s + set -e 1016s + case $rc in 1016s + t-save-artifacts 1016s + artifacts=/tmp/autopkgtest.XK8uun/drs-clone-nogit-artifacts 1016s + '[' x/tmp/autopkgtest.XK8uun/drs-clone-nogit-artifacts = x ']' 1016s + '[' xtmp = x ']' 1016s + GZIP=-1v 1016s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/drs-clone-nogit-artifacts/clone-nogit.tar.gz '--exclude=*.tar' . 1016s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1016s 74.5% 1016s + echo ok. 1016s ok. 1016s + rc=0 1016s + set +x 1016s + set +e 1016s + pwd 1016s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1016s + '[' x '!=' x ']' 1016s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1016s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1016s + set -e 1016s + test 0 = 0 1016s /tmp/autopkgtest.XK8uun/wrapper.sh: Killing leaked background processes: 11310 1016s PID TTY STAT TIME COMMAND 1016s 11310 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1016s autopkgtest [23:04:06]: test drs-clone-nogit: -----------------------] 1017s drs-clone-nogit PASS 1017s autopkgtest [23:04:07]: test drs-clone-nogit: - - - - - - - - - - results - - - - - - - - - - 1017s autopkgtest [23:04:07]: test dsd-clone-nogit: preparing testbed 1018s Reading package lists... 1018s Building dependency tree... 1018s Reading state information... 1018s Starting pkgProblemResolver with broken count: 0 1018s Starting 2 pkgProblemResolver with broken count: 0 1018s Done 1018s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1019s autopkgtest [23:04:09]: test dsd-clone-nogit: [----------------------- 1019s ++ set -o pipefail 1019s ++ . tests/lib-core 1019s ++ . tests/lib-restricts 1019s ++ trap ' 1019s rc=$? 1019s set +x 1019s test $rc = 0 || echo " 1019s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1019s 1019s Most relevant logs are just before assignment rc=$rc 1019s Will now do cleanup etc. 1019s " 1019s set -x 1019s set +e 1019s pwd 1019s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1019s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1019s set -e 1019s test $rc = 0 || t-report-failure 1019s ' EXIT 1019s ++ t-filter-out-git-hyphen-dir 1019s ++ local pathent 1019s +++ type -p git-rev-parse 1019s +++ : 1019s ++ pathent= 1019s ++ case "$pathent" in 1019s ++ return 1019s ++ t-set-intree 1019s ++ '[' x = x ']' 1019s ++ return 1019s ++ : -D 1019s ++ export DGIT_TEST_DEBUG 1019s ++ : x 1019s ++ export DGIT_TEST_DEBPUSH_DEBUG 1019s ++ : 1019s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1019s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1019s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1019s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1019s ++ export LC_CTYPE=C.UTF-8 1019s ++ LC_CTYPE=C.UTF-8 1019s ++ unset CDPATH 1019s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1019s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1019s +++ pwd 1019s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1019s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1019s ++ testname=dsd-clone-nogit 1019s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1019s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1019s ++ bpd=.. 1019s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1019s ++ '[' x '!=' x ']' 1019s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s +++ pwd 1019s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ t-set-using-tmp 1019s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1019s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1019s ++ export 'DEBFULLNAME=dgit test git user' 1019s ++ DEBFULLNAME='dgit test git user' 1019s ++ git config --global user.email dgit-test@debian.example.net 1019s ++ git config --global user.name 'dgit test git user' 1019s ++ git config --global protocol.ext.allow always 1019s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1019s ++ env -0 1019s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1019s ++ export DEBCHANGE_VENDOR=dpkg 1019s ++ DEBCHANGE_VENDOR=dpkg 1019s ++ unset VISUAL 1019s ++ unset GIT_EDITOR 1019s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1019s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1019s ++ cat 1019s ++ schroot=build 1019s ++ : aq 1019s ++ : archive/test-dummy 1019s ++ : sid:unstable 1019s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1019s ++ git config --global dgit.default.old-dsc-distro test-dummy 1019s ++ for import in ${autoimport-gnupg} 1019s ++ case "$0" in 1019s ++ t-setup-import gnupg 1019s ++ local setupname=gnupg 1019s ++ local setupsrc 1019s ++ local lock 1019s ++ '[' x = x ']' 1019s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1019s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1019s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1019s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1019s cd "$1"; shift 1019s setupname="$1"; shift 1019s simport="$1"; shift 1019s if [ -e "$simport" ]; then exit 0; fi 1019s env - "$@" \ 1019s "tests/setup/$setupname" 1019s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1019s + cd /tmp/autopkgtest.XK8uun/build.980/src 1019s + shift 1019s + setupname=gnupg 1019s + shift 1019s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1019s + shift 1019s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1019s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/dsd-clone-nogit-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/dsd-clone-nogit-stderr --stdout=/tmp/autopkgtest.XK8uun/dsd-clone-nogit-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/dsd-clone-nogit -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/dsd-clone-nogit' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/dsd-clone-nogit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1019s ++ set -o pipefail 1019s ++ . tests/lib-core 1019s ++ . tests/lib-restricts 1019s ++ trap ' 1019s rc=$? 1019s set +x 1019s test $rc = 0 || echo " 1019s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1019s 1019s Most relevant logs are just before assignment rc=$rc 1019s Will now do cleanup etc. 1019s " 1019s set -x 1019s set +e 1019s pwd 1019s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1019s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1019s set -e 1019s test $rc = 0 || t-report-failure 1019s ' EXIT 1019s ++ t-filter-out-git-hyphen-dir 1019s ++ local pathent 1019s +++ type -p git-rev-parse 1019s +++ : 1019s ++ pathent= 1019s ++ case "$pathent" in 1019s ++ return 1019s ++ t-set-intree 1019s ++ '[' x = x ']' 1019s ++ return 1019s ++ : -D 1019s ++ export DGIT_TEST_DEBUG 1019s ++ : x 1019s ++ export DGIT_TEST_DEBPUSH_DEBUG 1019s ++ : 1019s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1019s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1019s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1019s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1019s ++ export LC_CTYPE=C.UTF-8 1019s ++ LC_CTYPE=C.UTF-8 1019s ++ unset CDPATH 1019s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1019s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1019s +++ pwd 1019s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1019s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1019s ++ testname=gnupg 1019s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1019s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1019s ++ bpd=.. 1019s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1019s ++ '[' x '!=' x ']' 1019s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s +++ pwd 1019s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ t-set-using-tmp 1019s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1019s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1019s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1019s ++ export 'DEBFULLNAME=dgit test git user' 1019s ++ DEBFULLNAME='dgit test git user' 1019s ++ git config --global user.email dgit-test@debian.example.net 1019s ++ git config --global user.name 'dgit test git user' 1019s ++ git config --global protocol.ext.allow always 1019s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1019s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1019s ++ export DEBCHANGE_VENDOR=dpkg 1019s ++ DEBCHANGE_VENDOR=dpkg 1019s ++ unset VISUAL 1019s ++ unset GIT_EDITOR 1019s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1019s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1019s ++ cat 1019s ++ schroot=build 1019s ++ : aq 1019s ++ : archive/test-dummy 1019s ++ : sid:unstable 1019s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1019s ++ git config --global dgit.default.old-dsc-distro test-dummy 1019s ++ for import in ${autoimport-gnupg} 1019s ++ case "$0" in 1019s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1019s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1019s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1019s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1019s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1019s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1019s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1019s + setup=' 1019s export GNUPGHOME=$tmp/gnupg 1019s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1019s 1019s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1019s ssb rsa2048 2013-11-17 [E] 1019s 1019s sec rsa2048 2014-01-26 [SC] 1019s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1019s uid [ultimate] Populus Romanus (test key) 1019s ssb rsa2048 2014-01-26 [E] 1019s 1019s sec rsa2048 2014-01-26 [SC] 1019s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1019s uid [ unknown] Hannibal (test key) 1019s ssb rsa2048 2014-01-26 [E] 1019s 1020s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1020s export GNUPGHOME=$tmp/gnupg 1020s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1020s 1020s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/must-clean/git-check.port $tmp/git 1020s read <$tmp/must-clean/git-check.port git_check_port 1020s 1020s t-git-config --global dgit-distro.test-dummy.git-check url 1020s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1020s t-git-config --global dgit-distro.test-dummy.git-check-url \ 1020s http://127.0.0.1:$git_check_port 1020s ' 1020s + local savevars= 1020s + local savedirs=--files-from=/dev/null 1020s + local 'importeval= 1020s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 1020s read <$tmp/must-clean/git-check.port git_check_port 1020s 1020s t-git-config --global dgit-distro.test-dummy.git-check url 1020s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1020s t-git-config --global dgit-distro.test-dummy.git-check-url \ 1020s http://127.0.0.1:$git_check_port 1020s ' 1020s + local import=IMPORT.http-git-check 1020s + exec 1020s + local vn 1020s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1020s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1020s print STDERR "saving-exporting $vn\n"; 1020s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1020s or die $!; 1020s } 1020s ' 1020s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1020s saving-exporting DGIT_TEST_REAL_GPG 1020s + set -e 1020s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1020s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 1020s + printf '\n%s\n' ' 1020s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 1020s read <$tmp/must-clean/git-check.port git_check_port 1020s 1020s t-git-config --global dgit-distro.test-dummy.git-check url 1020s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1020s t-git-config --global dgit-distro.test-dummy.git-check-url \ 1020s http://127.0.0.1:$git_check_port 1020s ' 1020s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 1020s + rc=0 1020s + set +x 1020s + set +e 1020s + pwd 1020s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1020s + '[' x '!=' x ']' 1020s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1020s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1020s + set -e 1020s + test 0 = 0 1020s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1020s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1020s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 1020s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1020s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1020s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1020s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1020s ++ /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1020s ++ read git_check_port 1020s ++ t-git-config --global dgit-distro.test-dummy.git-check url 1020s ++ git config --global --global dgit-distro.test-dummy.git-check url 1020s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1020s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1020s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:41999 1020s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:41999 1020s + t-archive pari-extra 3-1 1020s + t-archive-none pari-extra 1020s + t-select-package pari-extra 1020s + p=pari-extra 1020s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 1020s + t-archive-none-aq 1020s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 1020s + : 1020s + local 'jsondelim=[' 1020s + local suitespec 1020s + for suitespec in $suitespecs 1020s + local suite=sid 1020s + local sname=unstable 1020s + t-aq-archive-updated sid pari-extra 1020s + local suite=sid 1020s + local p=pari-extra 1020s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1020s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1020s + perl -wne ' 1020s use JSON; 1020s use strict; 1020s our @v; 1020s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1020s push @v, { 1020s "version" => "$1", 1020s "sha256sum" => "$2", 1020s "component" => "$3", 1020s "filename" => "$4", 1020s }; 1020s END { 1020s my $json = JSON->new->canonical(); 1020s print $json->encode(\@v) or die $!; 1020s } 1020s ' 1020s + t-aq-archive-updated new pari-extra 1020s + local suite=new 1020s + local p=pari-extra 1020s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1020s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1020s + perl -wne ' 1020s use JSON; 1020s use strict; 1020s our @v; 1020s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1020s push @v, { 1020s "version" => "$1", 1020s "sha256sum" => "$2", 1020s "component" => "$3", 1020s "filename" => "$4", 1020s }; 1020s END { 1020s my $json = JSON->new->canonical(); 1020s print $json->encode(\@v) or die $!; 1020s } 1020s ' 1020s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1020s + cat 1020s + jsondelim=' },' 1020s + cat 1020s + v=3-1 1020s + local dscf=pari-extra_3-1.dsc 1020s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/pari-extra_*' 1020s + ln -s /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-1.diff.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/pari-extra_3.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1020s + t-archive-query 1020s + local suite=sid 1020s + local dscf=main/pari-extra_3-1.dsc 1020s + t-archive-query-aq sid pari-extra 3-1 main/pari-extra_3-1.dsc 1020s + local suite=sid 1020s + local p=pari-extra 1020s + local v=3-1 1020s + local dscf=main/pari-extra_3-1.dsc 1020s + local sha 1020s ++ sha256sum 1020s + sha='c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 -' 1020s + echo '3-1 c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 main/pari-extra_3-1.dsc' 1020s + t-aq-archive-updated sid pari-extra 1020s + local suite=sid 1020s + local p=pari-extra 1020s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1020s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1020s + perl -wne ' 1020s use JSON; 1020s use strict; 1020s our @v; 1020s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1020s push @v, { 1020s "version" => "$1", 1020s "sha256sum" => "$2", 1020s "component" => "$3", 1020s "filename" => "$4", 1020s }; 1020s END { 1020s my $json = JSON->new->canonical(); 1020s print $json->encode(\@v) or die $!; 1020s } 1020s ' 1020s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1020s + mkdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1020s + set -e 1020s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1020s + dpkg-source -x ../mirror/pool/main/pari-extra_3-1.dsc 1020s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/pari-extra_3-1.dsc) 1020s dpkg-source: info: extracting pari-extra in pari-extra-3 1020s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 1020s dpkg-source: info: applying pari-extra_3-1.diff.gz 1020s + t-git-none 1020s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1020s + set -e 1020s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1020s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1020s + t-dgit clone pari-extra 1020s + local dgit=dgit 1020s + pwd 1020s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1020s + : ' 1020s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1020s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone pari-extra 1020s | git config -z --get-regexp --global '.*' 1020s | git config -z --get-regexp --system '.*' 1020s clone main body 1020s CD pari-extra 1020s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1020s canonical suite name for unstable is sid 1020s query: fetching http://127.0.0.1:41999/pari-extra.git/HEAD... 1020s dgit-repos check_for_git => . 1020s + git init -q 1020s | git config -z --get-regexp --local '.*' 1020s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 1020s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 1020s + git config user.name 'dgit test git user' 1020s is_gitattrs_setup: found nothing 1020s starting new git history 1020s + git config remote.dgit.skipdefaultupdate true 1020s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 1020s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 1020s get_archive_dsc: Version 3-1 1020s last upload to archive: NO git hash 1020s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1020s => `' 1020s previous reference hash= 1020s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1020s => `' 1020s fetch_from_archive: lastfetch= 1020s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 1020s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 1020s ./pari-extra_3.orig.tar.gz does not exist, need to fetch 1020s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3.orig.tar.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3.orig.tar.gz 1020s % Total % Received % Xferd Average Speed Time Time Time Current 1020s Dload Upload Total Spent Left Speed 1020s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 121 100 121 0 0 1104k 0 --:--:-- --:--:-- --:--:-- 1104k 1020s considering saving pari-extra_3.orig.tar.gz: linked. 1020s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) (No such file or directory) absent. 1020s ./pari-extra_3-1.diff.gz does not exist, need to fetch 1020s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3-1.diff.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.diff.gz 1020s % Total % Received % Xferd Average Speed Time Time Time Current 1020s Dload Upload Total Spent Left Speed 1020s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 2357 100 2357 0 0 36.8M 0 --:--:-- --:--:-- --:--:-- 36.8M 1020s considering saving pari-extra_3-1.diff.gz: linked. 1020s import considering pari-extra_3.orig.tar.gz Y .gz orig 1020s + chmod -R '+rwX' _unpack-tar 1020s CD _unpack-tar 1020s | find -name .git -prune -print0 1020s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1020s + git add -Af . 1020s | git write-tree 1020s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 1020s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 1020s => `' 1020s multiple subtrees 1020s CD .. 1020s import considering pari-extra_3-1.diff.gz not tar 1020s + dpkg-source --no-check -x -- pari-extra.dsc 1021s dpkg-source: info: extracting pari-extra in pari-extra-3 1021s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 1021s dpkg-source: info: applying pari-extra_3-1.diff.gz 1021s CD pari-extra-3 1021s | find -name .git -prune -print0 1021s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1021s + git add -Af . 1021s | git write-tree 1021s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 1021s import clog search... 1021s | dpkg-parsechangelog --format rfc822 --all 1021s import clog 3-1 package changelog, entry no.1... 1021s import clog 3-1 vs 3... 1021s import clog 3-1 becomes r1 1021s import clog 2.1-1 package changelog, entry no.2... 1021s import clog 2.1-1 vs 3... 1021s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 1021s => `1312546022 +0000' 1021s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 1021s => `1312546022 +0000' 1021s import tartrees authline Bill Allombert 1312546022 +0000 1021s import tartrees r1authline Bill Allombert 1312546022 +0000 1021s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 1021s | git hash-object -w -t commit --stdin 1021s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 1021s import main commit 1021s | git hash-object -w -t commit ../commit.tmp 1021s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1021s synthesised git commit from .dsc 3-1 1021s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1021s fetch mergeinfos: 1021s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 Import of source package 1021s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 1021s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s => `' 1021s + git reset --hard refs/remotes/dgit/dgit/sid 1021s HEAD is now at 3d33f8b pari-extra (3-1) unstable; urgency=low 1021s + bash -ec ' set -o pipefail 1021s git ls-tree -r --name-only -z HEAD | '\\' 1021s xargs -0r touch -h -r . -- 1021s ' 1021s dgit ok: ready for work in pari-extra 1021s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1021s del_lrfetchrefs... 1021s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1021s ' 1021s + cd pari-extra 1021s + t-cloned-fetched-good 1021s + t-diff-nogit ../extract/pari-extra-3 . 1021s + diff --exclude=.git --exclude=.pc -ruN ../extract/pari-extra-3 . 1021s + t-clean-on-branch dgit/sid 1021s + t-output '## dgit/sid' git status -b --porcelain 1021s + printf '%s\n' '## dgit/sid' 1021s + shift 1021s + git status -b --porcelain 1021s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1021s + t-refs-same-start 1021s + unset t_ref_val 1021s + t_ref_names=() 1021s + t-refs-same refs/heads/dgit/sid refs/remotes/dgit/dgit/sid 1021s + local g 1021s + for g in $* 1021s + t-ref-same refs/heads/dgit/sid 1021s + local name=refs/heads/dgit/sid 1021s + local val 1021s ++ t-git-get-ref refs/heads/dgit/sid 1021s ++ local ref=refs/heads/dgit/sid 1021s ++ case "$ref" in 1021s ++ git show-ref -d refs/heads/dgit/sid 1021s ++ perl -ne ' 1021s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 1021s END { print "$x\n" if length $x; } 1021s ' 1021s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s + t-ref-same-val refs/heads/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s + local name=refs/heads/dgit/sid 1021s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s + case "${t_ref_val-unset}" in 1021s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s + t_ref_names+=("$name") 1021s + for g in $* 1021s + t-ref-same refs/remotes/dgit/dgit/sid 1021s + local name=refs/remotes/dgit/dgit/sid 1021s + local val 1021s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 1021s ++ local ref=refs/remotes/dgit/dgit/sid 1021s ++ case "$ref" in 1021s ++ git show-ref -d refs/remotes/dgit/dgit/sid 1021s ++ perl -ne ' 1021s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 1021s END { print "$x\n" if length $x; } 1021s ' 1021s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s + t-ref-same-val refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s + local name=refs/remotes/dgit/dgit/sid 1021s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s + case "${t_ref_val-unset}" in 1021s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1021s + t_ref_names+=("$name") 1021s + t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable 1021s + local val 1021s + for g in $* 1021s ++ t-git-get-ref refs/dgit/unstable 1021s ++ local ref=refs/dgit/unstable 1021s ++ case "$ref" in 1021s ++ git show-ref -d refs/dgit/unstable 1021s ++ perl -ne ' 1021s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 1021s END { print "$x\n" if length $x; } 1021s ' 1021s ++ test 1 = 1 1021s + val= 1021s + '[' x '!=' x ']' 1021s + for g in $* 1021s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 1021s ++ local ref=refs/remotes/dgit/dgit/unstable 1021s ++ case "$ref" in 1021s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 1021s ++ perl -ne ' 1021s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 1021s END { print "$x\n" if length $x; } 1021s ' 1021s ++ test 1 = 1 1021s + val= 1021s + '[' x '!=' x ']' 1021s + v=3-2~dummy1 1021s + t-apply-diff 3-1 3-2~dummy1 1021s + local v1=3-1 1021s + local v2=3-2~dummy1 1021s + cd /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs 1021s + debdiff pari-extra_3-1.dsc pari-extra_3-2~dummy1.dsc 1021s + patch -p1 -u 1021s + test 1 = 1 1021s patching file debian/changelog 1021s patching file debian/control 1021s + debcommit -a 1021s git commit -m 'Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow.' -a 1021s [dgit/sid 6cfbeb5] Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow. 1021s 2 files changed, 8 insertions(+), 1 deletion(-) 1021s + t-refs-same-start 1021s + unset t_ref_val 1021s + t_ref_names=() 1021s + t-ref-head 1021s + local val 1021s ++ git rev-parse HEAD 1021s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1021s + t-ref-same-val HEAD 6cfbeb52ce126ee40067fe8fa263446a79082de7 1021s + local name=HEAD 1021s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1021s + case "${t_ref_val-unset}" in 1021s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1021s + t_ref_names+=("$name") 1021s + t-dgit --dpkg-buildpackage:-d build 1021s + local dgit=dgit 1021s + pwd 1021s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1021s + : ' 1021s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1021s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --dpkg-buildpackage:-d build 1021s | git rev-parse --show-toplevel 1021s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra' 1021s | git config -z --get-regexp --local '.*' 1021s | git config -z --get-regexp --local '.*' 1021s | git config -z --get-regexp --global '.*' 1021s | git config -z --get-regexp --system '.*' 1021s format , quilt mode linear 1021s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1021s warning: could not open directory 'debian/source/': No such file or directory 1021s => `' 1021s + git diff --quiet HEAD 1021s massage split -F. 1021s massage done 3 -b. 1021s format , quilt mode linear 1021s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1021s warning: could not open directory 'debian/source/': No such file or directory 1021s => `' 1021s + git diff --quiet HEAD 1021s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 1021s dpkg-buildpackage: info: source package pari-extra 1021s dpkg-buildpackage: info: source version 3-2~dummy1 1021s dpkg-buildpackage: info: source distribution unstable 1021s dpkg-buildpackage: info: source changed by Senatus Romanus 1021s fakeroot debian/rules clean 1021s dh_testdir 1021s dh_testroot 1021s rm -f build-stamp 1021s dh_clean 1021s | git clean -dn 1021s => `' 1021s | git rev-parse 'HEAD~0' 1021s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 1021s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 1021s QF linkorigs pari-extra_3.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/../pari-extra_3.orig.tar.gz Y 1021s CD work 1021s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1021s + git reset -q --hard 6cfbeb52ce126ee40067fe8fa263446a79082de7 1021s CD .. 1021s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1022s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 1022s dpkg-source: warning: source directory 'work' is not - 'pari-extra-3' 1022s dpkg-source: warning: .orig directory name work.orig is not - (wanted pari-extra-3.orig) 1022s dpkg-source: info: using source format '1.0' 1022s dpkg-source: info: building pari-extra using existing pari-extra_3.orig.tar.gz 1022s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.diff.gz 1022s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.dsc 1022s CD work 1022s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 1022s changelog will contain changes since 3-1 1022s + sh -ec 'exec >../$1; shift; exec "$@"' x 'pari-extra_3-2~dummy1_source.changes' dpkg-genchanges -S -v3-1 1022s dpkg-genchanges: info: not including original source code in upload 1022s CD .. 1022s moving pari-extra_3-2~dummy1.dsc, pari-extra_3-2~dummy1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.. 1022s renaming (Files) pari-extra_3.orig.tar.gz 1022s renaming (Files) pari-extra_3-2~dummy1.diff.gz 1022s renaming (dsc) pari-extra_3-2~dummy1.dsc 1022s renaming (changes) pari-extra_3-2~dummy1_source.changes 1022s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1022s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -us -uc -nc -b -v3-1 1022s dpkg-buildpackage: info: source package pari-extra 1022s dpkg-buildpackage: info: source version 3-2~dummy1 1022s dpkg-buildpackage: info: source distribution unstable 1022s dpkg-buildpackage: info: source changed by Senatus Romanus 1022s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 1022s dpkg-buildpackage: info: host architecture ppc64el 1022s debian/rules build 1022s dh_testdir 1022s touch build-stamp 1022s fakeroot debian/rules binary 1022s dh_testdir 1022s dh_testroot 1022s dh_prep 1022s dh_installdirs 1022s dh_testdir 1022s dh_testroot 1022s dh_installdocs 1022s dh_installexamples 1022s dh_installchangelogs 1022s dh_link 1022s dh_strip 1023s dh_compress 1023s dh_fixperms 1023s dh_installdeb 1023s dh_gencontrol 1023s dh_md5sums 1023s dh_builddeb 1023s dpkg-deb: building package 'pari-extra' in '../pari-extra_3-2~dummy1_all.deb'. 1023s dpkg-genbuildinfo --build=binary -O../pari-extra_3-2~dummy1_ppc64el.buildinfo 1023s dpkg-genchanges --build=binary -v3-1 -O../pari-extra_3-2~dummy1_ppc64el.changes 1023s dpkg-genchanges: info: binary-only upload (no source code included) 1023s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 1023s dpkg-buildpackage: info: binary-only upload (no source included) 1023s CD .. 1023s + mergechanges -f 'pari-extra_3-2~dummy1_source.changes' 'pari-extra_3-2~dummy1_ppc64el.changes' 1024s dgit ok: build successful, results in pari-extra_3-2~dummy1_multi.changes 1024s 1024s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1024s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1024s ' 1024s + t-dgit push 1024s + local dgit=dgit 1024s + pwd 1024s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1024s + : ' 1024s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1024s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push 1024s | git rev-parse --show-toplevel 1024s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra' 1024s | git config -z --get-regexp --local '.*' 1024s | git config -z --get-regexp --local '.*' 1024s | git config -z --get-regexp --global '.*' 1024s | git config -z --get-regexp --system '.*' 1024s format , quilt mode linear 1024s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1024s warning: could not open directory 'debian/source/': No such file or directory 1024s => `' 1024s + git diff --quiet HEAD 1024s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1024s canonical suite name for unstable is sid 1024s actually entering push 1024s query: fetching http://127.0.0.1:41999/pari-extra.git/HEAD... 1024s dgit-repos check_for_git => . 1024s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 1024s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 1024s get_archive_dsc: Version 3-1 1024s last upload to archive: NO git hash 1024s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1024s => `' 1024s previous reference hash= 1024s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1024s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1024s fetch_from_archive: lastfetch=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1024s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 1024s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) linked. 1024s using existing pari-extra_3.orig.tar.gz 1024s considering saving pari-extra_3.orig.tar.gz: (File exists) no need. 1024s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) linked. 1024s using existing pari-extra_3-1.diff.gz 1024s considering saving pari-extra_3-1.diff.gz: (File exists) no need. 1024s import considering pari-extra_3.orig.tar.gz Y .gz orig 1024s + chmod -R '+rwX' _unpack-tar 1024s CD _unpack-tar 1024s | find -name .git -prune -print0 1024s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1024s + git add -Af . 1024s | git write-tree 1024s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 1024s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 1024s => `' 1024s multiple subtrees 1024s CD .. 1024s import considering pari-extra_3-1.diff.gz not tar 1024s + dpkg-source --no-check -x -- pari-extra.dsc 1024s dpkg-source: info: extracting pari-extra in pari-extra-3 1024s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 1024s dpkg-source: info: applying pari-extra_3-1.diff.gz 1024s CD pari-extra-3 1024s | find -name .git -prune -print0 1024s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1024s + git add -Af . 1024s | git write-tree 1024s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 1024s import clog search... 1024s | dpkg-parsechangelog --format rfc822 --all 1024s import clog 3-1 package changelog, entry no.1... 1024s import clog 3-1 vs 3... 1024s import clog 3-1 becomes r1 1024s import clog 2.1-1 package changelog, entry no.2... 1024s import clog 2.1-1 vs 3... 1024s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 1024s => `1312546022 +0000' 1024s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 1025s => `1312546022 +0000' 1025s import tartrees authline Bill Allombert 1312546022 +0000 1025s import tartrees r1authline Bill Allombert 1312546022 +0000 1025s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 1025s | git hash-object -w -t commit --stdin 1025s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 1025s import main commit 1025s | git hash-object -w -t commit ../commit.tmp 1025s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1025s synthesised git commit from .dsc 3-1 1025s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1025s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgitclog; exec "$@"' x git cat-file blob 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0:debian/changelog 1025s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1025s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1025s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1025s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1025s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1025s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1025s fetch mergeinfos: 1025s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 dgit client's archive history view 1025s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1025s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1025s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1025s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1025s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1025s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1025s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1025s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1025s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 1025s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 1025s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1025s + git check-ref-format archive/test-dummy/3-2_dummy1 1025s | git symbolic-ref -q HEAD 1025s => `refs/heads/dgit/sid' 1025s | git rev-parse 'HEAD~0' 1025s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 1025s ffq_prev_branchinfo branch current refs/heads/dgit/sid 1025s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/dgit/sid' 1025s => `' 1025s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/dgit/sid' 1025s => `' 1025s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1025s warning: could not open directory 'debian/source/': No such file or directory 1025s => `' 1025s + git diff --quiet HEAD 1025s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 6cfbeb52ce126ee40067fe8fa263446a79082de7 1025s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1025s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1025s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1025s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 1025s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 1025s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/3-2_dummy1' 1025s => `' 1025s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/unpack 1025s checking that pari-extra_3-2~dummy1.dsc corresponds to HEAD 1025s + dpkg-source -x -- '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc' 1025s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc) 1025s dpkg-source: info: extracting pari-extra in pari-extra-3 1025s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 1025s dpkg-source: info: applying pari-extra_3-2~dummy1.diff.gz 1025s CD pari-extra-3 1025s | find -name .git -prune -print0 1025s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1025s + git add -Af . 1025s | git write-tree 1025s => `59d0825204e6551ec6bcd704839aae32586014f4' 1025s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1025s + git diff --quiet 59d0825204e6551ec6bcd704839aae32586014f4 6cfbeb52ce126ee40067fe8fa263446a79082de7 1025s files_compare_inputs pari-extra_3-2~dummy1.dsc 1025s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 1025s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3.orig.tar.gz 1025s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 1025s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 1025s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3.orig.tar.gz 1025s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 1025s files_compare_inputs pari-extra_3-2~dummy1.dsc Files 1025s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3.orig.tar.gz 1025s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3-2~dummy1.diff.gz 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.dsc 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_all.deb 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_ppc64el.buildinfo 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.dsc 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_all.deb 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_ppc64el.buildinfo 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.dsc 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.diff.gz 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_all.deb 1025s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_ppc64el.buildinfo 1025s checking origs needed (3)... 1025s checking origs needed placement 'math optional'... 1025s origs pari-extra_3.orig.tar.gz | 76bcf03be979d3331f9051aa88439b8b 121 pari-extra_3.orig.tar.gz 1025s origs pari-extra_3.orig.tar.gz is_orig 1025s -| sh -ec 'cd "$1"; shift 1025s 1025s find -name "$1" -print0 | 1025s xargs -0r sha256sum 1025s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ pari-extra_3.orig.tar.gz 1025s | ac1ef39f9da80b582d1c0b2adfb09b041e3860ed20ddcf57a0e922e3305239df ./pool/main/pari-extra_3.orig.tar.gz 1025s origs pari-extra_3.orig.tar.gz $#$have=0 1025s origs pari-extra_3.orig.tar.gz f.same=1 #f._differ=-1 1025s origs pari-extra_3-2~dummy1.diff.gz | 53d67266a6a9646cb1d0d40722249214 2522 pari-extra_3-2~dummy1.diff.gz 1025s ../pari-extra_3-2~dummy1_multi.changes already has appropriate .orig(s) (if any) 1025s push_tagwants: $VAR1 = [ 1025s '3-2~dummy1', 1025s '6cfbeb52ce126ee40067fe8fa263446a79082de7', 1025s undef, 1025s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag' 1025s ]; 1025s $VAR2 = [ 1025s { 1025s 'View' => 'dgit', 1025s 'Tag' => 'archive/test-dummy/3-2_dummy1', 1025s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 1025s 'Tfn' => sub { "DUMMY" }, 1025s 'TagFn' => sub { "DUMMY" }, 1025s 'TfSuffix' => '' 1025s }, 1025s { 1025s 'View' => 'dgit', 1025s 'Tag' => 'test-dummy/3-2_dummy1', 1025s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 1025s 'Tfn' => sub { "DUMMY" }, 1025s 'TagFn' => sub { "DUMMY" }, 1025s 'TfSuffix' => '-dgit' 1025s } 1025s ]; 1025s | date '+%s %z' -d 'Sun, 17 Nov 2013 14:34:17 +0000' 1025s => `1384698857 +0000' 1025s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp 1025s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1025s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp.asc 1025s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp 1025s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1025s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp.asc 1025s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp 1025s => `1b3603ba6fedf7b77e0f49608e16d3c353661f69' 1025s + git verify-tag 1b3603ba6fedf7b77e0f49608e16d3c353661f69 1025s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1025s gpg: Signature made Mon Mar 31 23:04:15 2025 UTC 1025s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1025s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1025s gpg: WARNING: This key is not certified with a trusted signature! 1025s gpg: There is no indication that the signature belongs to the owner. 1025s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1025s + git update-ref refs/tags/archive/test-dummy/3-2_dummy1 1b3603ba6fedf7b77e0f49608e16d3c353661f69 1025s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp 1025s => `38a6743e603905dd1815faca212627757550d59f' 1025s + git verify-tag 38a6743e603905dd1815faca212627757550d59f 1025s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1025s gpg: Signature made Mon Mar 31 23:04:15 2025 UTC 1025s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1025s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1025s gpg: WARNING: This key is not certified with a trusted signature! 1025s gpg: There is no indication that the signature belongs to the owner. 1025s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1025s + git update-ref refs/tags/test-dummy/3-2_dummy1 38a6743e603905dd1815faca212627757550d59f 1025s query: fetching http://127.0.0.1:41999/pari-extra.git/HEAD... 1025s dgit-repos check_for_git => . 1025s + git -c push.followTags=false push 'ext::/tmp/autopkgtest.XK8uun/build.980/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 1025s (((((((((((((((((((((((((((((((((((((((( 1025s + tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1025s + cd / 1025s + userhost=X 1025s + shift 1025s + export SSH_ORIGINAL_COMMAND=git-receive-pack /dgit/test-dummy/repos/pari-extra.git 1025s + unset PERLLIB 1025s + dgit-ssh-dispatch -D /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1025s DISPATCH DIVERT ^no-such-package.*$ drs 1025s DISPATCH DISTRO test-dummy PKG pari-extra 1025s warning: You appear to have cloned an empty repository. 1025s remote: gpgv: Signature made Mon Mar 31 23:04:15 2025 UTC 1025s remote: gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1025s remote: gpgv: Good signature from "Senatus Romanus (test key) " 1025s remote: To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/repos/_tmp/pari-extra_prospective 1025s remote: * [new reference] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> refs/dgit/sid 1025s remote: * [new tag] 1b3603ba6fedf7b77e0f49608e16d3c353661f69 -> archive/test-dummy/3-2_dummy1 1025s remote: * [new tag] 38a6743e603905dd1815faca212627757550d59f -> test-dummy/3-2_dummy1 1025s remote: To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/distro=test-dummy/repos/_tmp/pari-extra_prospective 1025s remote: * [new branch] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> master 1025s + : )))))))))))))))))))))))))))))))))))))))) 1025s To ext::/tmp/autopkgtest.XK8uun/build.980/src/tests/dsd-ssh X %S /dgit/test-dummy/repos/pari-extra.git 1025s * [new reference] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> refs/dgit/sid 1025s * [new tag] archive/test-dummy/3-2_dummy1 -> archive/test-dummy/3-2_dummy1 1025s * [new tag] test-dummy/3-2_dummy1 -> test-dummy/3-2_dummy1 1025s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1025s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A '../pari-extra_3-2~dummy1_multi.changes' 1025s signfile dsc ../pari-extra_3-2~dummy1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1026s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1026s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1026s 1026s signfile buildinfo ../pari-extra_3-2~dummy1_ppc64el.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1026s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1026s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1026s 1026s fixup_changes dsc ../pari-extra_3-2~dummy1.dsc ../pari-extra_3-2~dummy1_multi.changes 1026s fixup_changes buildinfo ../pari-extra_3-2~dummy1_ppc64el.buildinfo ../pari-extra_3-2~dummy1_multi.changes 1026s signfile changes ../pari-extra_3-2~dummy1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1026s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1026s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1026s 1026s Successfully signed dsc, buildinfo, changes files 1026s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy '../pari-extra_3-2~dummy1_multi.changes' 1026s gpg: ../pari-extra_3-2~dummy1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1026s gpg: ../pari-extra_3-2~dummy1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1026s D: Setting host argument. 1026s Checking signature on .changes 1026s Checking signature on .dsc 1026s Uploading to test-dummy (via local to localhost): 1026s Successfully uploaded packages. 1026s dgit ok: pushed and uploaded 3-2~dummy1 1026s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1026s del_lrfetchrefs... 1026s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1026s ' 1026s + t-pushed-good dgit/sid 1026s + local branch=dgit/sid 1026s + local suite=sid 1026s + t-refs-same refs/heads/dgit/sid 1026s + local g 1026s + for g in $* 1026s + t-ref-same refs/heads/dgit/sid 1026s + local name=refs/heads/dgit/sid 1026s + local val 1026s ++ t-git-get-ref refs/heads/dgit/sid 1026s ++ local ref=refs/heads/dgit/sid 1026s ++ case "$ref" in 1026s ++ perl -ne ' 1026s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 1026s END { print "$x\n" if length $x; } 1026s ' 1026s ++ git show-ref -d refs/heads/dgit/sid 1026s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t-ref-same-val refs/heads/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + local name=refs/heads/dgit/sid 1026s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + case "${t_ref_val-unset}" in 1026s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t_ref_names+=("$name") 1026s + t-pushed-good-core 1026s + t-ref-dsc-dgit 1026s + t-incoming-dsc 1026s + local dsc=pari-extra_3-2~dummy1.dsc 1026s + incoming_dsc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 1026s + local val 1026s ++ t-822-field /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit 1026s ++ local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 1026s ++ local field=Dgit 1026s ++ perl -e ' 1026s use Dpkg::Control::Hash; 1026s my $h = new Dpkg::Control::Hash allow_pgp=>1; 1026s $h->parse(\*STDIN,"/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc"); 1026s my $val = $h->{"Dgit"},"\n"; 1026s die "/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit" unless defined $val; 1026s print $val,"\n"; 1026s ' 1026s + val='6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 ext::/tmp/autopkgtest.XK8uun/build.980/src/tests/dsd-ssh X %S /dgit/test-dummy/repos/pari-extra.git' 1026s ++ perl -e ' 1026s $_=shift @ARGV; 1026s die "Dgit $_ ?" unless m/^\w+\b/; 1026s print $&,"\n" or die $!; 1026s ' '6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 ext::/tmp/autopkgtest.XK8uun/build.980/src/tests/dsd-ssh X %S /dgit/test-dummy/repos/pari-extra.git' 1026s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t-ref-same-val /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + local name=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 1026s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + case "${t_ref_val-unset}" in 1026s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t_ref_names+=("$name") 1026s ++ t-v-tag 1026s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 1026s + t-refs-same refs/tags/archive/test-dummy/3-2_dummy1 refs/remotes/dgit/dgit/sid 1026s + local g 1026s + for g in $* 1026s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 1026s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1026s + local val 1026s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 1026s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 1026s ++ case "$ref" in 1026s ++ perl -ne ' 1026s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 1026s END { print "$x\n" if length $x; } 1026s ' 1026s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 1026s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1026s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + case "${t_ref_val-unset}" in 1026s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t_ref_names+=("$name") 1026s + for g in $* 1026s + t-ref-same refs/remotes/dgit/dgit/sid 1026s + local name=refs/remotes/dgit/dgit/sid 1026s + local val 1026s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 1026s ++ local ref=refs/remotes/dgit/dgit/sid 1026s ++ case "$ref" in 1026s ++ perl -ne ' 1026s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 1026s END { print "$x\n" if length $x; } 1026s ' 1026s ++ git show-ref -d refs/remotes/dgit/dgit/sid 1026s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t-ref-same-val refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + local name=refs/remotes/dgit/dgit/sid 1026s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + case "${t_ref_val-unset}" in 1026s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t_ref_names+=("$name") 1026s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 1026s + local val 1026s + for g in $* 1026s ++ t-git-get-ref refs/heads/dgit/unstable 1026s ++ local ref=refs/heads/dgit/unstable 1026s ++ case "$ref" in 1026s ++ perl -ne ' 1026s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 1026s END { print "$x\n" if length $x; } 1026s ' 1026s ++ git show-ref -d refs/heads/dgit/unstable 1026s ++ test 1 = 1 1026s + val= 1026s + '[' x '!=' x ']' 1026s + for g in $* 1026s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 1026s ++ local ref=refs/remotes/dgit/dgit/unstable 1026s ++ case "$ref" in 1026s ++ perl -ne ' 1026s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 1026s END { print "$x\n" if length $x; } 1026s ' 1026s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 1026s ++ test 1 = 1 1026s + val= 1026s + '[' x '!=' x ']' 1026s + set -e 1026s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 1026s ++ t-v-tag 1026s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 1026s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/3-2_dummy1 1026s + local g 1026s + for g in $* 1026s + t-ref-same refs/dgit/sid 1026s + local name=refs/dgit/sid 1026s + local val 1026s ++ t-git-get-ref refs/dgit/sid 1026s ++ local ref=refs/dgit/sid 1026s ++ case "$ref" in 1026s ++ git show-ref -d refs/dgit/sid 1026s ++ perl -ne ' 1026s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 1026s END { print "$x\n" if length $x; } 1026s ' 1026s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t-ref-same-val refs/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + local name=refs/dgit/sid 1026s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + case "${t_ref_val-unset}" in 1026s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t_ref_names+=("$name") 1026s + for g in $* 1026s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 1026s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1026s + local val 1026s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 1026s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 1026s ++ case "$ref" in 1026s ++ perl -ne ' 1026s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 1026s END { print "$x\n" if length $x; } 1026s ' 1026s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 1026s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + local name=refs/tags/archive/test-dummy/3-2_dummy1 1026s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + case "${t_ref_val-unset}" in 1026s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + t_ref_names+=("$name") 1026s + t-check-pushed-master 1026s + local master 1026s ++ t-git-get-ref refs/heads/master 1026s ++ local ref=refs/heads/master 1026s ++ case "$ref" in 1026s ++ git show-ref -d refs/heads/master 1026s ++ perl -ne ' 1026s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 1026s END { print "$x\n" if length $x; } 1026s ' 1026s + master=6cfbeb52ce126ee40067fe8fa263446a79082de7 1026s + '[' x6cfbeb52ce126ee40067fe8fa263446a79082de7 = x6cfbeb52ce126ee40067fe8fa263446a79082de7 ']' 1026s + return 1026s + t-refs-notexist refs/dgit/unstable 1026s + local val 1026s + for g in $* 1026s ++ t-git-get-ref refs/dgit/unstable 1026s ++ local ref=refs/dgit/unstable 1026s ++ case "$ref" in 1026s ++ git show-ref -d refs/dgit/unstable 1026s ++ perl -ne ' 1026s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 1026s END { print "$x\n" if length $x; } 1026s ' 1026s ++ test 1 = 1 1026s + val= 1026s + '[' x '!=' x ']' 1026s ++ t-v-tag 1026s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 1026s + git verify-tag refs/tags/archive/test-dummy/3-2_dummy1 1026s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1026s gpg: Signature made Mon Mar 31 23:04:15 2025 UTC 1026s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1026s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1026s gpg: WARNING: This key is not certified with a trusted signature! 1026s gpg: There is no indication that the signature belongs to the owner. 1026s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1026s + t-ok 1026s + : ======================================== 1026s + t-check-only-bpd 1026s + '[' .. = .. ']' 1026s + return 1026s + t-fscks 1026s + shopt -s nullglob 1026s + for d in $tmp/*/.git $tmp/git/*.git 1026s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1026s + t-git-fsck 1026s ++ git rev-parse --git-dir 1026s + local fsckerrs=.git/dgit-test-fsck.errs 1026s + set +e 1026s + LC_MESSAGES=C 1026s + git fsck --no-dangling --strict 1026s + tee .git/dgit-test-fsck.errs 1026s + ps='0 0' 1026s + set -e 1026s + local pats 1026s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1026s + test '0 0' = '0 0' 1026s + pats+=(-e 'notice: HEAD points to an unborn branch') 1026s + pats+=(-e 'notice: No default references') 1026s + set +e 1026s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1026s + rc=1 1026s + set -e 1026s + case $rc in 1026s + for d in $tmp/*/.git $tmp/git/*.git 1026s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/pari-extra.git 1026s + t-git-fsck 1026s ++ git rev-parse --git-dir 1026s + local fsckerrs=./dgit-test-fsck.errs 1026s + set +e 1026s + LC_MESSAGES=C 1026s + git fsck --no-dangling --strict 1026s + tee ./dgit-test-fsck.errs 1026s + ps='0 0' 1026s + set -e 1026s + local pats 1026s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1026s + test '0 0' = '0 0' 1026s + pats+=(-e 'notice: HEAD points to an unborn branch') 1026s + pats+=(-e 'notice: No default references') 1026s + set +e 1026s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1026s + rc=1 1026s + set -e 1026s + case $rc in 1026s + t-save-artifacts 1026s + artifacts=/tmp/autopkgtest.XK8uun/dsd-clone-nogit-artifacts 1026s + '[' x/tmp/autopkgtest.XK8uun/dsd-clone-nogit-artifacts = x ']' 1026s + '[' xtmp = x ']' 1026s + GZIP=-1v 1026s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/dsd-clone-nogit-artifacts/clone-nogit.tar.gz '--exclude=*.tar' . 1026s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1026s /tmp/autopkgtest.XK8uun/wrapper.sh: Killing leaked background processes: 13124 1026s PID TTY STAT TIME COMMAND 1026s 13124 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1026s 74.5% 1026s + echo ok. 1026s ok. 1026s + rc=0 1026s + set +x 1026s + set +e 1026s + pwd 1026s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/pari-extra 1026s + '[' x '!=' x ']' 1026s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1026s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1026s + set -e 1026s + test 0 = 0 1027s autopkgtest [23:04:17]: test dsd-clone-nogit: -----------------------] 1027s autopkgtest [23:04:17]: test dsd-clone-nogit: - - - - - - - - - - results - - - - - - - - - - 1027s dsd-clone-nogit PASS 1028s autopkgtest [23:04:18]: test ftpmasterapi-http: preparing testbed 1029s Reading package lists... 1029s Building dependency tree... 1029s Reading state information... 1029s Starting pkgProblemResolver with broken count: 0 1029s Starting 2 pkgProblemResolver with broken count: 0 1029s Done 1029s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1030s autopkgtest [23:04:20]: test ftpmasterapi-http: [----------------------- 1030s ++ set -o pipefail 1030s ++ . tests/lib-core 1030s ++ . tests/lib-restricts 1030s ++ trap ' 1030s rc=$? 1030s set +x 1030s test $rc = 0 || echo " 1030s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1030s 1030s Most relevant logs are just before assignment rc=$rc 1030s Will now do cleanup etc. 1030s " 1030s set -x 1030s set +e 1030s pwd 1030s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1030s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1030s set -e 1030s test $rc = 0 || t-report-failure 1030s ' EXIT 1030s ++ t-filter-out-git-hyphen-dir 1030s ++ local pathent 1030s +++ type -p git-rev-parse 1030s +++ : 1030s ++ pathent= 1030s ++ case "$pathent" in 1030s ++ return 1030s ++ t-set-intree 1030s ++ '[' x = x ']' 1030s ++ return 1030s ++ : -D 1030s ++ export DGIT_TEST_DEBUG 1030s ++ : x 1030s ++ export DGIT_TEST_DEBPUSH_DEBUG 1030s ++ : 1030s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1030s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1030s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1030s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1030s ++ export LC_CTYPE=C.UTF-8 1030s ++ LC_CTYPE=C.UTF-8 1030s ++ unset CDPATH 1030s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1030s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1030s +++ pwd 1030s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1030s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1030s ++ testname=ftpmasterapi-http 1030s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1030s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1030s ++ bpd=.. 1030s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1030s ++ '[' x '!=' x ']' 1030s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s +++ pwd 1030s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ t-set-using-tmp 1030s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1030s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1030s ++ export 'DEBFULLNAME=dgit test git user' 1030s ++ DEBFULLNAME='dgit test git user' 1030s ++ git config --global user.email dgit-test@debian.example.net 1030s ++ git config --global user.name 'dgit test git user' 1030s ++ git config --global protocol.ext.allow always 1030s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1030s ++ env -0 1030s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1030s ++ export DEBCHANGE_VENDOR=dpkg 1030s ++ DEBCHANGE_VENDOR=dpkg 1030s ++ unset VISUAL 1030s ++ unset GIT_EDITOR 1030s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1030s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1030s ++ cat 1030s ++ schroot=build 1030s ++ : aq 1030s ++ : archive/test-dummy 1030s ++ : sid:unstable 1030s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1030s ++ git config --global dgit.default.old-dsc-distro test-dummy 1030s ++ for import in ${autoimport-gnupg} 1030s ++ case "$0" in 1030s ++ t-setup-import gnupg 1030s ++ local setupname=gnupg 1030s ++ local setupsrc 1030s ++ local lock 1030s ++ '[' x = x ']' 1030s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1030s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1030s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1030s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1030s cd "$1"; shift 1030s setupname="$1"; shift 1030s simport="$1"; shift 1030s if [ -e "$simport" ]; then exit 0; fi 1030s env - "$@" \ 1030s "tests/setup/$setupname" 1030s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1030s + cd /tmp/autopkgtest.XK8uun/build.980/src 1030s + shift 1030s + setupname=gnupg 1030s + shift 1030s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1030s + shift 1030s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1030s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/ftpmasterapi-http-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/ftpmasterapi-http-stderr --stdout=/tmp/autopkgtest.XK8uun/ftpmasterapi-http-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/ftpmasterapi-http -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/ftpmasterapi-http' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/ftpmasterapi-http-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1030s ++ set -o pipefail 1030s ++ . tests/lib-core 1030s ++ . tests/lib-restricts 1030s ++ trap ' 1030s rc=$? 1030s set +x 1030s test $rc = 0 || echo " 1030s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1030s 1030s Most relevant logs are just before assignment rc=$rc 1030s Will now do cleanup etc. 1030s " 1030s set -x 1030s set +e 1030s pwd 1030s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1030s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1030s set -e 1030s test $rc = 0 || t-report-failure 1030s ' EXIT 1030s ++ t-filter-out-git-hyphen-dir 1030s ++ local pathent 1030s +++ type -p git-rev-parse 1030s +++ : 1030s ++ pathent= 1030s ++ case "$pathent" in 1030s ++ return 1030s ++ t-set-intree 1030s ++ '[' x = x ']' 1030s ++ return 1030s ++ : -D 1030s ++ export DGIT_TEST_DEBUG 1030s ++ : x 1030s ++ export DGIT_TEST_DEBPUSH_DEBUG 1030s ++ : 1030s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1030s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1030s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1030s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1030s ++ export LC_CTYPE=C.UTF-8 1030s ++ LC_CTYPE=C.UTF-8 1030s ++ unset CDPATH 1030s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1030s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1030s +++ pwd 1030s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1030s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1030s ++ testname=gnupg 1030s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1030s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1030s ++ bpd=.. 1030s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1030s ++ '[' x '!=' x ']' 1030s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s +++ pwd 1030s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ t-set-using-tmp 1030s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1030s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1030s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1030s ++ export 'DEBFULLNAME=dgit test git user' 1030s ++ DEBFULLNAME='dgit test git user' 1030s ++ git config --global user.email dgit-test@debian.example.net 1030s ++ git config --global user.name 'dgit test git user' 1030s ++ git config --global protocol.ext.allow always 1030s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1030s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1030s ++ export DEBCHANGE_VENDOR=dpkg 1030s ++ DEBCHANGE_VENDOR=dpkg 1030s ++ unset VISUAL 1030s ++ unset GIT_EDITOR 1030s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1030s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1030s ++ cat 1030s ++ schroot=build 1030s ++ : aq 1030s ++ : archive/test-dummy 1030s ++ : sid:unstable 1030s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1030s ++ git config --global dgit.default.old-dsc-distro test-dummy 1030s ++ for import in ${autoimport-gnupg} 1030s ++ case "$0" in 1030s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1030s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1030s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1030s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1030s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1030s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1030s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1030s + setup=' 1030s export GNUPGHOME=$tmp/gnupg 1030s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1030s 1030s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1030s ssb rsa2048 2013-11-17 [E] 1030s 1030s sec rsa2048 2014-01-26 [SC] 1030s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1030s uid [ultimate] Populus Romanus (test key) 1030s ssb rsa2048 2014-01-26 [E] 1030s 1030s sec rsa2048 2014-01-26 [SC] 1030s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1030s uid [ unknown] Hannibal (test key) 1030s ssb rsa2048 2014-01-26 [E] 1030s 1030s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1030s export GNUPGHOME=$tmp/gnupg 1030s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1030s 1030s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 1030s "sha256sum" => "$2", 1030s "component" => "$3", 1030s "filename" => "$4", 1030s }; 1030s END { 1030s my $json = JSON->new->canonical(); 1030s print $json->encode(\@v) or die $!; 1030s } 1030s ' 1030s + t-aq-archive-updated new example 1030s + local suite=new 1030s + local p=example 1030s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1030s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1030s + perl -wne ' 1030s use JSON; 1030s use strict; 1030s our @v; 1030s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1030s push @v, { 1030s "version" => "$1", 1030s "sha256sum" => "$2", 1030s "component" => "$3", 1030s "filename" => "$4", 1030s }; 1030s END { 1030s my $json = JSON->new->canonical(); 1030s print $json->encode(\@v) or die $!; 1030s } 1030s ' 1030s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1030s + cat 1030s + jsondelim=' },' 1030s + cat 1030s + t-dependencies libhttp-server-simple-static-perl 1030s + : 'Hopefully installed: libhttp-server-simple-static-perl' 1030s + /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq 1031s + read api_port 1031s + t-git-config --global dgit-distro.test-dummy.archive-query ftpmasterapi: 1031s + git config --global --global dgit-distro.test-dummy.archive-query ftpmasterapi: 1031s + t-git-config --global dgit-distro.test-dummy.archive-query-url http://127.0.0.1:41611/ 1031s + git config --global --global dgit-distro.test-dummy.archive-query-url http://127.0.0.1:41611/ 1031s + t-dgit archive-api-query suites 1031s + local dgit=dgit 1031s + pwd 1031s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1031s + : ' 1031s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1031s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A archive-api-query suites 1031s | git config -z --get-regexp --global '.*' 1031s | git config -z --get-regexp --system '.*' 1031s query: fetching http://127.0.0.1:41611/suites... 1031s [ 1031s { 1031s "archive" : "ftp-master", 1031s "codename" : "sid", 1031s "components" : [ 1031s "main", 1031s "contrib", 1031s "non-free" 1031s ], 1031s "name" : "unstable", 1031s "dakname" : "unstable" 1031s } 1031s ] 1031s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1031s ' 1031s + t-ok 1031s + : ======================================== 1031s + t-check-only-bpd 1031s + '[' .. = .. ']' 1031s + return 1031s + t-fscks 1031s + shopt -s nullglob 1031s + t-save-artifacts 1031s + artifacts=/tmp/autopkgtest.XK8uun/ftpmasterapi-http-artifacts 1031s + '[' x/tmp/autopkgtest.XK8uun/ftpmasterapi-http-artifacts = x ']' 1031s + '[' xtmp = x ']' 1031s + GZIP=-1v 1031s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/ftpmasterapi-http-artifacts/ftpmasterapi-http.tar.gz '--exclude=*.tar' . 1031s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1031s 72.5% 1031s + echo ok. 1031s ok. 1031s + rc=0 1031s + set +x 1031s + set +e 1031s + pwd 1031s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1031s + '[' x '!=' x ']' 1031s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1031s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1031s + set -e 1031s + test 0 = 0 1031s /tmp/autopkgtest.XK8uun/wrapper.sh: Killing leaked background processes: 14881 1031s PID TTY STAT TIME COMMAND 1031s 14881 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq 1031s autopkgtest [23:04:21]: test ftpmasterapi-http: -----------------------] 1032s autopkgtest [23:04:22]: test ftpmasterapi-http: - - - - - - - - - - results - - - - - - - - - - 1032s ftpmasterapi-http PASS 1032s autopkgtest [23:04:22]: test gdr-import-dgit: preparing testbed 1032s Reading package lists... 1033s Building dependency tree... 1033s Reading state information... 1033s Starting pkgProblemResolver with broken count: 0 1033s Starting 2 pkgProblemResolver with broken count: 0 1033s Done 1033s The following NEW packages will be installed: 1033s git-debrebase libfile-fnmatch-perl 1033s 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. 1033s Need to get 77.9 kB of archives. 1033s After this operation, 396 kB of additional disk space will be used. 1033s Get:1 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfile-fnmatch-perl ppc64el 0.02-2build8 [10.5 kB] 1033s Get:2 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-debrebase all 9.15 [67.5 kB] 1034s Fetched 77.9 kB in 0s (198 kB/s) 1034s Selecting previously unselected package libfile-fnmatch-perl. 1034s (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 ... 108167 files and directories currently installed.) 1034s Preparing to unpack .../libfile-fnmatch-perl_0.02-2build8_ppc64el.deb ... 1034s Unpacking libfile-fnmatch-perl (0.02-2build8) ... 1034s Selecting previously unselected package git-debrebase. 1034s Preparing to unpack .../git-debrebase_9.15_all.deb ... 1034s Unpacking git-debrebase (9.15) ... 1034s Setting up libfile-fnmatch-perl (0.02-2build8) ... 1034s Setting up git-debrebase (9.15) ... 1034s Processing triggers for man-db (2.10.2-1) ... 1035s autopkgtest [23:04:25]: test gdr-import-dgit: [----------------------- 1035s ++ set -o pipefail 1035s ++ . tests/lib-core 1035s ++ . tests/lib-restricts 1035s ++ trap ' 1035s rc=$? 1035s set +x 1035s test $rc = 0 || echo " 1035s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1035s 1035s Most relevant logs are just before assignment rc=$rc 1035s Will now do cleanup etc. 1035s " 1035s set -x 1035s set +e 1035s pwd 1035s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1035s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1035s set -e 1035s test $rc = 0 || t-report-failure 1035s ' EXIT 1035s ++ t-filter-out-git-hyphen-dir 1035s ++ local pathent 1035s +++ type -p git-rev-parse 1035s +++ : 1035s ++ pathent= 1035s ++ case "$pathent" in 1035s ++ return 1035s ++ t-set-intree 1035s ++ '[' x = x ']' 1035s ++ return 1035s ++ : -D 1035s ++ export DGIT_TEST_DEBUG 1035s ++ : x 1035s ++ export DGIT_TEST_DEBPUSH_DEBUG 1035s ++ : 1035s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1035s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1035s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1035s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1035s ++ export LC_CTYPE=C.UTF-8 1035s ++ LC_CTYPE=C.UTF-8 1035s ++ unset CDPATH 1035s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1035s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1035s +++ pwd 1035s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1035s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1035s ++ testname=gdr-import-dgit 1035s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1035s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1035s ++ bpd=.. 1035s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1035s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1035s ++ '[' x '!=' x ']' 1035s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1035s +++ pwd 1035s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1035s ++ t-set-using-tmp 1035s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1035s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1035s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1035s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1035s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1035s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1035s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1035s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1035s ++ export 'DEBFULLNAME=dgit test git user' 1035s ++ DEBFULLNAME='dgit test git user' 1035s ++ git config --global user.email dgit-test@debian.example.net 1035s ++ git config --global user.name 'dgit test git user' 1035s ++ git config --global protocol.ext.allow always 1035s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1035s ++ env -0 1035s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1035s ++ export DEBCHANGE_VENDOR=dpkg 1035s ++ DEBCHANGE_VENDOR=dpkg 1035s ++ unset VISUAL 1035s ++ unset GIT_EDITOR 1035s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1035s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1035s ++ cat 1035s ++ schroot=build 1035s ++ : aq 1035s ++ : archive/test-dummy 1035s ++ : sid:unstable 1035s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1035s ++ git config --global dgit.default.old-dsc-distro test-dummy 1035s ++ for import in ${autoimport-gnupg} 1035s ++ case "$0" in 1035s ++ t-setup-import gnupg 1035s ++ local setupname=gnupg 1035s ++ local setupsrc 1035s ++ local lock 1035s ++ '[' x = x ']' 1035s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1035s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1035s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1035s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1035s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1035s cd "$1"; shift 1035s setupname="$1"; shift 1035s simport="$1"; shift 1035s if [ -e "$simport" ]; then exit 0; fi 1035s env - "$@" \ 1035s "tests/setup/$setupname" 1035s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1035s + cd /tmp/autopkgtest.XK8uun/build.980/src 1035s + shift 1035s + setupname=gnupg 1035s + shift 1035s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1035s + shift 1035s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1035s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-import-dgit-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-import-dgit-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-import-dgit-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-import-dgit -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-import-dgit' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-import-dgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1035s ++ set -o pipefail 1035s ++ . tests/lib-core 1036s ++ . tests/lib-restricts 1036s ++ trap ' 1036s rc=$? 1036s set +x 1036s test $rc = 0 || echo " 1036s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1036s 1036s Most relevant logs are just before assignment rc=$rc 1036s Will now do cleanup etc. 1036s " 1036s set -x 1036s set +e 1036s pwd 1036s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1036s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1036s set -e 1036s test $rc = 0 || t-report-failure 1036s ' EXIT 1036s ++ t-filter-out-git-hyphen-dir 1036s ++ local pathent 1036s +++ type -p git-rev-parse 1036s +++ : 1036s ++ pathent= 1036s ++ case "$pathent" in 1036s ++ return 1036s ++ t-set-intree 1036s ++ '[' x = x ']' 1036s ++ return 1036s ++ : -D 1036s ++ export DGIT_TEST_DEBUG 1036s ++ : x 1036s ++ export DGIT_TEST_DEBPUSH_DEBUG 1036s ++ : 1036s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1036s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1036s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1036s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1036s ++ export LC_CTYPE=C.UTF-8 1036s ++ LC_CTYPE=C.UTF-8 1036s ++ unset CDPATH 1036s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1036s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1036s +++ pwd 1036s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1036s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1036s ++ testname=gnupg 1036s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1036s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1036s ++ bpd=.. 1036s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1036s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1036s ++ '[' x '!=' x ']' 1036s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1036s +++ pwd 1036s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1036s ++ t-set-using-tmp 1036s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1036s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1036s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1036s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1036s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1036s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1036s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1036s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1036s ++ export 'DEBFULLNAME=dgit test git user' 1036s ++ DEBFULLNAME='dgit test git user' 1036s ++ git config --global user.email dgit-test@debian.example.net 1036s ++ git config --global user.name 'dgit test git user' 1036s ++ git config --global protocol.ext.allow always 1036s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1036s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1036s ++ export DEBCHANGE_VENDOR=dpkg 1036s ++ DEBCHANGE_VENDOR=dpkg 1036s ++ unset VISUAL 1036s ++ unset GIT_EDITOR 1036s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1036s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1036s ++ cat 1036s ++ schroot=build 1036s ++ : aq 1036s ++ : archive/test-dummy 1036s ++ : sid:unstable 1036s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1036s ++ git config --global dgit.default.old-dsc-distro test-dummy 1036s ++ for import in ${autoimport-gnupg} 1036s ++ case "$0" in 1036s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1036s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1036s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1036s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1036s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1036s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1036s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1036s + setup=' 1036s export GNUPGHOME=$tmp/gnupg 1036s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1036s 1036s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1036s ssb rsa2048 2013-11-17 [E] 1036s 1036s sec rsa2048 2014-01-26 [SC] 1036s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1036s uid [ultimate] Populus Romanus (test key) 1036s ssb rsa2048 2014-01-26 [E] 1036s 1036s sec rsa2048 2014-01-26 [SC] 1036s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1036s uid [ unknown] Hannibal (test key) 1036s ssb rsa2048 2014-01-26 [E] 1036s 1036s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1036s export GNUPGHOME=$tmp/gnupg 1036s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1036s 1036s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 1036s delete mode 100644 debian/source/format 1036s + git tag v1.0 1036s + : 'fake up that our quilt-tip was descended from upstream' 1036s + git checkout quilt-tip 1036s Switched to branch 'quilt-tip' 1036s + git merge --no-edit -s ours upstream 1036s Merge made by the 'ours' strategy. 1036s + : 'fake up that our quilt-tip had the patch queue in it' 1036s + git checkout patch-queue/quilt-tip 1036s Switched to branch 'patch-queue/quilt-tip' 1036s + gbp pq export 1036s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1036s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1036s + git add debian/patches 1036s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 1036s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 1036s 4 files changed, 50 insertions(+) 1036s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1036s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1036s create mode 100644 debian/patches/series 1036s create mode 100644 debian/patches/subdir/addnewups 1036s + : 'make branch names more conventional' 1036s + git branch -D master 1036s Deleted branch master (was 17d67db). 1036s + git branch -m quilt-tip master 1036s + not-gdr-processable origin 1036s + git branch gdr-unprocessable/origin 1036s + t-git-debrebase analyse 1036s + local gdr=git-debrebase 1036s + : ' 1036s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1036s + grep 'Unknown Unprocessable' 1036s + git-debrebase --dgit=dgit -D analyse 1036s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 1036s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1036s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1036s git-debrebase = AddPatches {"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Type" => "AddPatches","Parents" => [{"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0}],"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","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"} 1036s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1036s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1036s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1036s git-debrebase = Pseudomerge {"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Overwritten" => [{"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","Msg" => "Merge branch 'upstream' into quilt-tip\n","Parents" => [{"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0},$VAR1->{"Overwritten"}[0]],"Type" => "Pseudomerge","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Contributor" => $VAR1->{"Parents"}[0]} 1036s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1036s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1036s git-debrebase = Upstream {"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0}],"Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n"} 1036s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1036s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1036s git-debrebase = Mixed {"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","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","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Type" => "Mixed","Parents" => [{"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50}]} 1036s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1036s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1036s 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","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0,"Differs" => 32}],"Type" => "Packaging"} 1036s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1036s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1036s git-debrebase = Packaging {"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Msg" => "WIP\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 1036s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1036s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1036s git-debrebase = Packaging {"Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Msg" => "WIP\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"} 1036s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1036s git-debrebase ** Unknown 1036s git-debrebase *** WALK BOMB unrecognised 1036s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1036s ' 1036s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1036s + : 'fake up an upstream 2.0' 1036s + git branch make-upstream upstream 1036s + t-make-new-upstream-tarball 2.0 1036s + local uv=2.0 1036s + git checkout make-upstream 1036s Switched to branch 'make-upstream' 1036s + echo 'upstream 2.0' 1036s + git commit -a -m 'upstream 2.0 tarball' 1036s [make-upstream 4db56a8] upstream 2.0 tarball 1036s 1 file changed, 1 insertion(+) 1036s + t-make-orig example 2.0 make-upstream 1036s + local p=example 1036s + local v=2.0 1036s + local tag=make-upstream 1036s + ust=example_2.0.orig.tar.gz 1036s + GZIP=-1 1036s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1036s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1036s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1036s + git branch -D quilt-tip-2 1036s Deleted branch quilt-tip-2 (was 99fcab4). 1036s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1036s + git branch -D gitish-only 1036s Deleted branch gitish-only (was 2b2ddc8). 1036s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1036s + git branch -D quilt-tip-1.1 1036s Deleted branch quilt-tip-1.1 (was 7fc34be). 1036s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1036s + git branch -D patch-queue/quilt-tip 1036s Deleted branch patch-queue/quilt-tip (was d843a68). 1036s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1036s + git branch -D indep-arch 1036s Deleted branch indep-arch (was e215729). 1036s + : 'see what gbp import-orig does' 1036s + git checkout master 1036s Switched to branch 'master' 1036s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1036s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1036s gbp:info: Source package is example 1036s gbp:info: Upstream version is 2.0 1036s gbp:info: Replacing upstream source on 'master' 1036s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1036s + not-gdr-processable merge 1036s + git branch gdr-unprocessable/merge 1036s + t-git-debrebase analyse 1036s + local gdr=git-debrebase 1036s + : ' 1036s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1036s + grep 'Unknown Unprocessable' 1036s + git-debrebase --dgit=dgit -D analyse 1036s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 1036s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1037s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1037s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1037s git-debrebase ** Unknown 1037s git-debrebase *** WALK BOMB unrecognised 1037s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1037s ' 1037s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 1037s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1037s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1037s + DEBEMAIL=dgit-tests@example.org 1037s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1037s + 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) 1037s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1037s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1037s 1 file changed, 6 insertions(+) 1037s + t-dch-commit-r 1037s + t-dch-r-rune t-dch-commit 1037s + local cmd=t-dch-commit 1037s + shift 1037s + local suite=unstable 1037s + t-dch-commit -r -D unstable '' 1037s + t-debchange -r -D unstable '' 1037s + DEBEMAIL=dgit-tests@example.org 1037s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1037s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1037s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1037s libdistro-info-perl is not installed, Debian release names are not known. 1037s libdistro-info-perl is not installed, Ubuntu release names are not known. 1037s + git commit -m 'dch -r -D unstable ' debian/changelog 1037s [master f31021f] dch -r -D unstable 1037s 1 file changed, 3 insertions(+), 2 deletions(-) 1037s + echo garbage 1037s + git add debian/patches/garbage 1037s + git commit -m 'add garbage' debian/patches/garbage 1037s [master eb10718] add garbage 1037s 1 file changed, 1 insertion(+) 1037s create mode 100644 debian/patches/garbage 1037s + t-archive-none example 1037s + t-select-package example 1037s + p=example 1037s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1037s + t-archive-none-aq 1037s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 1037s + : 1037s + local 'jsondelim=[' 1037s + local suitespec 1037s + for suitespec in $suitespecs 1037s + local suite=sid 1037s + local sname=unstable 1037s + t-aq-archive-updated sid example 1037s + local suite=sid 1037s + local p=example 1037s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1037s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1037s + perl -wne ' 1037s use JSON; 1037s use strict; 1037s our @v; 1037s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1037s push @v, { 1037s "version" => "$1", 1037s "sha256sum" => "$2", 1037s "component" => "$3", 1037s "filename" => "$4", 1037s }; 1037s END { 1037s my $json = JSON->new->canonical(); 1037s print $json->encode(\@v) or die $!; 1037s } 1037s ' 1037s + t-aq-archive-updated new example 1037s + local suite=new 1037s + local p=example 1037s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1037s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1037s + perl -wne ' 1037s use JSON; 1037s use strict; 1037s our @v; 1037s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1037s push @v, { 1037s "version" => "$1", 1037s "sha256sum" => "$2", 1037s "component" => "$3", 1037s "filename" => "$4", 1037s }; 1037s END { 1037s my $json = JSON->new->canonical(); 1037s print $json->encode(\@v) or die $!; 1037s } 1037s ' 1037s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1037s + cat 1037s + jsondelim=' },' 1037s + cat 1037s + t-git-none 1037s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1037s + set -e 1037s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1037s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1037s + t-dgit -wgf --gbp push-source --new 1037s + local dgit=dgit 1037s + pwd 1037s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1037s + : ' 1037s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1037s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 1037s | git rev-parse --show-toplevel 1037s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1037s | git config -z --get-regexp --local '.*' 1037s | git config -z --get-regexp --local '.*' 1037s | git config -z --get-regexp --global '.*' 1037s | git config -z --get-regexp --system '.*' 1037s format 3.0 (quilt), quilt mode gbp 1037s Format `3.0 (quilt)', need to check/update patch stack 1037s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1037s => `' 1037s + git diff --quiet HEAD 1037s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1037s canonical suite name for unstable is sid 1037s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1037s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1037s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1037s | git rev-parse 'HEAD~0' 1037s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1037s | git symbolic-ref -q HEAD 1037s => `refs/heads/master' 1037s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1037s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1037s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1037s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1037s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1037s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 4250d6bf74726448b512cc3e70be75d29939c4bd0c96bfc0cb8f3a68ce34f3d5 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1037s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1037s >(no reflog) 1037s splitbrain cache miss 1037s CD work 1037s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1037s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1037s + git checkout -q -b dgit-view 1037s examining quilt state (multiple patches, gbp mode) 1037s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1037s CD fake 1037s | find -name .git -prune -print0 1037s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1037s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 1037s + git add -Af . 1037s | git write-tree 1037s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 1037s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1037s CD .. 1037s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1037s CD ../fake 1037s + git add -Af . 1037s | git write-tree 1037s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1037s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1037s CD ../work 1037s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 1037s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 1037s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 1037s => `' 1037s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 1037s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 1037s => `lib.c\x00new-upstream-file\x00src.c\x00' 1037s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1037s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 1037s => `lib.c\x00new-upstream-file\x00src.c\x00' 1037s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1037s differences @dl == ## ## == == ==. 1037s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 1037s dgit: quilt differences: src: == orig ## gitignores: == orig == 1037s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1037s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1037s => `1530000000 +0000' 1037s dgit view: creating patches-applied version using gbp pq 1037s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 1037s + git update-ref refs/heads/dgit-view HEAD 1037s + git checkout -q dgit-view 1037s | git rev-parse 'HEAD~0' 1037s => `45ea71a69fa522ce760afdab8a420200443753e9' 1037s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1037s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 1038s => `' 1038s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 4250d6bf74726448b512cc3e70be75d29939c4bd0c96bfc0cb8f3a68ce34f3d5 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 1038s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 1038s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1038s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1038s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1038s | git rev-parse 'HEAD~0' 1038s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1038s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1038s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1038s dpkg-source: info: using source format '3.0 (quilt)' 1038s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1038s dpkg-source: info: using patch list from debian/patches/series 1038s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 1038s dpkg-source: info: building example in example_2.0-1.dsc 1038s CD work 1038s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1038s package seems new, not specifying -v 1038s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 1038s dpkg-genchanges: info: not including original source code in upload 1038s CD .. 1038s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1038s renaming (Files) example_2.0.orig.tar.gz 1038s renaming (Files) example_2.0-1.debian.tar.xz 1038s renaming (dsc) example_2.0-1.dsc 1038s renaming (changes) example_2.0-1_source.changes 1038s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1038s actually entering push 1038s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1038s => `0' 1038s + git config remote.dgit.skipdefaultupdate true 1038s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1038s get_archive_dsc: nothing in archive, returning undef 1038s no version available from the archive 1038s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1038s => `' 1038s previous reference hash= 1038s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1038s => `' 1038s fetch_from_archive: lastfetch= 1038s nothing found! 1038s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1038s + git check-ref-format archive/test-dummy/2.0-1 1038s | git symbolic-ref -q HEAD 1038s => `refs/heads/master' 1038s | git rev-parse 'HEAD~0' 1038s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1038s ffq_prev_branchinfo branch current refs/heads/master 1038s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1038s => `' 1038s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1038s => `' 1038s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1038s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1038s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1038s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1038s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1038s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 4250d6bf74726448b512cc3e70be75d29939c4bd0c96bfc0cb8f3a68ce34f3d5 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1038s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1038s CD work 1038s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1038s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1038s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1038s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 1038s splitbrain_pseudomerge... 1038s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1038s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1038s => `' 1038s + git diff --quiet HEAD 1038s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 1038s => `' 1038s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1038s checking that example_2.0-1.dsc corresponds to HEAD 1038s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc 1038s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc) 1038s dpkg-source: info: extracting example in example-2.0 1038s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1038s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 1038s dpkg-source: info: using patch list from debian/patches/series 1038s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1038s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1038s dpkg-source: info: applying subdir/addnewups 1038s CD example-2.0 1038s | find -name .git -prune -print0 1038s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1038s + git add -Af . 1038s | git write-tree 1038s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1038s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1038s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1038s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1038s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1038s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 1038s files_compare_inputs example_2.0-1.dsc 1038s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 1038s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1038s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 1038s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 1038s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1038s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 1038s files_compare_inputs example_2.0-1.dsc Files 1038s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 1038s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 1038s files_compare_inputs example_2.0-1_source.changes 1038s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 1038s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 1038s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 1038s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 1038s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 1038s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 1038s files_compare_inputs example_2.0-1_source.changes Files 1038s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 1038s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 1038s checking origs needed (2.0)... 1038s checking origs needed placement 'devel extra'... 1038s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1038s origs example_2.0.orig.tar.gz is_orig 1038s -| sh -ec 'cd "$1"; shift 1038s 1038s find -name "$1" -print0 | 1038s xargs -0r sha256sum 1038s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1038s origs example_2.0.orig.tar.gz $#$have=-1 1038s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1038s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 1038s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1038s push_tagwants: $VAR1 = [ 1038s '2.0-1', 1038s '45ea71a69fa522ce760afdab8a420200443753e9', 1038s 'eb10718ab213ccfa83613ebbddefbffda941a548', 1038s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1038s ]; 1038s $VAR2 = [ 1038s { 1038s 'TagFn' => sub { "DUMMY" }, 1038s 'View' => 'dgit', 1038s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1038s 'Tag' => 'archive/test-dummy/2.0-1', 1038s 'Tfn' => sub { "DUMMY" }, 1038s 'TfSuffix' => '' 1038s }, 1038s { 1038s 'View' => 'maint', 1038s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 1038s 'TagFn' => sub { "DUMMY" }, 1038s 'Tag' => 'test-dummy/2.0-1', 1038s 'TfSuffix' => '-maintview', 1038s 'Tfn' => sub { "DUMMY" } 1038s } 1038s ]; 1038s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1038s => `1530000000 +0000' 1038s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1038s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1038s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1038s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 1038s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1038s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 1038s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1038s => `fef4abd7f57b33d60ca1a8539604aea0d854328b' 1038s + git verify-tag fef4abd7f57b33d60ca1a8539604aea0d854328b 1038s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1038s gpg: Signature made Mon Mar 31 23:04:28 2025 UTC 1038s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1038s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1038s gpg: WARNING: This key is not certified with a trusted signature! 1038s gpg: There is no indication that the signature belongs to the owner. 1038s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1038s + git update-ref refs/tags/archive/test-dummy/2.0-1 fef4abd7f57b33d60ca1a8539604aea0d854328b 1038s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 1038s => `d433645978da1daa8e72318c1dd5353dc0e3ce71' 1038s + git verify-tag d433645978da1daa8e72318c1dd5353dc0e3ce71 1038s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1038s gpg: Signature made Mon Mar 31 23:04:28 2025 UTC 1038s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1038s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1038s gpg: WARNING: This key is not certified with a trusted signature! 1038s gpg: There is no indication that the signature belongs to the owner. 1038s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1038s + git update-ref refs/tags/test-dummy/2.0-1 d433645978da1daa8e72318c1dd5353dc0e3ce71 1038s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1038s => `0' 1038s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 1038s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 1038s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1038s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 1038s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 1038s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 1038s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 1038s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 1038s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1038s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1039s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1039s 1039s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 1039s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1039s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1039s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1039s 1039s Successfully signed dsc, changes files 1039s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 1039s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1039s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1039s D: Setting host argument. 1039s Checking signature on .changes 1039s Checking signature on .dsc 1039s Uploading to test-dummy (via local to localhost): 1039s Successfully uploaded packages. 1039s dgit ok: pushed and uploaded 2.0-1 1039s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1039s del_lrfetchrefs... 1039s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1039s ' 1039s + t-salsa-add-remote 1039s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1039s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1039s + set -e 1039s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1039s + git init --bare 1039s hint: Using 'master' as the name for the initial branch. This default branch name 1039s hint: is subject to change. To configure the initial branch name to use in all 1039s hint: of your new repositories, which will suppress this warning, call: 1039s hint: 1039s hint: git config --global init.defaultBranch 1039s hint: 1039s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1039s hint: 'development'. The just-created branch can be renamed via this command: 1039s hint: 1039s hint: git branch -m 1039s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example/ 1039s + git remote add origin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1039s + git push --set-upstream origin master 1039s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1039s * [new branch] master -> master 1039s Branch 'master' set up to track remote branch 'master' from 'origin'. 1039s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1039s + local 'mpat=E:identical in upstream files' 1039s + shift 1039s + set +o pipefail 1039s + LC_MESSAGES=C 1039s + LANGUAGE=C 1039s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1039s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1039s + local gdr=git-debrebase 1039s + : ' 1039s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1039s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1039s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1039s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 1039s docs/README | 1 + 1039s 1 file changed, 1 insertion(+) 1039s 1039s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1039s git-debrebase: identical in upstream files. See diffstat above, or run 1039s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 1039s + local 'ps=255 0' 1039s + set -o pipefail 1039s + case $ps in 1039s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1039s + local 'mpat=E:identical in upstream files' 1039s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1039s + local grepper=fgrep 1039s + case "$mpat" in 1039s + case "$mpat" in 1039s + grepper=egrep 1039s + mpat='identical in upstream files' 1039s + egrep -e 'identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1039s git-debrebase: identical in upstream files. See diffstat above, or run 1039s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1039s + local 'mpat=E:Unused patch file garbage will be discarded' 1039s + shift 1039s + set +o pipefail 1039s + LC_MESSAGES=C 1039s + LANGUAGE=C 1039s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1039s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1039s + local gdr=git-debrebase 1039s + : ' 1039s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1039s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1039s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1039s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1039s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1039s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1039s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1039s $VAR2 = bless( do{\(my $o = { 1039s 'drop_empty' => 0, 1039s 'out_order' => [], 1039s 'allow_pgp' => 1, 1039s 'fields' => { 1039s 'Source' => 'example', 1039s 'Version' => '2.0-1', 1039s 'Distribution' => 'unstable', 1039s 'Urgency' => 'medium', 1039s 'Maintainer' => 'dgit test git user ', 1039s 'Timestamp' => '1530000000', 1039s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1039s 'Changes' => ' 1039s example (2.0-1) unstable; urgency=medium 1039s 1039s [ Ian Jackson ] 1039s * new upstream (did gbp import-orig)' 1039s }, 1039s 'in_order' => [ 1039s 'Source', 1039s 'Version', 1039s 'Distribution', 1039s 'Urgency', 1039s 'Maintainer', 1039s 'Timestamp', 1039s 'Date', 1039s 'Changes' 1039s ], 1039s 'name' => 'debian/changelog, entry no.1', 1039s 'allow_duplicate' => 0, 1039s 'is_pgp_signed' => 0, 1039s 'keep_duplicate' => 0 1039s })}, 'Dpkg::Control::Hash' ); 1039s last finished-looking changelog entry: (2.0-1) unstable 1039s will stitch in dgit view, archive/test-dummy/2.0-1 1039s git-debrebase: snags: 1 overriden by individual -f options 1039s 1039s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1039s + local 'ps=255 0' 1039s + set -o pipefail 1039s + case $ps in 1039s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1039s + local 'mpat=E:Unused patch file garbage will be discarded' 1039s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1039s + local grepper=fgrep 1039s + case "$mpat" in 1039s + case "$mpat" in 1039s + grepper=egrep 1039s + mpat='Unused patch file garbage will be discarded' 1039s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1039s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1039s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1039s + local gdr=git-debrebase 1039s + : ' 1039s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1039s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1039s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1039s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1039s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1039s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1040s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1040s $VAR2 = bless( do{\(my $o = { 1040s 'fields' => { 1040s 'Source' => 'example', 1040s 'Version' => '2.0-1', 1040s 'Distribution' => 'unstable', 1040s 'Urgency' => 'medium', 1040s 'Maintainer' => 'dgit test git user ', 1040s 'Timestamp' => '1530000000', 1040s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1040s 'Changes' => ' 1040s example (2.0-1) unstable; urgency=medium 1040s 1040s [ Ian Jackson ] 1040s * new upstream (did gbp import-orig)' 1040s }, 1040s 'allow_duplicate' => 0, 1040s 'allow_pgp' => 1, 1040s 'keep_duplicate' => 0, 1040s 'is_pgp_signed' => 0, 1040s 'out_order' => [], 1040s 'drop_empty' => 0, 1040s 'in_order' => [ 1040s 'Source', 1040s 'Version', 1040s 'Distribution', 1040s 'Urgency', 1040s 'Maintainer', 1040s 'Timestamp', 1040s 'Date', 1040s 'Changes' 1040s ], 1040s 'name' => 'debian/changelog, entry no.1' 1040s })}, 'Dpkg::Control::Hash' ); 1040s last finished-looking changelog entry: (2.0-1) unstable 1040s will stitch in dgit view, archive/test-dummy/2.0-1 1040s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1040s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1040s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1040s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 1040s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1040s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1040s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1040s git-debrebase ffq check_specs * 1040s git-debrebase ffq merge master 1040s git-debrebase ffq check_remote origin remote fetch/merge branch 1040s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1040s OK, you are ahead of refs/remotes/origin/master 1040s git-debrebase ffq check_remote undef remote push branch 1040s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1040s OK, you are ahead of refs/remotes/dgit/dgit/sid 1040s git-debrebase: snags: 2 overriden by individual -f options 1040s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 1040s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 1040s git-debrebase >$ 1040s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 1040s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1040s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1040s ' 1040s + git branch converted-from-gbp 1040s + v=2.0-2 1040s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1040s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1040s + DEBEMAIL=dgit-tests@example.org 1040s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1040s + 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 1040s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1040s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 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.XK8uun/build.980/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 4af0243] dch -r -D unstable 1040s 1 file changed, 1 insertion(+), 1 deletion(-) 1040s + t-dgit -wgf push-source --new 1040s + local dgit=dgit 1040s + pwd 1040s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1040s + : ' 1040s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1040s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 1040s | git rev-parse --show-toplevel 1040s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1040s | git config -z --get-regexp --local '.*' 1040s | git config -z --get-regexp --local '.*' 1040s | git config -z --get-regexp --global '.*' 1040s | git config -z --get-regexp --system '.*' 1040s format 3.0 (quilt), quilt mode linear 1040s Format `3.0 (quilt)', need to check/update patch stack 1040s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1040s => `' 1040s + git diff --quiet HEAD 1040s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1040s canonical suite name for unstable is sid 1040s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1040s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1040s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1040s | git rev-parse 'HEAD~0' 1040s => `4af0243f9227b0d695fbff38df345aca23969e2e' 1040s | git symbolic-ref -q HEAD 1040s => `refs/heads/master' 1040s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1040s CD work 1040s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1040s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1040s examining quilt state (multiple patches, linear mode) 1040s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 1040s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 1040s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1040s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1041s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 1041s | git rev-parse 'HEAD~0' 1041s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1041s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1041s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1041s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1041s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1041s CD fake 1041s | find -name .git -prune -print0 1041s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1041s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 1041s + git add -Af . 1041s | git write-tree 1041s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 1041s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1041s CD .. 1041s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1041s CD ../fake 1041s + git add -Af . 1041s | git write-tree 1041s => `607612c46d7ea5b66697b830f1a50f069061d460' 1041s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1041s CD ../work 1041s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1041s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1041s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1041s => `: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' 1041s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 1041s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1041s => `' 1041s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1041s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 1041s => `lib.c\x00new-upstream-file\x00src.c\x00' 1041s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 1041s differences @dl ## ## == == == ==. 1041s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 1041s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1041s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1041s starting quiltify (multiple patches, linear mode) 1041s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 1041s => `debian/control'... 1041s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1041s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1041s => `' 1041s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1041s search finished hooray! 1041s quiltify linearisation planning successful, executing... 1041s + git checkout -q master 1041s | git status --ignored --porcelain 1041s => `?? .pc/' 1041s nothing quilty to commit, ok. 1041s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1041s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1041s | git rev-parse 'HEAD~0' 1041s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1041s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1041s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1041s CD work 1041s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1041s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1041s CD .. 1041s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1041s dpkg-source: info: using source format '3.0 (quilt)' 1041s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1041s dpkg-source: info: using patch list from debian/patches/series 1041s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 1041s dpkg-source: info: building example in example_2.0-2.dsc 1041s CD work 1041s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1041s package seems new, not specifying -v 1041s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 1041s dpkg-genchanges: info: not including original source code in upload 1041s CD .. 1041s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1041s renaming (Files) example_2.0.orig.tar.gz 1041s renaming (Files) example_2.0-2.debian.tar.xz 1041s renaming (dsc) example_2.0-2.dsc 1041s renaming (changes) example_2.0-2_source.changes 1041s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1041s actually entering push 1041s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1041s => `1' 1041s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1041s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1041s git_lrfetch_sane iteration 0 1041s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1041s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 1041s => fef4abd7f57b33d60ca1a8539604aea0d854328b refs/tags/archive/test-dummy/2.0-1 1041s => d433645978da1daa8e72318c1dd5353dc0e3ce71 refs/tags/test-dummy/2.0-1 1041s 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 1041s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1041s | git for-each-ref refs/dgit-fetch/test-dummy 1041s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 1041s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1041s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1041s git_lrfetch_sane: tidying any old suite lrfetchrefs 1041s | git for-each-ref refs/dgit-fetch/sid 1041s git_lrfetch_sane: git fetch --no-insane emulation complete 1041s $VAR1 = { 1041s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1041s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => 'fef4abd7f57b33d60ca1a8539604aea0d854328b', 1041s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'd433645978da1daa8e72318c1dd5353dc0e3ce71' 1041s }; 1041s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1041s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/tags/archive/test-dummy/2.0-1 1041s currently refs/tags/archive/test-dummy/2.0-1=fef4abd7f57b33d60ca1a8539604aea0d854328b 1041s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/tags/test-dummy/2.0-1 1041s currently refs/tags/test-dummy/2.0-1=d433645978da1daa8e72318c1dd5353dc0e3ce71 1041s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1041s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1041s offered refs/tags/archive/test-dummy/2.0-1=fef4abd7f57b33d60ca1a8539604aea0d854328b 1041s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1041s offered refs/tags/test-dummy/2.0-1=d433645978da1daa8e72318c1dd5353dc0e3ce71 1041s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1041s get_archive_dsc: nothing in archive, returning undef 1041s no version available from the archive 1041s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 1041s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 1041s 1041s Package not found in the archive, but has allegedly been pushed using dgit. 1041s Perhaps the upload is stuck in incoming. Using the version from git. 1041s 1041s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s fetch mergeinfos: 1041s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 1041s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 1041s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 1041s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 1041s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 1041s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 1041s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1041s + git check-ref-format archive/test-dummy/2.0-2 1041s | git symbolic-ref -q HEAD 1041s => `refs/heads/master' 1041s | git rev-parse 'HEAD~0' 1041s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1041s ffq_prev_branchinfo branch current refs/heads/master 1041s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1041s => `' 1041s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1041s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1041s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1041s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1041s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1041s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1041s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1041s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1041s | git status --ignored --porcelain 1041s => `' 1041s nothing quilty to commit, ok. 1041s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1041s => `' 1041s + git diff --quiet HEAD 1041s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1041s => `45ea71a69fa522ce760afdab8a420200443753e9' 1041s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 1041s => `' 1041s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1041s checking that example_2.0-2.dsc corresponds to HEAD 1041s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc 1041s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc) 1041s dpkg-source: info: extracting example in example-2.0 1041s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1042s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 1042s dpkg-source: info: using patch list from debian/patches/series 1042s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1042s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1042s dpkg-source: info: applying subdir/addnewups 1042s CD example-2.0 1042s | find -name .git -prune -print0 1042s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1042s + git add -Af . 1042s | git write-tree 1042s => `607612c46d7ea5b66697b830f1a50f069061d460' 1042s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1042s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1042s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1042s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1042s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1042s files_compare_inputs example_2.0-2.dsc 1042s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 1042s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1042s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 1042s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 1042s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1042s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 1042s files_compare_inputs example_2.0-2.dsc Files 1042s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 1042s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 1042s files_compare_inputs example_2.0-2_source.changes 1042s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 1042s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 1042s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 1042s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 1042s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 1042s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 1042s files_compare_inputs example_2.0-2_source.changes Files 1042s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 1042s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 1042s checking origs needed (2.0)... 1042s checking origs needed placement 'devel extra'... 1042s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1042s origs example_2.0.orig.tar.gz is_orig 1042s -| sh -ec 'cd "$1"; shift 1042s 1042s find -name "$1" -print0 | 1042s xargs -0r sha256sum 1042s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1042s origs example_2.0.orig.tar.gz $#$have=-1 1042s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1042s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 1042s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1042s push_tagwants: $VAR1 = [ 1042s '2.0-2', 1042s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1042s undef, 1042s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1042s ]; 1042s $VAR2 = [ 1042s { 1042s 'Tfn' => sub { "DUMMY" }, 1042s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1042s 'Tag' => 'archive/test-dummy/2.0-2', 1042s 'TagFn' => sub { "DUMMY" }, 1042s 'View' => 'dgit', 1042s 'TfSuffix' => '' 1042s }, 1042s { 1042s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1042s 'Tfn' => sub { "DUMMY" }, 1042s 'Tag' => 'test-dummy/2.0-2', 1042s 'TagFn' => sub { "DUMMY" }, 1042s 'TfSuffix' => '-dgit', 1042s 'View' => 'dgit' 1042s } 1042s ]; 1042s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1042s => `1530000000 +0000' 1042s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1042s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1042s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1042s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1042s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1042s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1042s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1042s => `c9f0c7241f3ae8094eced5e523351ff658872f89' 1042s + git verify-tag c9f0c7241f3ae8094eced5e523351ff658872f89 1042s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1042s gpg: Signature made Mon Mar 31 23:04:32 2025 UTC 1042s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1042s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1042s gpg: WARNING: This key is not certified with a trusted signature! 1042s gpg: There is no indication that the signature belongs to the owner. 1042s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1042s + git update-ref refs/tags/archive/test-dummy/2.0-2 c9f0c7241f3ae8094eced5e523351ff658872f89 1042s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1042s => `7552395cff8db2ee1364171a417465c663fe49fe' 1042s + git verify-tag 7552395cff8db2ee1364171a417465c663fe49fe 1042s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1042s gpg: Signature made Mon Mar 31 23:04:32 2025 UTC 1042s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1042s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1042s gpg: WARNING: This key is not certified with a trusted signature! 1042s gpg: There is no indication that the signature belongs to the owner. 1042s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1042s + git update-ref refs/tags/test-dummy/2.0-2 7552395cff8db2ee1364171a417465c663fe49fe 1042s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1042s => `1' 1042s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 1042s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1042s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 1042s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 1042s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 1042s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1042s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 1042s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1042s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1042s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1042s 1042s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 1042s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1042s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1042s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1042s 1042s Successfully signed dsc, changes files 1042s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 1042s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1042s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1042s D: Setting host argument. 1042s Checking signature on .changes 1042s Checking signature on .dsc 1042s Package includes an .orig.tar.gz file although the debian revision suggests 1042s that it might not be required. Multiple uploads of the .orig.tar.gz may be 1042s rejected by the upload queue management software. 1042s Uploading to test-dummy (via local to localhost): 1042s Successfully uploaded packages. 1043s dgit ok: pushed and uploaded 2.0-2 1043s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1043s del_lrfetchrefs... 1043s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 1043s del_lrfetchrefs: fef4abd7f57b33d60ca1a8539604aea0d854328b refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1043s del_lrfetchrefs: d433645978da1daa8e72318c1dd5353dc0e3ce71 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1043s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1043s ' 1043s + git push 1043s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1043s eb10718..6b22dd5 master -> master 1043s + cd .. 1043s + t-archive-process-incoming sid 1043s + local suite=sid 1043s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1043s + t-archive-query sid 1043s + local suite=sid 1043s + local dscf=main/example_2.0-2.dsc 1043s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 1043s + local suite=sid 1043s + local p=example 1043s + local v=2.0-2 1043s + local dscf=main/example_2.0-2.dsc 1043s + local sha 1043s ++ sha256sum 1043s + sha='a22d071490ab270048298cd675fedeb5977fc04b784a9ef4cf970301b6acfb80 -' 1043s + echo '2.0-2 a22d071490ab270048298cd675fedeb5977fc04b784a9ef4cf970301b6acfb80 main/example_2.0-2.dsc' 1043s + t-aq-archive-updated sid example 1043s + local suite=sid 1043s + local p=example 1043s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1043s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1043s + perl -wne ' 1043s use JSON; 1043s use strict; 1043s our @v; 1043s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1043s push @v, { 1043s "version" => "$1", 1043s "sha256sum" => "$2", 1043s "component" => "$3", 1043s "filename" => "$4", 1043s }; 1043s END { 1043s my $json = JSON->new->canonical(); 1043s print $json->encode(\@v) or die $!; 1043s } 1043s ' 1043s ++ 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 1043s ++ echo git mirror aq 1043s + 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' ' 1043s . $troot/lib-gdr 1043s t-tstunt-parsechangelog 1043s p=example 1043s t-git-next-date 1043s ' 1043s + local savevars= 1043s + 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' 1043s + local 'importeval= 1043s . $troot/lib-gdr 1043s t-tstunt-parsechangelog 1043s p=example 1043s t-git-next-date 1043s ' 1043s + local import=IMPORT.gdr-convert-gbp 1043s + exec 1043s + local vn 1043s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1043s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1043s print STDERR "saving-exporting $vn\n"; 1043s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1043s or die $!; 1043s } 1043s ' 1043s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1043s saving-exporting DGIT_TEST_REAL_GPG 1043s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1043s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1043s + set -e 1043s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s + 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 1043s + printf '\n%s\n' ' 1043s . $troot/lib-gdr 1043s t-tstunt-parsechangelog 1043s p=example 1043s t-git-next-date 1043s ' 1043s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1043s + rc=0 1043s + set +x 1043s + set +e 1043s + pwd 1043s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s + '[' x '!=' x ']' 1043s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1043s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1043s + set -e 1043s + test 0 = 0 1043s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1043s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1043s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1043s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1043s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1043s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1043s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1043s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1043s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1043s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1043s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1043s ++ . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1043s +++ : -D 1043s +++ export GDR_TEST_DEBUG 1043s +++ t-tstunt debchange 1043s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s +++ local var=PATH 1043s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s +++ eval ' 1043s case "$PATH" in 1043s "$tstunt:"*) ;; 1043s *":$tstunt:"*) ;; 1043s "") PATH="$tstunt" ;; 1043s *) PATH="$tstunt:$PATH" ;; 1043s esac 1043s export PATH 1043s ' 1043s ++++ case "$PATH" in 1043s ++++ export PATH 1043s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s +++ local var=PERLLIB 1043s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s +++ eval ' 1043s case "$PERLLIB" in 1043s "$tstunt:"*) ;; 1043s *":$tstunt:"*) ;; 1043s "") PERLLIB="$tstunt" ;; 1043s *) PERLLIB="$tstunt:$PERLLIB" ;; 1043s esac 1043s export PERLLIB 1043s ' 1043s ++++ case "$PERLLIB" in 1043s ++++ export PERLLIB 1043s +++ local f 1043s +++ for f in "$@" 1043s +++ t-tstunt--save-real debchange 1043s +++ local f=debchange 1043s +++ case "$f" in 1043s +++ local rc 1043s +++ local real 1043s +++ set +e 1043s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1043s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1043s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1043s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1043s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1043s ++++ type -p debchange 1043s +++ real=/usr/bin/debchange 1043s +++ rc=0 1043s +++ set -e 1043s +++ case $rc in 1043s +++ local varname=debchange 1043s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1043s +++ eval ' 1043s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1043s export DGIT_TEST_REAL_DEBCHANGE 1043s ' 1043s ++++ : /usr/bin/debchange 1043s ++++ export DGIT_TEST_REAL_DEBCHANGE 1043s +++ f=./debchange 1043s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1043s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1043s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1043s ++ t-tstunt-parsechangelog 1043s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1043s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s ++ local var=PATH 1043s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s ++ eval ' 1043s case "$PATH" in 1043s "$tstunt:"*) ;; 1043s *":$tstunt:"*) ;; 1043s "") PATH="$tstunt" ;; 1043s *) PATH="$tstunt:$PATH" ;; 1043s esac 1043s export PATH 1043s ' 1043s +++ case "$PATH" in 1043s +++ export PATH 1043s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s ++ local var=PERLLIB 1043s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s ++ eval ' 1043s case "$PERLLIB" in 1043s "$tstunt:"*) ;; 1043s *":$tstunt:"*) ;; 1043s "") PERLLIB="$tstunt" ;; 1043s *) PERLLIB="$tstunt:$PERLLIB" ;; 1043s esac 1043s export PERLLIB 1043s ' 1043s +++ case "$PERLLIB" in 1043s +++ export PERLLIB 1043s ++ local f 1043s ++ for f in "$@" 1043s ++ t-tstunt--save-real dpkg-parsechangelog 1043s ++ local f=dpkg-parsechangelog 1043s ++ case "$f" in 1043s ++ local rc 1043s ++ local real 1043s ++ set +e 1043s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1043s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1043s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1043s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1043s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1043s +++ type -p dpkg-parsechangelog 1043s ++ real=/usr/bin/dpkg-parsechangelog 1043s ++ rc=0 1043s ++ set -e 1043s ++ case $rc in 1043s ++ local varname=dpkg_parsechangelog 1043s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1043s ++ eval ' 1043s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1043s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1043s ' 1043s +++ : /usr/bin/dpkg-parsechangelog 1043s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1043s ++ f=./dpkg-parsechangelog 1043s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1043s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1043s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1043s ++ for f in "$@" 1043s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1043s ++ local f=Dpkg/Changelog/Parse.pm 1043s ++ case "$f" in 1043s ++ return 1043s ++ f=./Dpkg/Changelog/Parse.pm 1043s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1043s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1043s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1043s ++ p=example 1043s ++ t-git-next-date 1043s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1043s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1043s + t-setup-import http-git-check 1043s + local setupname=http-git-check 1043s + local setupsrc 1043s + local lock 1043s + '[' x = x ']' 1043s + setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s + lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1043s + local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 1043s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check ']' 1043s + with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1043s cd "$1"; shift 1043s setupname="$1"; shift 1043s simport="$1"; shift 1043s if [ -e "$simport" ]; then exit 0; fi 1043s env - "$@" \ 1043s "tests/setup/$setupname" 1043s ' x /tmp/autopkgtest.XK8uun/build.980/src http-git-check /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 1043s + cd /tmp/autopkgtest.XK8uun/build.980/src 1043s + shift 1043s + setupname=http-git-check 1043s + shift 1043s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 1043s + shift 1043s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check ']' 1043s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-import-dgit-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-import-dgit-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-import-dgit-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-import-dgit -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-import-dgit' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-import-dgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/http-git-check 1043s ++ set -o pipefail 1043s ++ . tests/lib-core 1043s ++ . tests/lib-restricts 1043s ++ trap ' 1043s rc=$? 1043s set +x 1043s test $rc = 0 || echo " 1043s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1043s 1043s Most relevant logs are just before assignment rc=$rc 1043s Will now do cleanup etc. 1043s " 1043s set -x 1043s set +e 1043s pwd 1043s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1043s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1043s set -e 1043s test $rc = 0 || t-report-failure 1043s ' EXIT 1043s ++ t-filter-out-git-hyphen-dir 1043s ++ local pathent 1043s +++ type -p git-rev-parse 1043s +++ : 1043s ++ pathent= 1043s ++ case "$pathent" in 1043s ++ return 1043s ++ t-set-intree 1043s ++ '[' x = x ']' 1043s ++ return 1043s ++ : -D 1043s ++ export DGIT_TEST_DEBUG 1043s ++ : x 1043s ++ export DGIT_TEST_DEBPUSH_DEBUG 1043s ++ : 1043s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1043s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1043s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1043s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1043s ++ export LC_CTYPE=C.UTF-8 1043s ++ LC_CTYPE=C.UTF-8 1043s ++ unset CDPATH 1043s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1043s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1043s +++ pwd 1043s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1043s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1043s ++ testname=http-git-check 1043s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1043s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1043s ++ bpd=.. 1043s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1043s ++ '[' x '!=' x ']' 1043s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s +++ pwd 1043s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s ++ t-set-using-tmp 1043s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1043s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1043s ++ export 'DEBFULLNAME=dgit test git user' 1043s ++ DEBFULLNAME='dgit test git user' 1043s ++ git config --global user.email dgit-test@debian.example.net 1043s ++ git config --global user.name 'dgit test git user' 1043s ++ git config --global protocol.ext.allow always 1043s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1043s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1043s ++ export DEBCHANGE_VENDOR=dpkg 1043s ++ DEBCHANGE_VENDOR=dpkg 1043s ++ unset VISUAL 1043s ++ unset GIT_EDITOR 1043s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1043s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1043s ++ cat 1043s ++ schroot=build 1043s ++ : aq 1043s ++ : archive/test-dummy 1043s ++ : sid:unstable 1043s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1043s ++ git config --global dgit.default.old-dsc-distro test-dummy 1043s ++ for import in ${autoimport-gnupg} 1043s ++ case "$0" in 1043s ++ t-setup-import gnupg 1043s ++ local setupname=gnupg 1043s ++ local setupsrc 1043s ++ local lock 1043s ++ '[' x = x ']' 1043s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1043s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1043s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1043s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1043s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1043s ++ . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1043s +++ DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1043s +++ DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1043s +++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1043s +++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1043s +++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1043s +++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1043s +++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1043s +++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1043s +++ export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1043s +++ cat 1043s +++ : /usr/bin/gpg-agent 1043s ++++ type -p gpg-agent 1043s +++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1043s +++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1043s +++ export DGIT_STUNT_AGENT=/tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/gpg-agent 1043s +++ DGIT_STUNT_AGENT=/tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/gpg-agent 1043s +++ t-tstunt gpg 1043s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s +++ local var=PATH 1043s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s +++ eval ' 1043s case "$PATH" in 1043s "$tstunt:"*) ;; 1043s *":$tstunt:"*) ;; 1043s "") PATH="$tstunt" ;; 1043s *) PATH="$tstunt:$PATH" ;; 1043s esac 1043s export PATH 1043s ' 1043s ++++ case "$PATH" in 1043s ++++ PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1043s ++++ export PATH 1043s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s +++ local var=PERLLIB 1043s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s +++ eval ' 1043s case "$PERLLIB" in 1043s "$tstunt:"*) ;; 1043s *":$tstunt:"*) ;; 1043s "") PERLLIB="$tstunt" ;; 1043s *) PERLLIB="$tstunt:$PERLLIB" ;; 1043s esac 1043s export PERLLIB 1043s ' 1043s ++++ case "$PERLLIB" in 1043s ++++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1043s ++++ export PERLLIB 1043s +++ local f 1043s +++ for f in "$@" 1043s +++ t-tstunt--save-real gpg 1043s +++ local f=gpg 1043s +++ case "$f" in 1043s +++ local rc 1043s +++ local real 1043s +++ set +e 1043s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1043s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1043s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1043s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1043s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1043s ++++ type -p gpg 1043s +++ real=/usr/bin/gpg 1043s +++ rc=0 1043s +++ set -e 1043s +++ case $rc in 1043s +++ local varname=gpg 1043s +++ varname=DGIT_TEST_REAL_GPG 1043s +++ eval ' 1043s : ${DGIT_TEST_REAL_GPG:=$real} 1043s export DGIT_TEST_REAL_GPG 1043s ' 1043s ++++ : /usr/bin/gpg 1043s ++++ export DGIT_TEST_REAL_GPG 1043s +++ f=./gpg 1043s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1043s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1043s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1043s + t-dependencies libhttp-server-simple-static-perl 1043s + : 'Hopefully installed: libhttp-server-simple-static-perl' 1043s + t-setup-done '' --files-from=/dev/null ' 1043s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 1043s read <$tmp/must-clean/git-check.port git_check_port 1043s 1043s t-git-config --global dgit-distro.test-dummy.git-check url 1043s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1043s t-git-config --global dgit-distro.test-dummy.git-check-url \ 1043s http://127.0.0.1:$git_check_port 1043s ' 1043s + local savevars= 1043s + local savedirs=--files-from=/dev/null 1043s + local 'importeval= 1043s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 1043s read <$tmp/must-clean/git-check.port git_check_port 1043s 1043s t-git-config --global dgit-distro.test-dummy.git-check url 1043s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1043s t-git-config --global dgit-distro.test-dummy.git-check-url \ 1043s http://127.0.0.1:$git_check_port 1043s ' 1043s + local import=IMPORT.http-git-check 1043s + exec 1043s + local vn 1043s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1043s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1043s print STDERR "saving-exporting $vn\n"; 1043s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1043s or die $!; 1043s } 1043s ' 1043s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1043s saving-exporting DGIT_TEST_REAL_GPG 1043s + set -e 1043s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 1043s + printf '\n%s\n' ' 1043s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 1043s read <$tmp/must-clean/git-check.port git_check_port 1043s 1043s t-git-config --global dgit-distro.test-dummy.git-check url 1043s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1043s t-git-config --global dgit-distro.test-dummy.git-check-url \ 1043s http://127.0.0.1:$git_check_port 1043s ' 1043s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 1043s + rc=0 1043s + set +x 1043s + set +e 1043s + pwd 1043s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1043s + '[' x '!=' x ']' 1043s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1043s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1043s + set -e 1043s + test 0 = 0 1043s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1043s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1043s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.http-git-check 1043s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1043s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1043s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1043s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1043s ++ /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1043s ++ read git_check_port 1043s ++ t-git-config --global dgit-distro.test-dummy.git-check url 1043s ++ git config --global --global dgit-distro.test-dummy.git-check url 1043s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1043s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 1043s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:46301 1043s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:46301 1043s + cd example 1043s + : 'non-dgit upload (but we prepare it with dgit anyway)' 1043s + v=2.0-2+nmu1 1043s + t-nmu-upload-1 nmu 1043s + t-git-next-date 1043s + GIT_COMMITTER_DATE='1530000002 +0100' 1043s + GIT_AUTHOR_DATE='1530000002 +0100' 1043s + nmubranch=nmu 1043s + git checkout -f -b nmu 1043s Switched to a new branch 'nmu' 1043s + t-git-debrebase 1043s + local gdr=git-debrebase 1043s + : ' 1043s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1043s + git-debrebase --dgit=dgit -D 1043s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu 1043s git-debrebase ffq check_specs * 1043s git-debrebase *** WALK 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0 - 1043s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1043s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1043s 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","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches"} 1043s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1043s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1043s git-debrebase = Changelog {"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","Parents" => [{"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Type" => "Changelog","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"} 1043s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1043s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1043s 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","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Ix" => 0}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"} 1043s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1043s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1043s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1043s 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","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Overwritten" => [{"Differs" => 8,"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Type" => "Pseudomerge","Parents" => [{"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 1043s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1043s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1043s git-debrebase = 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","Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 1043s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1043s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1043s git-debrebase = Upstream {"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","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"} 1043s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1043s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1043s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Parents" => [{"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"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"} 1043s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1043s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1043s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1043s 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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 1043s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 4 proc 9 pm 0 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1043s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 10 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1043s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1043s git-debrebase WALK REWRITING NOW cl=HASH(0x2abb5baa168) procd=HASH(0x2abb5c133f0) 1043s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1043s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1043s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1043s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1043s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1043s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1043s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1043s git-debrebase get_differs 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf = 0x4 1043s git-debrebase *** WALK RETURN 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1043s git-debrebase: laundered (head was 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf) 1043s git-debrebase >= update refs/ffq-prev/heads/nmu 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0000000000000000000000000000000000000000 1043s git-debrebase >= delete refs/debrebase-last/heads/nmu 1043s git-debrebase >= update HEAD 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1043s git-debrebase >$ 1043s Recorded previous head for preservation 1043s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1043s ' 1043s + t-git-debrebase convert-to-gbp 1043s + local gdr=git-debrebase 1043s + : ' 1043s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1043s + git-debrebase --dgit=dgit -D convert-to-gbp 1043s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu 1043s git-debrebase get_differs 517ec05ac4fb1052455f3fd8594c07fbc10d34e5 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1043s git-debrebase classify 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 517ec05ac4fb1052455f3fd8594c07fbc10d34e5/0x2 1043s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "517ec05ac4fb1052455f3fd8594c07fbc10d34e5"}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Type" => "Upstream","CommitId" => "606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 517ec05ac4fb1052455f3fd8594c07fbc10d34e5\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 1043s git-debrebase get_differs 76e34cba590b7381fdabf3320a64b39e7f806f27 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1043s git-debrebase classify 517ec05ac4fb1052455f3fd8594c07fbc10d34e5 $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p 76e34cba590b7381fdabf3320a64b39e7f806f27/0x2 1043s git-debrebase = Upstream {"Parents" => [{"CommitId" => "76e34cba590b7381fdabf3320a64b39e7f806f27","Differs" => 2,"Ix" => 0}],"Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Type" => "Upstream","CommitId" => "517ec05ac4fb1052455f3fd8594c07fbc10d34e5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent 76e34cba590b7381fdabf3320a64b39e7f806f27\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000002 +0100\n"} 1043s git-debrebase get_differs 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1043s git-debrebase classify 76e34cba590b7381fdabf3320a64b39e7f806f27 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9/0x2 1043s git-debrebase = Upstream {"Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "76e34cba590b7381fdabf3320a64b39e7f806f27","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Parents" => [{"CommitId" => "71f4bf5a8958ca445930338a054a6fe6fd6bcfe9","Differs" => 2,"Ix" => 0}]} 1043s git-debrebase get_differs 57f5145b3f1d8b14002345f278bc2d05f3c5d283 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1043s git-debrebase classify 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 57f5145b3f1d8b14002345f278bc2d05f3c5d283/0x10 1043s git-debrebase = Changelog {"Parents" => [{"CommitId" => "57f5145b3f1d8b14002345f278bc2d05f3c5d283","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 57f5145b3f1d8b14002345f278bc2d05f3c5d283\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "71f4bf5a8958ca445930338a054a6fe6fd6bcfe9","Msg" => "dch -r -D unstable\n"} 1043s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1043s git-debrebase classify 57f5145b3f1d8b14002345f278bc2d05f3c5d283 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1043s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "57f5145b3f1d8b14002345f278bc2d05f3c5d283","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","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1043s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1043s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1043s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1043s git-debrebase = Anchor {"Type" => "Anchor","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","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]]} 1043s git-debrebase *** WALK 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 0 - 1043s git-debrebase get_differs 517ec05ac4fb1052455f3fd8594c07fbc10d34e5 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1043s git-debrebase classify 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 517ec05ac4fb1052455f3fd8594c07fbc10d34e5/0x2 1043s git-debrebase = Upstream {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 517ec05ac4fb1052455f3fd8594c07fbc10d34e5\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"CommitId" => "517ec05ac4fb1052455f3fd8594c07fbc10d34e5","Differs" => 2,"Ix" => 0}]} 1043s git-debrebase get_differs 76e34cba590b7381fdabf3320a64b39e7f806f27 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1043s git-debrebase classify 517ec05ac4fb1052455f3fd8594c07fbc10d34e5 $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p 76e34cba590b7381fdabf3320a64b39e7f806f27/0x2 1043s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "76e34cba590b7381fdabf3320a64b39e7f806f27","Ix" => 0}],"Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Type" => "Upstream","CommitId" => "517ec05ac4fb1052455f3fd8594c07fbc10d34e5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent 76e34cba590b7381fdabf3320a64b39e7f806f27\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000002 +0100\n"} 1043s git-debrebase get_differs 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1043s git-debrebase classify 76e34cba590b7381fdabf3320a64b39e7f806f27 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9/0x2 1043s git-debrebase = Upstream {"Parents" => [{"CommitId" => "71f4bf5a8958ca445930338a054a6fe6fd6bcfe9","Differs" => 2,"Ix" => 0}],"Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Type" => "Upstream","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000002 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "76e34cba590b7381fdabf3320a64b39e7f806f27"} 1043s git-debrebase get_differs 57f5145b3f1d8b14002345f278bc2d05f3c5d283 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1043s git-debrebase classify 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 57f5145b3f1d8b14002345f278bc2d05f3c5d283/0x10 1043s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 57f5145b3f1d8b14002345f278bc2d05f3c5d283\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000002 +0100\n","Msg" => "dch -r -D unstable\n","CommitId" => "71f4bf5a8958ca445930338a054a6fe6fd6bcfe9","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "57f5145b3f1d8b14002345f278bc2d05f3c5d283","Differs" => 16,"Ix" => 0}]} 1043s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1043s git-debrebase classify 57f5145b3f1d8b14002345f278bc2d05f3c5d283 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1043s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000002 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "57f5145b3f1d8b14002345f278bc2d05f3c5d283","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1043s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1043s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1043s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1043s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1043s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 2 proc 5 pm -1 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1043s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 6 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1043s git-debrebase WALK BUILD 57f5145b3f1d8b14002345f278bc2d05f3c5d283 Debian (rewriting=0) 1043s git-debrebase WALK BUILD 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 Debian (rewriting=0) 1043s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1043s git-debrebase WALK BUILD 76e34cba590b7381fdabf3320a64b39e7f806f27 Upstream (rewriting=0) 1043s git-debrebase WALK BUILD 517ec05ac4fb1052455f3fd8594c07fbc10d34e5 Upstream (rewriting=0) 1043s git-debrebase WALK BUILD 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c Upstream (rewriting=0) 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1043s git-debrebase get_differs 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c = 0 1043s git-debrebase *** WALK RETURN 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1043s git-debrebase gbp_pq_export bw 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1043s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1043s git-debrebase >= delete refs/ffq-prev/heads/nmu 1043s git-debrebase >= delete refs/debrebase-last/heads/nmu 1043s git-debrebase >= update HEAD defc3045ee65e024ff97133f167bad6d877472dd 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 1043s git-debrebase >$ 1043s HEAD is now at defc304 Commit patch queue (converted from git-debrebase format) 1043s git-debrebase: converted to git-buildpackage branch format 1043s git-debrebase: WARNING: do not now run "git-debrebase" any more 1043s git-debrebase: WARNING: doing so would drop all upstream patches! 1043s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1043s ' 1043s + t-git-next-date 1043s + GIT_COMMITTER_DATE='1530000003 +0100' 1043s + GIT_AUTHOR_DATE='1530000003 +0100' 1043s + gbp pq import 1044s gbp:info: Trying to apply patches at 'defc3045ee65e024ff97133f167bad6d877472dd' 1044s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/nmu' 1044s + t-nmu-upload-2 1044s + t-git-next-date 1044s + GIT_COMMITTER_DATE='1530000004 +0100' 1044s + GIT_AUTHOR_DATE='1530000004 +0100' 1044s + t-dch-commit -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 1044s + t-debchange -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 1044s + DEBEMAIL=dgit-tests@example.org 1044s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 1044s + 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 1044s + git commit -m 'dch -v 2.0-2+nmu1 -m nmu nmu 2.0-2+nmu1' debian/changelog 1044s [patch-queue/nmu 62e606f] dch -v 2.0-2+nmu1 -m nmu nmu 2.0-2+nmu1 1044s 1 file changed, 6 insertions(+) 1044s + t-some-changes 1044s + local token= 1044s + local which=dum 1044s + local fsuffix= 1044s + t-git-next-date 1044s + GIT_COMMITTER_DATE='1530000005 +0100' 1044s + GIT_AUTHOR_DATE='1530000005 +0100' 1044s + case "$which" in 1044s + echo '// debian ' 1044s + git add debian/zorkmid 1044s + git commit -m 'DEBIAN add zorkmid ()' 1044s [patch-queue/nmu 5f8f6a9] DEBIAN add zorkmid () 1044s 1 file changed, 1 insertion(+) 1044s create mode 100644 debian/zorkmid 1044s + case "$which" in 1044s + echo '// upstream ' 1044s + git add src.c 1044s + git commit -m 'UPSTREAM edit src.c ()' 1044s [patch-queue/nmu 6849e90] UPSTREAM edit src.c () 1044s 1 file changed, 1 insertion(+) 1044s + case "$which" in 1044s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1044s + echo '// both! ' 1044s + git add debian/zorkmid 1044s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1044s + echo '// both! ' 1044s + git add src.c 1044s + git commit -m 'MIXED add both() ()' 1044s [patch-queue/nmu 670fa04] MIXED add both() () 1044s 2 files changed, 2 insertions(+) 1044s + t-git-next-date 1044s + GIT_COMMITTER_DATE='1530000006 +0100' 1044s + GIT_AUTHOR_DATE='1530000006 +0100' 1044s + t-nmu-upload-3 1044s + t-dch-commit-r 1044s + t-dch-r-rune t-dch-commit 1044s + local cmd=t-dch-commit 1044s + shift 1044s + local suite=unstable 1044s + t-dch-commit -r -D unstable '' 1044s + t-debchange -r -D unstable '' 1044s + DEBEMAIL=dgit-tests@example.org 1044s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1044s + exec env TZ=UTC faketime -f 2018-06-26 08:00:06 env -u TZ /usr/bin/debchange -r -D unstable 1044s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1044s libdistro-info-perl is not installed, Debian release names are not known. 1044s libdistro-info-perl is not installed, Ubuntu release names are not known. 1044s + git commit -m 'dch -r -D unstable ' debian/changelog 1044s [patch-queue/nmu 23eab92] dch -r -D unstable 1044s 1 file changed, 2 insertions(+), 2 deletions(-) 1044s + t-non-dgit-upload 1044s + t-dgit -wgf build-source 1044s + local dgit=dgit 1044s + pwd 1044s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1044s + : ' 1044s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1044s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf build-source 1044s | git rev-parse --show-toplevel 1044s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1044s | git config -z --get-regexp --local '.*' 1044s | git config -z --get-regexp --local '.*' 1044s | git config -z --get-regexp --global '.*' 1044s | git config -z --get-regexp --system '.*' 1044s format 3.0 (quilt), quilt mode linear 1044s Format `3.0 (quilt)', need to check/update patch stack 1044s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1044s => `' 1044s + git diff --quiet HEAD 1044s | git clean -dn 1044s => `' 1044s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1044s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1044s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1044s | git rev-parse 'HEAD~0' 1044s => `23eab9231bebc66df63a58cf1dcf43a42e7cbf71' 1044s | git symbolic-ref -q HEAD 1044s => `refs/heads/patch-queue/nmu' 1044s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1044s CD work 1044s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1044s + git reset -q --hard 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1044s examining quilt state (multiple patches, linear mode) 1044s branch_is_gdr 23eab9231bebc66df63a58cf1dcf43a42e7cbf71... 1044s branch_is_gdr 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 ?-patches NO 1044s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1044s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1044s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1044s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1044s CD fake 1044s | find -name .git -prune -print0 1044s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1044s + git checkout -f 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 -- debian 1044s + git add -Af . 1044s | git write-tree 1044s => `1788bf8b5625467a49467c04d856feb43b0b6986' 1044s fake orig tree object 1788bf8b5625467a49467c04d856feb43b0b6986 1044s CD .. 1044s + git reset -q --hard 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1044s CD ../fake 1044s + git add -Af . 1044s | git write-tree 1044s => `1cd4795fb8fc362d7692476e021e1b13a5e903e1' 1044s fake o+d/p tree object 1788bf8b5625467a49467c04d856feb43b0b6986 1044s CD ../work 1044s | git ls-tree --name-only -z 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1044s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1044s | git diff-tree -z --no-renames -r 1788bf8b5625467a49467c04d856feb43b0b6986 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1044s => `: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' 1044s quiltify_trees_differ 1788bf8b5625467a49467c04d856feb43b0b6986 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 => 1 1044s | git diff-tree -z --no-renames --name-only -r 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1cd4795fb8fc362d7692476e021e1b13a5e903e1 1044s => `src.c\x00' 1044s quiltify_trees_differ 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 1 1044s | git diff-tree -z --no-renames --name-only -r 1788bf8b5625467a49467c04d856feb43b0b6986 1cd4795fb8fc362d7692476e021e1b13a5e903e1 1044s => `lib.c\x00new-upstream-file\x00src.c\x00' 1044s quiltify_trees_differ 1788bf8b5625467a49467c04d856feb43b0b6986 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 1 1044s differences @dl ## ## ## == == ==. 1044s dgit: base trees orig=1788bf8b5625467a4946 o+d/p=1cd4795fb8fc362d7692 1044s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1044s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1044s starting quiltify (multiple patches, linear mode) 1044s | git ls-tree --name-only 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 -- debian/rules debian/control 1044s => `debian/control'... 1044s quiltify investigate 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1044s | git diff-tree -z --no-renames --name-only 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1cd4795fb8fc362d7692476e021e1b13a5e903e1 1044s => `src.c\x00' 1044s quiltify_trees_differ 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 1 1044s | git ls-tree --name-only 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 -- debian/rules debian/control 1044s => `debian/control'... 1044s | git cat-file commit 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1044s => `tree 3e55010d546443f076d86ad8848c8e7543609e73'... 1044s | git diff-tree -z --no-renames --name-only 670fa04673b0781ff783257fecc557cf8427b9df 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1044s => `debian\x00' 1044s quiltify_trees_differ 670fa04673b0781ff783257fecc557cf8427b9df 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 => 0 1044s considering C=23eab9231bebc66df63a58cf1dcf43a42e7cbf71 P=670fa04673b0781ff783257fecc557cf8427b9df 1044s | git diff-tree -r --name-only 670fa04673b0781ff783257fecc557cf8427b9df 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 -- debian/patches .pc debian/source/format 1044s => `' 1044s search queue P=670fa04673b0781ff783257fecc557cf8427b9df triv 1044s quiltify investigate 670fa04673b0781ff783257fecc557cf8427b9df 1044s | git diff-tree -z --no-renames --name-only 670fa04673b0781ff783257fecc557cf8427b9df 1cd4795fb8fc362d7692476e021e1b13a5e903e1 1044s => `debian\x00src.c\x00' 1044s quiltify_trees_differ 670fa04673b0781ff783257fecc557cf8427b9df 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 1 1044s | git ls-tree --name-only 670fa04673b0781ff783257fecc557cf8427b9df -- debian/rules debian/control 1044s => `debian/control'... 1044s | git cat-file commit 670fa04673b0781ff783257fecc557cf8427b9df 1044s => `tree df5df2d2ccb45e6298d28ef193050005346cc580'... 1044s | git diff-tree -z --no-renames --name-only 6849e9014ff33537c19eea91a1b3296721b1b45c 670fa04673b0781ff783257fecc557cf8427b9df 1044s => `debian\x00src.c\x00' 1044s quiltify_trees_differ 6849e9014ff33537c19eea91a1b3296721b1b45c 670fa04673b0781ff783257fecc557cf8427b9df => 1 1044s considering C=670fa04673b0781ff783257fecc557cf8427b9df P=6849e9014ff33537c19eea91a1b3296721b1b45c 1044s | git diff-tree -r --name-only 6849e9014ff33537c19eea91a1b3296721b1b45c 670fa04673b0781ff783257fecc557cf8427b9df -- debian/patches .pc debian/source/format 1044s => `' 1044s search queue P=6849e9014ff33537c19eea91a1b3296721b1b45c NT 1044s quiltify investigate 6849e9014ff33537c19eea91a1b3296721b1b45c 1044s | git diff-tree -z --no-renames --name-only 6849e9014ff33537c19eea91a1b3296721b1b45c 1cd4795fb8fc362d7692476e021e1b13a5e903e1 1044s => `debian\x00src.c\x00' 1044s quiltify_trees_differ 6849e9014ff33537c19eea91a1b3296721b1b45c 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 1 1044s | git ls-tree --name-only 6849e9014ff33537c19eea91a1b3296721b1b45c -- debian/rules debian/control 1044s => `debian/control'... 1044s | git cat-file commit 6849e9014ff33537c19eea91a1b3296721b1b45c 1044s => `tree 0c4970196145bc2bf2f453b0100fdd8e0f24045a'... 1044s | git diff-tree -z --no-renames --name-only 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 6849e9014ff33537c19eea91a1b3296721b1b45c 1044s => `src.c\x00' 1044s quiltify_trees_differ 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 6849e9014ff33537c19eea91a1b3296721b1b45c => 1 1044s considering C=6849e9014ff33537c19eea91a1b3296721b1b45c P=5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 1044s | git diff-tree -r --name-only 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 6849e9014ff33537c19eea91a1b3296721b1b45c -- debian/patches .pc debian/source/format 1044s => `' 1044s search queue P=5f8f6a9309aed4ea6f9788677ad3bbc1d926796a NT 1044s quiltify investigate 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 1044s | git diff-tree -z --no-renames --name-only 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 1cd4795fb8fc362d7692476e021e1b13a5e903e1 1044s => `debian\x00' 1044s quiltify_trees_differ 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 0 1044s search finished hooray! 1044s quiltify linearisation planning successful, executing... 1044s quiltify traverse 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a..6849e9014ff33537c19eea91a1b3296721b1b45c 1044s | git cat-file commit 6849e9014ff33537c19eea91a1b3296721b1b45c 1044s => `tree 0c4970196145bc2bf2f453b0100fdd8e0f24045a'... 1044s | git log -n1 '--pretty=format:%aD' 6849e9014ff33537c19eea91a1b3296721b1b45c 1044s => `Tue, 26 Jun 2018 09:00:05 +0100' 1044s + git checkout -q 6849e9014ff33537c19eea91a1b3296721b1b45c 1044s + git checkout -q 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 debian/changelog 1044s | realpath -- /usr/bin/dgit 1044s => `/usr/bin/dgit' 1044s | realpath -- .git/dgit/quilt-description.tmp 1044s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1044s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-.patch 1045s dpkg-source: info: using patch list from debian/patches/series 1045s dpkg-source: info: local changes detected, the modified files are: 1045s work/src.c 1045s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-.patch 1045s + git checkout -q 6849e9014ff33537c19eea91a1b3296721b1b45c debian/changelog 1045s quiltify traverse 6849e9014ff33537c19eea91a1b3296721b1b45c..670fa04673b0781ff783257fecc557cf8427b9df 1045s | git cat-file commit 670fa04673b0781ff783257fecc557cf8427b9df 1045s => `tree df5df2d2ccb45e6298d28ef193050005346cc580'... 1045s | git log -n1 '--pretty=format:%aD' 670fa04673b0781ff783257fecc557cf8427b9df 1045s => `Tue, 26 Jun 2018 09:00:05 +0100' 1045s + git checkout -q 670fa04673b0781ff783257fecc557cf8427b9df 1045s + git checkout -q 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 debian/changelog 1045s | realpath -- /usr/bin/dgit 1045s => `/usr/bin/dgit' 1045s | realpath -- .git/dgit/quilt-description.tmp 1045s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1045s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-.patch 1045s dpkg-source: info: using patch list from debian/patches/series 1045s dpkg-source: info: local changes detected, the modified files are: 1045s work/src.c 1045s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-.patch 1045s + git checkout -q 670fa04673b0781ff783257fecc557cf8427b9df debian/changelog 1045s quiltify traverse 670fa04673b0781ff783257fecc557cf8427b9df..23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1045s + git checkout -q master 1045s | git status --ignored --porcelain 1045s => ` M debian/patches/series'... 1045s + git add -f debian/patches 1045s Commit Debian 3.0 (quilt) metadata 1045s 1045s [dgit (9.15) quilt-fixup] 1045s 1045s + git commit -m 'Commit Debian 3.0 (quilt) metadata 1045s 1045s [dgit (9.15) quilt-fixup] 1045s ' 1045s [master 0aa07db] Commit Debian 3.0 (quilt) metadata 1045s 3 files changed, 29 insertions(+) 1045s create mode 100644 debian/patches/mixed-add-both-.patch 1045s create mode 100644 debian/patches/upstream-edit-src.c-.patch 1045s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1045s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1045s | git rev-parse 'HEAD~0' 1045s => `0aa07db4f0fdaba06a489ec6bf6624578a87b23f' 1045s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1045s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1045s CD work 1045s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1045s + git reset -q --hard 0aa07db4f0fdaba06a489ec6bf6624578a87b23f 1045s CD .. 1045s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1045s dpkg-source: info: using source format '3.0 (quilt)' 1045s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1045s dpkg-source: info: using patch list from debian/patches/series 1045s dpkg-source: info: building example in example_2.0-2+nmu1.debian.tar.xz 1045s dpkg-source: info: building example in example_2.0-2+nmu1.dsc 1045s CD work 1045s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1045s changelog will contain changes since 2.0-2 1045s + sh -ec 'exec >../$1; shift; exec "$@"' x 'example_2.0-2+nmu1_source.changes' dpkg-genchanges -S -v2.0-2 1045s dpkg-genchanges: info: not including original source code in upload 1045s CD .. 1045s moving example_2.0-2+nmu1.dsc, example_2.0-2+nmu1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1045s renaming (Files) example_2.0.orig.tar.gz 1045s renaming (Files) example_2.0-2+nmu1.debian.tar.xz 1045s renaming (dsc) example_2.0-2+nmu1.dsc 1045s renaming (changes) example_2.0-2+nmu1_source.changes 1045s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1045s dgit ok: source built, results in example_2.0-2+nmu1.dsc and example_2.0-2+nmu1_source.changes 1045s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1045s ' 1045s + cd .. 1045s + c=example_2.0-2+nmu1_source.changes 1045s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A example_2.0-2+nmu1_source.changes 1045s signfile dsc example_2.0-2+nmu1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1045s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1046s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1046s 1046s fixup_changes dsc example_2.0-2+nmu1.dsc example_2.0-2+nmu1_source.changes 1046s signfile changes example_2.0-2+nmu1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1046s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1046s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1046s 1046s Successfully signed dsc, changes files 1046s + dput -c /tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy example_2.0-2+nmu1_source.changes 1046s gpg: /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example_2.0-2+nmu1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1046s gpg: /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example_2.0-2+nmu1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1046s D: Setting host argument. 1046s Checking signature on .changes 1046s Checking signature on .dsc 1046s Uploading to test-dummy (via local to localhost): 1046s Successfully uploaded packages. 1046s + t-archive-process-incoming sid 1046s + local suite=sid 1046s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2+nmu1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2+nmu1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2+nmu1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1046s + t-archive-query sid 1046s + local suite=sid 1046s + local dscf=main/example_2.0-2+nmu1.dsc 1046s + t-archive-query-aq sid example 2.0-2+nmu1 main/example_2.0-2+nmu1.dsc 1046s + local suite=sid 1046s + local p=example 1046s + local v=2.0-2+nmu1 1046s + local dscf=main/example_2.0-2+nmu1.dsc 1046s + local sha 1046s ++ sha256sum 1046s + sha='1e4e10bdbf82e77e4a6dd35c9b275de007b537318fbad21ceb68b1c7a141d446 -' 1046s + echo '2.0-2+nmu1 1e4e10bdbf82e77e4a6dd35c9b275de007b537318fbad21ceb68b1c7a141d446 main/example_2.0-2+nmu1.dsc' 1046s + t-aq-archive-updated sid example 1046s + local suite=sid 1046s + local p=example 1046s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1046s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1046s + perl -wne ' 1046s use JSON; 1046s use strict; 1046s our @v; 1046s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1046s push @v, { 1046s "version" => "$1", 1046s "sha256sum" => "$2", 1046s "component" => "$3", 1046s "filename" => "$4", 1046s }; 1046s END { 1046s my $json = JSON->new->canonical(); 1046s print $json->encode(\@v) or die $!; 1046s } 1046s ' 1046s + t-git-next-date 1046s + GIT_COMMITTER_DATE='1530000007 +0100' 1046s + GIT_AUTHOR_DATE='1530000007 +0100' 1046s + cd example 1046s + git checkout master 1046s Switched to branch 'master' 1046s Your branch is up to date with 'origin/master'. 1046s + : 'done the nmu, switching back to the maintainer hat' 1046s + nmu-fold 1046s + t-git-next-date 1046s + GIT_COMMITTER_DATE='1530000008 +0100' 1046s + GIT_AUTHOR_DATE='1530000008 +0100' 1046s + t-dgit fetch 1046s + local dgit=dgit 1046s + pwd 1046s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1046s + : ' 1046s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1046s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch 1046s | git rev-parse --show-toplevel 1046s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1046s | git config -z --get-regexp --local '.*' 1046s | git config -z --get-regexp --local '.*' 1046s | git config -z --get-regexp --global '.*' 1046s | git config -z --get-regexp --system '.*' 1046s | git symbolic-ref -q HEAD 1046s => `refs/heads/master' 1046s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1046s canonical suite name for unstable is sid 1046s query: fetching http://127.0.0.1:46301/example.git/HEAD... 1046s dgit-repos check_for_git => 1. 1046s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1046s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1046s git_lrfetch_sane iteration 0 1046s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1046s => 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit/sid 1046s => fef4abd7f57b33d60ca1a8539604aea0d854328b refs/tags/archive/test-dummy/2.0-1 1046s => c9f0c7241f3ae8094eced5e523351ff658872f89 refs/tags/archive/test-dummy/2.0-2 1046s => d433645978da1daa8e72318c1dd5353dc0e3ce71 refs/tags/test-dummy/2.0-1 1046s => 7552395cff8db2ee1364171a417465c663fe49fe refs/tags/test-dummy/2.0-2 1046s 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 1046s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1046s | git for-each-ref refs/dgit-fetch/test-dummy 1046s |> 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit refs/dgit-fetch/test-dummy/dgit/sid 1046s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1046s |> c9f0c7241f3ae8094eced5e523351ff658872f89 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1046s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1046s |> 7552395cff8db2ee1364171a417465c663fe49fe tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1046s git_lrfetch_sane: tidying any old suite lrfetchrefs 1046s | git for-each-ref refs/dgit-fetch/sid 1046s git_lrfetch_sane: git fetch --no-insane emulation complete 1046s $VAR1 = { 1046s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => '7552395cff8db2ee1364171a417465c663fe49fe', 1046s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => 'c9f0c7241f3ae8094eced5e523351ff658872f89', 1046s 'refs/dgit-fetch/test-dummy/dgit/sid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1046s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'd433645978da1daa8e72318c1dd5353dc0e3ce71', 1046s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => 'fef4abd7f57b33d60ca1a8539604aea0d854328b' 1046s }; 1046s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1046s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/tags/archive/test-dummy/2.0-1 1046s currently refs/tags/archive/test-dummy/2.0-1=fef4abd7f57b33d60ca1a8539604aea0d854328b 1046s |> c9f0c7241f3ae8094eced5e523351ff658872f89 tag refs/tags/archive/test-dummy/2.0-2 1046s currently refs/tags/archive/test-dummy/2.0-2=c9f0c7241f3ae8094eced5e523351ff658872f89 1046s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/tags/test-dummy/2.0-1 1046s currently refs/tags/test-dummy/2.0-1=d433645978da1daa8e72318c1dd5353dc0e3ce71 1046s |> 7552395cff8db2ee1364171a417465c663fe49fe tag refs/tags/test-dummy/2.0-2 1046s currently refs/tags/test-dummy/2.0-2=7552395cff8db2ee1364171a417465c663fe49fe 1046s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1046s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1046s offered refs/tags/archive/test-dummy/2.0-1=fef4abd7f57b33d60ca1a8539604aea0d854328b 1046s |> c9f0c7241f3ae8094eced5e523351ff658872f89 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1046s offered refs/tags/archive/test-dummy/2.0-2=c9f0c7241f3ae8094eced5e523351ff658872f89 1046s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1046s offered refs/tags/test-dummy/2.0-1=d433645978da1daa8e72318c1dd5353dc0e3ce71 1046s |> 7552395cff8db2ee1364171a417465c663fe49fe tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1046s offered refs/tags/test-dummy/2.0-2=7552395cff8db2ee1364171a417465c663fe49fe 1046s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1046s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.0-2+nmu1.dsc... 1046s get_archive_dsc: Version 2.0-2+nmu1 1046s last upload to archive: NO git hash 1046s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1046s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1046s previous reference hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1046s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1046s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1046s fetch_from_archive: lastfetch=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1046s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1046s considering reusing example_2.0.orig.tar.gz: (No such file or directory) linked. 1046s using existing example_2.0.orig.tar.gz 1046s considering saving example_2.0.orig.tar.gz: (File exists) no need. 1046s considering reusing example_2.0-2+nmu1.debian.tar.xz: (No such file or directory) linked. 1046s using existing example_2.0-2+nmu1.debian.tar.xz 1046s considering saving example_2.0-2+nmu1.debian.tar.xz: (File exists) no need. 1046s import considering example_2.0.orig.tar.gz Y .gz orig 1046s + chmod -R '+rwX' _unpack-tar 1046s CD _unpack-tar 1046s | find -name .git -prune -print0 1046s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1046s + git add -Af . 1046s | git write-tree 1046s => `e24142d5bb711d7b480f1e58dfc3e8c461c6e106' 1046s | git ls-tree -z e24142d5bb711d7b480f1e58dfc3e8c461c6e106 1046s => `040000 tree bdaae868b00952ee2af5782628959ae01469b2e3\x09example-2.0\x00' 1046s one subtree bdaae868b00952ee2af5782628959ae01469b2e3 1046s CD .. 1046s import considering example_2.0-2+nmu1.debian.tar.xz Y .xz (none) 1046s + chmod -R '+rwX' _unpack-tar 1046s CD _unpack-tar 1046s | find -name .git -prune -print0 1046s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1046s + git add -Af . 1046s | git write-tree 1046s => `f423a4033bb213dc3f6479fa9fe8938121cd3bb5' 1046s | git ls-tree -z f423a4033bb213dc3f6479fa9fe8938121cd3bb5 1046s => `040000 tree 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54\x09debian\x00' 1046s one subtree 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54 1046s CD .. 1046s + dpkg-source --no-check --skip-patches -x -- example.dsc 1047s dpkg-source: info: extracting example in example-2.0 1047s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1047s dpkg-source: info: unpacking example_2.0-2+nmu1.debian.tar.xz 1047s CD example-2.0 1047s | find -name .git -prune -print0 1047s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1047s + git add -Af . 1047s | git write-tree 1047s => `6d28f15d394bda27c6a9a8961b2bc81fcf61e781' 1047s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1047s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1047s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1047s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 1047s + git add -Af . 1047s | git write-tree 1047s => `c35a831ed16058cd02d5b26782482c07fdbe3b0a' 1047s import clog search... 1047s | dpkg-parsechangelog --format rfc822 --all 1047s import clog 2.0-2+nmu1 package changelog, entry no.1... 1047s import clog 2.0-2+nmu1 vs 2.0... 1047s import clog 2.0-2+nmu1 becomes r1 1047s import clog 2.0-2 package changelog, entry no.2... 1047s import clog 2.0-2 vs 2.0... 1047s import clog 2.0-2 becomes r1 1047s import clog 2.0-1 package changelog, entry no.3... 1047s import clog 2.0-1 vs 2.0... 1047s import clog 2.0-1 becomes r1 1047s import clog 1.0-1 package changelog, entry no.4... 1047s import clog 1.0-1 vs 2.0... 1047s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 1047s => `1530000006 +0000' 1047s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1047s => `1530000000 +0000' 1047s import tartrees authline dgit test git user 1530000006 +0000 1047s import tartrees r1authline dgit test git user 1530000000 +0000 1047s import tartree example_2.0.orig.tar.gz bdaae868b00952ee2af5782628959ae01469b2e3 1047s | git hash-object -w -t commit --stdin 1047s => 6587c6c396e0002956dd3b151fe4b82e0bd7611c 1047s import tartree example_2.0-2+nmu1.debian.tar.xz 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54 1047s | git hash-object -w -t commit --stdin 1047s => 969f770a4ce0e44543c83f86bc52b1086e105a4f 1047s import main commit 1047s | git hash-object -w -t commit ../commit.tmp 1047s => `e5eb08492f31d817c6b9441907350bc6302882c8' 1047s import apply patches... 1047s | git hash-object -w -t commit --stdin 1047s => e9f96320b1318ff6811938626ebe0fc74d4f5555 1047s + git checkout -q -b dapplied e9f96320b1318ff6811938626ebe0fc74d4f5555 1047s + git checkout -q -b unpa e5eb08492f31d817c6b9441907350bc6302882c8 1047s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 1047s => `1530000006 +0000' 1047s + git checkout -q unpa 1047s + git update-ref -d refs/heads/patch-queue/unpa 1047s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 1047s | git rev-parse 'HEAD~0' 1047s => `e76b40833a6827a6dda6f8583fb72ed7affa43da' 1047s | git rev-parse HEAD: 1047s => `c35a831ed16058cd02d5b26782482c07fdbe3b0a' 1047s synthesised git commit from .dsc 2.0-2+nmu1 1047s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:debian/changelog 1047s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1047s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob e76b40833a6827a6dda6f8583fb72ed7affa43da:debian/changelog 1047s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf e76b40833a6827a6dda6f8583fb72ed7affa43da 1047s =>!256 1047s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1047s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1047s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1047s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1047s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1047s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1047s fetch mergeinfos: 1047s commit e76b40833a6827a6dda6f8583fb72ed7affa43da Import of source package 1047s commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf dgit suite branch on dgit git server 1047s ReverseParents=1 Message=Record example (2.0-2+nmu1) in archive suite sid 1047s | git cat-file commit e76b40833a6827a6dda6f8583fb72ed7affa43da 1047s => `tree c35a831ed16058cd02d5b26782482c07fdbe3b0a'... 1047s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 1047s => `1530000006 +0000' 1047s | git hash-object -w -t commit /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/mergecommit 1047s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1047s fetch hash=1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1047s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1047s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1047s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1047s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1047s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1047s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1047s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1047s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1047s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1047s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1047s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1047s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1047s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1047s | git log -n2 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1047s => `commit 1c8e3b534eac1867c8911d4e5f923d5f7bcee275'... 1047s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1047s => `' 1047s | git ls-tree -lrz -- 1c8e3b534eac1867c8911d4e5f923d5f7bcee275: 1047s dgit ok: fetched into refs/remotes/dgit/dgit/sid 1047s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1047s del_lrfetchrefs... 1047s del_lrfetchrefs: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit-fetch/test-dummy/dgit/sid 1047s del_lrfetchrefs: fef4abd7f57b33d60ca1a8539604aea0d854328b refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1047s del_lrfetchrefs: c9f0c7241f3ae8094eced5e523351ff658872f89 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1047s del_lrfetchrefs: d433645978da1daa8e72318c1dd5353dc0e3ce71 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1047s del_lrfetchrefs: 7552395cff8db2ee1364171a417465c663fe49fe refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1047s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1047s ' 1047s + t-git-next-date 1047s + GIT_COMMITTER_DATE='1530000009 +0100' 1047s + GIT_AUTHOR_DATE='1530000009 +0100' 1047s + git merge --ff-only dgit/dgit/sid 1047s Updating 6b22dd5..1c8e3b5 1047s Fast-forward 1047s debian/changelog | 6 ++++++ 1047s debian/patches/mixed-add-both-.patch | 14 ++++++++++++++ 1047s debian/patches/series | 2 ++ 1047s debian/patches/upstream-edit-src.c-.patch | 13 +++++++++++++ 1047s debian/zorkmid | 2 ++ 1047s src.c | 2 ++ 1047s 6 files changed, 39 insertions(+) 1047s create mode 100644 debian/patches/mixed-add-both-.patch 1047s create mode 100644 debian/patches/upstream-edit-src.c-.patch 1047s create mode 100644 debian/zorkmid 1047s + git diff --exit-code patch-queue/nmu 1047s + git branch unlaundered.nmu 1047s + t-git-debrebase 1047s + local gdr=git-debrebase 1047s + : ' 1047s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1047s + git-debrebase --dgit=dgit -D 1047s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1047s git-debrebase ffq check_specs * 1047s git-debrebase ffq merge master 1047s git-debrebase ffq check_remote origin remote fetch/merge branch 1047s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1047s OK, you are ahead of refs/remotes/origin/master 1047s git-debrebase ffq check_remote undef remote push branch 1047s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1047s OK, you are ahead of refs/remotes/dgit/dgit/sid 1047s git-debrebase *** WALK 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 0 - 1047s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0x36 1047s git-debrebase get_differs e76b40833a6827a6dda6f8583fb72ed7affa43da c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0 1047s git-debrebase classify 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 $t=c35a831ed16058cd02d5b26782482c07fdbe3b0a @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x36 e76b40833a6827a6dda6f8583fb72ed7affa43da/0 1047s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 1,"Differs" => 0,"CommitId" => "e76b40833a6827a6dda6f8583fb72ed7affa43da"},"Tree" => "c35a831ed16058cd02d5b26782482c07fdbe3b0a","Parents" => [{"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Ix" => 0,"Differs" => 54},$VAR1->{"Contributor"}],"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","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","Overwritten" => [$VAR1->{"Parents"}[0]]} 1047s git-debrebase get_differs 02a3797b3764d6d76e05ca0d881afa88c2b12430 c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0x2 1047s git-debrebase classify e76b40833a6827a6dda6f8583fb72ed7affa43da $t=c35a831ed16058cd02d5b26782482c07fdbe3b0a @p 02a3797b3764d6d76e05ca0d881afa88c2b12430/0x2 1047s git-debrebase = Upstream {"Tree" => "c35a831ed16058cd02d5b26782482c07fdbe3b0a","CommitId" => "e76b40833a6827a6dda6f8583fb72ed7affa43da","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "02a3797b3764d6d76e05ca0d881afa88c2b12430"}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Type" => "Upstream","Hdr" => "tree c35a831ed16058cd02d5b26782482c07fdbe3b0a\nparent 02a3797b3764d6d76e05ca0d881afa88c2b12430\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000006 +0000\n"} 1047s git-debrebase get_differs 9831208f76656ac811c76b57017774de3ed7b1da 0ec7ae0689075193fd516c119e67ec1adbc0b968 = 0x2 1047s git-debrebase classify 02a3797b3764d6d76e05ca0d881afa88c2b12430 $t=0ec7ae0689075193fd516c119e67ec1adbc0b968 @p 9831208f76656ac811c76b57017774de3ed7b1da/0x2 1047s git-debrebase = Upstream {"Parents" => [{"CommitId" => "9831208f76656ac811c76b57017774de3ed7b1da","Ix" => 0,"Differs" => 2}],"CommitId" => "02a3797b3764d6d76e05ca0d881afa88c2b12430","Tree" => "0ec7ae0689075193fd516c119e67ec1adbc0b968","Type" => "Upstream","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"} 1047s git-debrebase get_differs 156c10ffb534a1f5eafbadccb63eca4a26ce8b00 a23e6d130529f794fcb76ce8913d68adec691fcb = 0x2 1047s git-debrebase classify 9831208f76656ac811c76b57017774de3ed7b1da $t=a23e6d130529f794fcb76ce8913d68adec691fcb @p 156c10ffb534a1f5eafbadccb63eca4a26ce8b00/0x2 1047s git-debrebase = Upstream {"Hdr" => "tree a23e6d130529f794fcb76ce8913d68adec691fcb\nparent 156c10ffb534a1f5eafbadccb63eca4a26ce8b00\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000006 +0000\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"CommitId" => "156c10ffb534a1f5eafbadccb63eca4a26ce8b00","Ix" => 0,"Differs" => 2}],"CommitId" => "9831208f76656ac811c76b57017774de3ed7b1da","Tree" => "a23e6d130529f794fcb76ce8913d68adec691fcb"} 1047s git-debrebase get_differs 682d84eb05d2504821c98a0d135926a85f3476c5 ac14e7b566c102651f4279a83b03fbe091783ff9 = 0x2 1047s git-debrebase classify 156c10ffb534a1f5eafbadccb63eca4a26ce8b00 $t=ac14e7b566c102651f4279a83b03fbe091783ff9 @p 682d84eb05d2504821c98a0d135926a85f3476c5/0x2 1047s git-debrebase = Upstream {"Tree" => "ac14e7b566c102651f4279a83b03fbe091783ff9","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "682d84eb05d2504821c98a0d135926a85f3476c5"}],"CommitId" => "156c10ffb534a1f5eafbadccb63eca4a26ce8b00","Hdr" => "tree ac14e7b566c102651f4279a83b03fbe091783ff9\nparent 682d84eb05d2504821c98a0d135926a85f3476c5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000006 +0000\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 1047s git-debrebase get_differs e5eb08492f31d817c6b9441907350bc6302882c8 ddb581efae7b5021b033468a6bd472f8ecbce423 = 0x2 1047s git-debrebase classify 682d84eb05d2504821c98a0d135926a85f3476c5 $t=ddb581efae7b5021b033468a6bd472f8ecbce423 @p e5eb08492f31d817c6b9441907350bc6302882c8/0x2 1047s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e5eb08492f31d817c6b9441907350bc6302882c8"}],"CommitId" => "682d84eb05d2504821c98a0d135926a85f3476c5","Tree" => "ddb581efae7b5021b033468a6bd472f8ecbce423","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree ddb581efae7b5021b033468a6bd472f8ecbce423\nparent e5eb08492f31d817c6b9441907350bc6302882c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000006 +0000\n"} 1047s git-debrebase get_differs 6587c6c396e0002956dd3b151fe4b82e0bd7611c 6d28f15d394bda27c6a9a8961b2bc81fcf61e781 = 0x34 1047s git-debrebase get_differs 969f770a4ce0e44543c83f86bc52b1086e105a4f 6d28f15d394bda27c6a9a8961b2bc81fcf61e781 = 0x36 1047s git-debrebase classify e5eb08492f31d817c6b9441907350bc6302882c8 $t=6d28f15d394bda27c6a9a8961b2bc81fcf61e781 @p 6587c6c396e0002956dd3b151fe4b82e0bd7611c/0x34 969f770a4ce0e44543c83f86bc52b1086e105a4f/0x36 1047s git-debrebase = DgitImportUnpatched {"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","Parents" => [{"CommitId" => "6587c6c396e0002956dd3b151fe4b82e0bd7611c","IsOrigin" => 1,"Ix" => 0,"Differs" => 52,"IsDgitImport" => "orig"},{"Ix" => 1,"IsOrigin" => 1,"Differs" => 54,"CommitId" => "969f770a4ce0e44543c83f86bc52b1086e105a4f","IsDgitImport" => "tarball"}],"OrigParents" => [$VAR1->{"Parents"}[0]],"CommitId" => "e5eb08492f31d817c6b9441907350bc6302882c8","Tree" => "6d28f15d394bda27c6a9a8961b2bc81fcf61e781"} 1047s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1047s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1047s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Type" => "AddPatches","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Ix" => 0,"Differs" => 4}],"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460"} 1047s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1047s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1047s git-debrebase = Changelog {"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","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0,"Differs" => 16}],"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"} 1047s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1047s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1047s git-debrebase = Changelog {"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","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","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1047s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1047s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1047s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1047s git-debrebase = Pseudomerge {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Contributor" => {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0,"Ix" => 0},"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Parents" => [$VAR1->{"Contributor"},{"Ix" => 1,"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"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","Overwritten" => [$VAR1->{"Parents"}[1]]} 1047s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1047s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1047s 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","Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2,"Ix" => 0}],"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 1047s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1047s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1047s git-debrebase = Upstream {"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"}],"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"} 1047s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1047s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1047s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 2}],"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\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"} 1047s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1047s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1047s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1047s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 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","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1047s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 4 upp 10 proc 18 pm 1 1047s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1047s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1047s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 19 1047s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1047s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1047s git-debrebase WALK REWRITING NOW cl=HASH(0xe75994f28a0) procd=HASH(0xe75994fc8b0) 1047s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1047s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1047s git-debrebase WALK BUILD e5eb08492f31d817c6b9441907350bc6302882c8 DgitImportUpstreamUpdate (rewriting=1) 1047s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e e5eb08492f31d817c6b9441907350bc6302882c8 = 0x34 1047s git-debrebase WALK BUILD e5eb08492f31d817c6b9441907350bc6302882c8 DgitImportDebianUpdate (rewriting=1) 1047s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1047s git-debrebase WALK BUILD 682d84eb05d2504821c98a0d135926a85f3476c5 Upstream (rewriting=1) 1047s git-debrebase WALK BUILD 156c10ffb534a1f5eafbadccb63eca4a26ce8b00 Upstream (rewriting=1) 1047s git-debrebase WALK BUILD 9831208f76656ac811c76b57017774de3ed7b1da Upstream (rewriting=1) 1047s git-debrebase WALK BUILD 02a3797b3764d6d76e05ca0d881afa88c2b12430 Upstream (rewriting=1) 1047s git-debrebase WALK BUILD e76b40833a6827a6dda6f8583fb72ed7affa43da Upstream (rewriting=1) 1047s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1047s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1047s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 = 0x4 1047s git-debrebase *** WALK RETURN 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 e4eca65c490ba804c753f8fc1ef367ba07d51c08 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1047s git-debrebase: laundered (head was 1c8e3b534eac1867c8911d4e5f923d5f7bcee275) 1047s git-debrebase >= update refs/ffq-prev/heads/master 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 0000000000000000000000000000000000000000 1047s git-debrebase >= delete refs/debrebase-last/heads/master 1047s git-debrebase >= update HEAD 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1047s git-debrebase >$ 1047s Recorded previous head for preservation 1047s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1047s ' 1047s + t-gdr-good laundered 1047s + local state=laundered 1047s + local beforetag= 1047s + case $state in 1047s + git diff --quiet -- :. ':!debian/patches' 1047s + LC_MESSAGES=C 1047s + t-git-debrebase status 1047s + local gdr=git-debrebase 1047s + : ' 1047s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1047s + git-debrebase --dgit=dgit -D status 1048s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 1048s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 1048s git-debrebase = Upstream {"Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Differs" => 2,"Ix" => 0}],"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Type" => "Upstream","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe"} 1048s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 1048s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 1048s git-debrebase = Upstream {"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"}],"Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","Type" => "Upstream","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"} 1048s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 1048s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 1048s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"}],"Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 1048s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 1048s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 1048s git-debrebase = Upstream {"Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830"}]} 1048s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 1048s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 1048s git-debrebase = Upstream {"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Parents" => [{"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","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"} 1048s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1048s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1048s git-debrebase = Packaging {"Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Ix" => 0,"Differs" => 48}],"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","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n"} 1048s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1048s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1048s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Ix" => 0,"Differs" => 16}],"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"} 1048s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1048s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1048s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 1048s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1048s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1048s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1048s 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" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","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"} 1048s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1048s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1048s ' 1048s + case $state in 1048s + egrep '^ *branch is laundered' ../status.check 1048s branch is laundered 1048s + t-gdr-good-analyse HEAD laundered 1048s + local head=HEAD 1048s + local state=laundered 1048s + local wsfx= 1048s + local etypes bwtip 1048s + case $state in 1048s + etypes=Upstream 1048s ++ t-git-debrebase breakwater 1048s ++ local gdr=git-debrebase 1048s ++ : ' 1048s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1048s ++ git-debrebase --dgit=dgit -D breakwater 1048s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 1048s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 1048s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a"}],"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Type" => "Upstream","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 1048s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 1048s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 1048s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"}],"Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Type" => "Upstream","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"} 1048s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 1048s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 1048s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"}],"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","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"} 1048s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 1048s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 1048s git-debrebase = Upstream {"Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Parents" => [{"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Ix" => 0,"Differs" => 2}]} 1048s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 1048s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 1048s 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","Type" => "Upstream","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Parents" => [{"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Ix" => 0,"Differs" => 2}]} 1048s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1048s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1048s git-debrebase = Packaging {"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Ix" => 0,"Differs" => 48}],"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","Type" => "Packaging"} 1048s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1048s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1048s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Ix" => 0,"Differs" => 16}]} 1048s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1048s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1048s git-debrebase = Changelog {"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 1530000009 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"} 1048s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1048s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1048s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1048s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"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","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1048s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1048s ' 1048s + bwtip=Y:e4eca65c490ba804c753f8fc1ef367ba07d51c08 1048s + anal=../anal 1048s + t-git-debrebase analyse HEAD 1048s + local gdr=git-debrebase 1048s + : ' 1048s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1048s + git-debrebase --dgit=dgit -D analyse HEAD 1048s git-debrebase *** WALK 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1 *main::STDOUT 1048s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 1048s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 1048s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a"}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5"} 1048s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 1048s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 1048s git-debrebase = Upstream {"Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","Type" => "Upstream","Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Parents" => [{"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch"} 1048s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 1048s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 1048s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Differs" => 2,"Ix" => 0}],"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Type" => "Upstream","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943"} 1048s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 1048s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 1048s git-debrebase = Upstream {"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"}],"Type" => "Upstream","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083"} 1048s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 1048s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 1048s git-debrebase = Upstream {"Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Type" => "Upstream","Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","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}]} 1048s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1048s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1048s git-debrebase = Packaging {"Parents" => [{"Differs" => 48,"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","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","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Type" => "Packaging","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5"} 1048s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1048s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1048s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"}]} 1048s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1048s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1048s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1048s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1048s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1048s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1048s 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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","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}],"OrigParents" => [$VAR1->{"Parents"}[1]]} 1048s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 2 upp 4 proc 8 pm -1 1048s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1048s ' 1048s ++ git rev-parse HEAD 1048s + expect=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1048s + exec 1048s + local cid ctype info nparents 1048s + read cid ctype info 1048s + : ===== 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 Upstream ===== 1048s + test 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 = 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1048s + local cetype=Upstream 1048s + '[' xUpstream = xUpstream ']' 1048s + cetype=SAME 1048s ++ git log -n1 --pretty=format:%P 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1048s + local parents=61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1048s + expect=61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1048s + enparents=1 1048s + : Upstream/SAME 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1048s + case "$ctype/$cetype" in 1048s + case "$ctype/$etypes" in 1048s + case "$cetype" in 1048s + case "$ctype" in 1048s ++ printf %s 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1048s ++ wc -w 1048s + local cnparents=1 1048s + test 1 = 1 1048s ++ for f in $parents 1048s ++ echo 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1048s ++ wc -w 1048s ++ t-sort -u 1048s ++ LC_COLLATE=C 1048s ++ sort -u 1048s + local cndparents=1 1048s + test 1 = 1 1048s + case "$parents" in 1048s + case "$ctype" in 1048s + read cid ctype info 1048s + : ===== 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a Upstream ===== 1048s + test 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a = 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1048s + local cetype=Upstream 1048s + '[' xUpstream = xUpstream ']' 1048s + cetype=SAME 1048s ++ git log -n1 --pretty=format:%P 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1048s + local parents=677859b96829ce23dbcd8a3baa95a2353bc42da2 1048s + expect=677859b96829ce23dbcd8a3baa95a2353bc42da2 1048s + enparents=1 1048s + : Upstream/SAME 677859b96829ce23dbcd8a3baa95a2353bc42da2 1048s + case "$ctype/$cetype" in 1048s + case "$ctype/$etypes" in 1048s + case "$cetype" in 1048s + case "$ctype" in 1048s ++ printf %s 677859b96829ce23dbcd8a3baa95a2353bc42da2 1048s ++ wc -w 1048s + local cnparents=1 1048s + test 1 = 1 1048s ++ for f in $parents 1048s ++ echo 677859b96829ce23dbcd8a3baa95a2353bc42da2 1048s ++ wc -w 1048s ++ t-sort -u 1048s ++ LC_COLLATE=C 1048s ++ sort -u 1048s + local cndparents=1 1048s + test 1 = 1 1048s + case "$parents" in 1048s + case "$ctype" in 1048s + read cid ctype info 1048s + : ===== 677859b96829ce23dbcd8a3baa95a2353bc42da2 Upstream ===== 1048s + test 677859b96829ce23dbcd8a3baa95a2353bc42da2 = 677859b96829ce23dbcd8a3baa95a2353bc42da2 1048s + local cetype=Upstream 1048s + '[' xUpstream = xUpstream ']' 1048s + cetype=SAME 1048s ++ git log -n1 --pretty=format:%P 677859b96829ce23dbcd8a3baa95a2353bc42da2 1048s + local parents=f9ddccb3801445213b338eaa4f0d5881a35a84dc 1048s + expect=f9ddccb3801445213b338eaa4f0d5881a35a84dc 1048s + enparents=1 1048s + : Upstream/SAME f9ddccb3801445213b338eaa4f0d5881a35a84dc 1048s + case "$ctype/$cetype" in 1048s + case "$ctype/$etypes" in 1048s + case "$cetype" in 1048s + case "$ctype" in 1048s ++ printf %s f9ddccb3801445213b338eaa4f0d5881a35a84dc 1048s ++ wc -w 1048s + local cnparents=1 1048s + test 1 = 1 1048s ++ for f in $parents 1048s ++ echo f9ddccb3801445213b338eaa4f0d5881a35a84dc 1048s ++ wc -w 1048s ++ t-sort -u 1048s ++ LC_COLLATE=C 1048s ++ sort -u 1048s + local cndparents=1 1048s + test 1 = 1 1048s + case "$parents" in 1048s + case "$ctype" in 1048s + read cid ctype info 1048s + : ===== f9ddccb3801445213b338eaa4f0d5881a35a84dc Upstream ===== 1048s + test f9ddccb3801445213b338eaa4f0d5881a35a84dc = f9ddccb3801445213b338eaa4f0d5881a35a84dc 1048s + local cetype=Upstream 1048s + '[' xUpstream = xUpstream ']' 1048s + cetype=SAME 1048s ++ git log -n1 --pretty=format:%P f9ddccb3801445213b338eaa4f0d5881a35a84dc 1048s + local parents=97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1048s + expect=97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1048s + enparents=1 1048s + : Upstream/SAME 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1048s + case "$ctype/$cetype" in 1048s + case "$ctype/$etypes" in 1048s + case "$cetype" in 1048s + case "$ctype" in 1048s ++ printf %s 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1048s ++ wc -w 1048s + local cnparents=1 1048s + test 1 = 1 1048s ++ for f in $parents 1048s ++ echo 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1048s ++ wc -w 1048s ++ t-sort -u 1048s ++ LC_COLLATE=C 1048s ++ sort -u 1048s + local cndparents=1 1048s + test 1 = 1 1048s + case "$parents" in 1048s + case "$ctype" in 1048s + read cid ctype info 1048s + : ===== 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 Upstream ===== 1048s + test 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 = 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1048s + local cetype=Upstream 1048s + '[' xUpstream = xUpstream ']' 1048s + cetype=SAME 1048s ++ git log -n1 --pretty=format:%P 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1048s + local parents=e4eca65c490ba804c753f8fc1ef367ba07d51c08 1048s + expect=e4eca65c490ba804c753f8fc1ef367ba07d51c08 1048s + enparents=1 1048s + : Upstream/SAME e4eca65c490ba804c753f8fc1ef367ba07d51c08 1048s + case "$ctype/$cetype" in 1048s + case "$ctype/$etypes" in 1048s + case "$cetype" in 1048s + case "$ctype" in 1048s ++ printf %s e4eca65c490ba804c753f8fc1ef367ba07d51c08 1048s ++ wc -w 1048s + local cnparents=1 1048s + test 1 = 1 1048s ++ for f in $parents 1048s ++ echo e4eca65c490ba804c753f8fc1ef367ba07d51c08 1048s ++ wc -w 1048s ++ t-sort -u 1048s ++ LC_COLLATE=C 1048s ++ sort -u 1048s + local cndparents=1 1048s + test 1 = 1 1048s + case "$parents" in 1048s + case "$ctype" in 1048s + read cid ctype info 1048s + : ===== e4eca65c490ba804c753f8fc1ef367ba07d51c08 Packaging ===== 1048s + test e4eca65c490ba804c753f8fc1ef367ba07d51c08 = e4eca65c490ba804c753f8fc1ef367ba07d51c08 1048s + local cetype=Upstream 1048s + '[' xPackaging = xUpstream ']' 1048s ++ git log -n1 --pretty=format:%P e4eca65c490ba804c753f8fc1ef367ba07d51c08 1048s + local parents=8397762c3c6a31b895366f874e97ed0805b1939e 1048s + expect=8397762c3c6a31b895366f874e97ed0805b1939e 1048s + enparents=1 1048s + : Packaging/Upstream 8397762c3c6a31b895366f874e97ed0805b1939e 1048s + case "$ctype/$cetype" in 1048s + case "$ctype/$etypes" in 1048s + '[' xY:e4eca65c490ba804c753f8fc1ef367ba07d51c08 '!=' x ']' 1048s + test Y:e4eca65c490ba804c753f8fc1ef367ba07d51c08 = Y:e4eca65c490ba804c753f8fc1ef367ba07d51c08 1048s + bwtip= 1048s + case "$cetype" in 1048s + case "$ctype" in 1048s + git diff --quiet 8397762c3c6a31b895366f874e97ed0805b1939e..e4eca65c490ba804c753f8fc1ef367ba07d51c08 -- :. ':!debian' 1048s + git diff --quiet 8397762c3c6a31b895366f874e97ed0805b1939e..e4eca65c490ba804c753f8fc1ef367ba07d51c08 -- :debian/patches 1048s + etypes=Packaging 1048s ++ printf %s 8397762c3c6a31b895366f874e97ed0805b1939e 1048s ++ wc -w 1048s + local cnparents=1 1048s + test 1 = 1 1048s ++ for f in $parents 1048s ++ echo 8397762c3c6a31b895366f874e97ed0805b1939e 1048s ++ wc -w 1048s ++ t-sort -u 1048s ++ LC_COLLATE=C 1048s ++ sort -u 1048s + local cndparents=1 1048s + test 1 = 1 1048s + case "$parents" in 1048s + case "$ctype" in 1048s + read cid ctype info 1048s + : ===== 8397762c3c6a31b895366f874e97ed0805b1939e Changelog ===== 1048s + test 8397762c3c6a31b895366f874e97ed0805b1939e = 8397762c3c6a31b895366f874e97ed0805b1939e 1048s + local cetype=Packaging 1048s + '[' xChangelog = xPackaging ']' 1048s ++ git log -n1 --pretty=format:%P 8397762c3c6a31b895366f874e97ed0805b1939e 1048s + local parents=d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1048s + expect=d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1048s + enparents=1 1048s + : Changelog/Packaging d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1048s + case "$ctype/$cetype" in 1048s + case "$ctype/$etypes" in 1048s + case "$cetype" in 1048s + case "$ctype" in 1048s + git diff --quiet d640e62b152fddf68faaa04c9d3ca9ab8f417ca3..8397762c3c6a31b895366f874e97ed0805b1939e -- :. ':!debian/changelog' 1048s + etypes=Packaging 1048s ++ printf %s d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1048s ++ wc -w 1048s + local cnparents=1 1048s + test 1 = 1 1048s ++ for f in $parents 1048s ++ echo d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1048s ++ wc -w 1048s ++ t-sort -u 1048s ++ LC_COLLATE=C 1048s ++ sort -u 1048s + local cndparents=1 1048s + test 1 = 1 1048s + case "$parents" in 1048s + case "$ctype" in 1048s + read cid ctype info 1048s + : ===== d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 Changelog ===== 1048s + test d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 = d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1048s + local cetype=Packaging 1048s + '[' xChangelog = xPackaging ']' 1048s ++ git log -n1 --pretty=format:%P d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1048s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1048s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1048s + enparents=1 1048s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1048s + case "$ctype/$cetype" in 1048s + case "$ctype/$etypes" in 1048s + case "$cetype" in 1048s + case "$ctype" in 1048s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 -- :. ':!debian/changelog' 1048s + etypes=Packaging 1048s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1048s ++ wc -w 1048s + local cnparents=1 1048s + test 1 = 1 1048s ++ for f in $parents 1048s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1048s ++ wc -w 1048s ++ t-sort -u 1048s ++ LC_COLLATE=C 1048s ++ sort -u 1048s + local cndparents=1 1048s + test 1 = 1 1048s + case "$parents" in 1048s + case "$ctype" in 1048s + read cid ctype info 1048s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1048s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1048s + local cetype=Packaging 1048s + '[' xAnchor = xPackaging ']' 1048s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1048s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1048s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1048s + enparents=1 1048s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1048s + case "$ctype/$cetype" in 1048s + case "$ctype/$etypes" in 1048s + case "$cetype" in 1048s + case "$ctype" in 1048s + break 1048s + t-git-debrebase stitch 1048s + local gdr=git-debrebase 1048s + : ' 1048s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1048s + git-debrebase --dgit=dgit -D stitch 1048s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1048s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 1048s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 1048s git-debrebase = Upstream {"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Parents" => [{"Ix" => 0,"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Differs" => 2}],"Type" => "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","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe"} 1048s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 1048s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 1048s git-debrebase = Upstream {"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Ix" => 0}],"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","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b"} 1048s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 1048s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 1048s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Differs" => 2}],"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","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"} 1048s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 1048s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 1048s git-debrebase = Upstream {"Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"} 1048s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 1048s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 1048s 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","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Ix" => 0}],"Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830"} 1048s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1048s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1048s git-debrebase = Packaging {"Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","Type" => "Packaging","Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Ix" => 0,"Differs" => 48}],"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","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"} 1048s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1048s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1048s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Differs" => 16}],"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","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"} 1048s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1048s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1048s 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","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1048s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1048s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1048s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1048s 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" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1048s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1048s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1048s git-debrebase >= delete refs/ffq-prev/heads/master 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1048s git-debrebase >= update refs/debrebase-last/heads/master a0e76af573321d5714d63cd5c464d783da6b72b4 0000000000000000000000000000000000000000 1048s git-debrebase >= update HEAD a0e76af573321d5714d63cd5c464d783da6b72b4 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1048s git-debrebase >$ 1048s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1048s ' 1048s + t-gdr-good stitched 1048s + local state=stitched 1048s + local beforetag= 1048s + case $state in 1048s + git diff --quiet -- :. ':!debian/patches' 1048s + LC_MESSAGES=C 1048s + t-git-debrebase status 1048s + local gdr=git-debrebase 1048s + : ' 1048s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1048s + git-debrebase --dgit=dgit -D status 1048s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0 1048s git-debrebase get_differs 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x8 1048s git-debrebase classify a0e76af573321d5714d63cd5c464d783da6b72b4 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5/0 1c8e3b534eac1867c8911d4e5f923d5f7bcee275/0x8 1048s git-debrebase = Pseudomerge {"Contributor" => {"Differs" => 0,"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Ix" => 0},"Parents" => [$VAR1->{"Contributor"},{"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","Differs" => 8,"Ix" => 1}],"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","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","Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge","CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4"} 1048s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 1048s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 1048s git-debrebase = Upstream {"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a"}],"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","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Type" => "Upstream"} 1048s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 1048s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 1048s git-debrebase = Upstream {"Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Type" => "Upstream"} 1048s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 1048s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 1048s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1048s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 1048s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 1048s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Differs" => 2}],"Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Type" => "Upstream"} 1048s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 1048s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 1048s git-debrebase = Upstream {"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Type" => "Upstream","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Parents" => [{"Differs" => 2,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Ix" => 0}],"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"} 1048s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1048s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1048s git-debrebase = Packaging {"Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Differs" => 48,"Ix" => 0}],"Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","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","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"} 1048s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1048s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1048s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"} 1048s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1048s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1048s 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" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Type" => "Changelog"} 1048s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1048s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1048s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1048s 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","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"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"} 1048s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1048s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1048s ' 1048s + case $state in 1048s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 1048s branch contains furniture (not laundered) 1048s + egrep '^ stitched$' ../status.check 1048s stitched 1048s + t-gdr-good-analyse HEAD stitched 1048s + local head=HEAD 1048s + local state=stitched 1048s + local wsfx= 1048s + local etypes bwtip 1048s + case $state in 1048s + etypes=Pseudomerge-Upstream 1048s + anal=../anal 1048s + t-git-debrebase analyse HEAD 1048s + local gdr=git-debrebase 1048s + : ' 1048s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1048s + git-debrebase --dgit=dgit -D analyse HEAD 1048s git-debrebase *** WALK a0e76af573321d5714d63cd5c464d783da6b72b4 1 *main::STDOUT 1048s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0 1048s git-debrebase get_differs 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x8 1048s git-debrebase classify a0e76af573321d5714d63cd5c464d783da6b72b4 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5/0 1c8e3b534eac1867c8911d4e5f923d5f7bcee275/0x8 1048s git-debrebase = Pseudomerge {"CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Type" => "Pseudomerge","Parents" => [{"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Ix" => 0,"Differs" => 0},{"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","Ix" => 1,"Differs" => 8}],"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","Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe"} 1048s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 1048s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 1048s 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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a"}],"Type" => "Upstream","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5"} 1048s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 1048s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 1048s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"}],"Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream","CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch"} 1048s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 1048s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 1048s git-debrebase = Upstream {"Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"}],"Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Type" => "Upstream"} 1049s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 1049s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 1049s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Parents" => [{"Differs" => 2,"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Ix" => 0}]} 1049s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 1049s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 1049s git-debrebase = Upstream {"Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Ix" => 0}],"Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830"} 1049s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1049s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1049s git-debrebase = Packaging {"Type" => "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","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Ix" => 0,"Differs" => 48}]} 1049s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1049s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1049s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -r -D unstable\n","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Type" => "Changelog"} 1049s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1049s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1049s git-debrebase = Changelog {"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 1049s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1049s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1049s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1049s 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"},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1049s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 2 upp 5 proc 10 pm 0 1049s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1049s ' 1049s ++ git rev-parse HEAD 1049s + expect=a0e76af573321d5714d63cd5c464d783da6b72b4 1049s + exec 1049s + local cid ctype info nparents 1049s + read cid ctype info 1049s + : ===== a0e76af573321d5714d63cd5c464d783da6b72b4 Pseudomerge Contributor=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 ===== 1049s + test a0e76af573321d5714d63cd5c464d783da6b72b4 = a0e76af573321d5714d63cd5c464d783da6b72b4 1049s + local cetype=Pseudomerge 1049s + '[' xPseudomerge = xPseudomerge ']' 1049s + cetype=SAME 1049s ++ git log -n1 --pretty=format:%P a0e76af573321d5714d63cd5c464d783da6b72b4 1049s + local 'parents=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1049s + expect='3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1049s + enparents=1 1049s + : Pseudomerge/SAME '3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1049s + case "$ctype/$cetype" in 1049s + case "$ctype/$etypes" in 1049s + case "$cetype" in 1049s + case "$ctype" in 1049s + expect=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1049s + expect=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1049s + enparents=2 1049s + git diff --quiet 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5..a0e76af573321d5714d63cd5c464d783da6b72b4 1049s + etypes=Upstream 1049s + : 'reject pointless pseudomerges' 1049s + local 'overwritten= 1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1049s + overwritten=1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1049s + t-git-debrebase analyse 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1049s + local gdr=git-debrebase 1049s + : ' 1049s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1049s + git-debrebase --dgit=dgit -D analyse 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1049s git-debrebase *** WALK 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1 *main::STDOUT 1049s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0x36 1049s git-debrebase get_differs e76b40833a6827a6dda6f8583fb72ed7affa43da c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0 1049s git-debrebase classify 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 $t=c35a831ed16058cd02d5b26782482c07fdbe3b0a @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x36 e76b40833a6827a6dda6f8583fb72ed7affa43da/0 1049s git-debrebase = Pseudomerge {"Hdr" => "tree c35a831ed16058cd02d5b26782482c07fdbe3b0a\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nparent e76b40833a6827a6dda6f8583fb72ed7affa43da\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000006 +0000\n","CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","Overwritten" => [{"Differs" => 54,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Ix" => 0}],"Type" => "Pseudomerge","Msg" => "Record example (2.0-2+nmu1) in archive suite sid\n","Tree" => "c35a831ed16058cd02d5b26782482c07fdbe3b0a","Parents" => [$VAR1->{"Overwritten"}[0],{"Differs" => 0,"CommitId" => "e76b40833a6827a6dda6f8583fb72ed7affa43da","Ix" => 1}],"Contributor" => $VAR1->{"Parents"}[1]} 1049s git-debrebase get_differs 02a3797b3764d6d76e05ca0d881afa88c2b12430 c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0x2 1049s git-debrebase classify e76b40833a6827a6dda6f8583fb72ed7affa43da $t=c35a831ed16058cd02d5b26782482c07fdbe3b0a @p 02a3797b3764d6d76e05ca0d881afa88c2b12430/0x2 1049s git-debrebase = Upstream {"Tree" => "c35a831ed16058cd02d5b26782482c07fdbe3b0a","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "02a3797b3764d6d76e05ca0d881afa88c2b12430"}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","CommitId" => "e76b40833a6827a6dda6f8583fb72ed7affa43da","Hdr" => "tree c35a831ed16058cd02d5b26782482c07fdbe3b0a\nparent 02a3797b3764d6d76e05ca0d881afa88c2b12430\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000006 +0000\n","Type" => "Upstream"} 1049s git-debrebase get_differs 9831208f76656ac811c76b57017774de3ed7b1da 0ec7ae0689075193fd516c119e67ec1adbc0b968 = 0x2 1049s git-debrebase classify 02a3797b3764d6d76e05ca0d881afa88c2b12430 $t=0ec7ae0689075193fd516c119e67ec1adbc0b968 @p 9831208f76656ac811c76b57017774de3ed7b1da/0x2 1049s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 0ec7ae0689075193fd516c119e67ec1adbc0b968\nparent 9831208f76656ac811c76b57017774de3ed7b1da\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000006 +0000\n","CommitId" => "02a3797b3764d6d76e05ca0d881afa88c2b12430","Tree" => "0ec7ae0689075193fd516c119e67ec1adbc0b968","Parents" => [{"Ix" => 0,"CommitId" => "9831208f76656ac811c76b57017774de3ed7b1da","Differs" => 2}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch"} 1049s git-debrebase get_differs 156c10ffb534a1f5eafbadccb63eca4a26ce8b00 a23e6d130529f794fcb76ce8913d68adec691fcb = 0x2 1049s git-debrebase classify 9831208f76656ac811c76b57017774de3ed7b1da $t=a23e6d130529f794fcb76ce8913d68adec691fcb @p 156c10ffb534a1f5eafbadccb63eca4a26ce8b00/0x2 1049s git-debrebase = Upstream {"CommitId" => "9831208f76656ac811c76b57017774de3ed7b1da","Hdr" => "tree a23e6d130529f794fcb76ce8913d68adec691fcb\nparent 156c10ffb534a1f5eafbadccb63eca4a26ce8b00\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000006 +0000\n","Parents" => [{"CommitId" => "156c10ffb534a1f5eafbadccb63eca4a26ce8b00","Ix" => 0,"Differs" => 2}],"Tree" => "a23e6d130529f794fcb76ce8913d68adec691fcb","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 1049s git-debrebase get_differs 682d84eb05d2504821c98a0d135926a85f3476c5 ac14e7b566c102651f4279a83b03fbe091783ff9 = 0x2 1049s git-debrebase classify 156c10ffb534a1f5eafbadccb63eca4a26ce8b00 $t=ac14e7b566c102651f4279a83b03fbe091783ff9 @p 682d84eb05d2504821c98a0d135926a85f3476c5/0x2 1049s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "682d84eb05d2504821c98a0d135926a85f3476c5","Ix" => 0,"Differs" => 2}],"Tree" => "ac14e7b566c102651f4279a83b03fbe091783ff9","CommitId" => "156c10ffb534a1f5eafbadccb63eca4a26ce8b00","Hdr" => "tree ac14e7b566c102651f4279a83b03fbe091783ff9\nparent 682d84eb05d2504821c98a0d135926a85f3476c5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000006 +0000\n"} 1049s git-debrebase get_differs e5eb08492f31d817c6b9441907350bc6302882c8 ddb581efae7b5021b033468a6bd472f8ecbce423 = 0x2 1049s git-debrebase classify 682d84eb05d2504821c98a0d135926a85f3476c5 $t=ddb581efae7b5021b033468a6bd472f8ecbce423 @p e5eb08492f31d817c6b9441907350bc6302882c8/0x2 1049s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "ddb581efae7b5021b033468a6bd472f8ecbce423","Parents" => [{"CommitId" => "e5eb08492f31d817c6b9441907350bc6302882c8","Ix" => 0,"Differs" => 2}],"CommitId" => "682d84eb05d2504821c98a0d135926a85f3476c5","Hdr" => "tree ddb581efae7b5021b033468a6bd472f8ecbce423\nparent e5eb08492f31d817c6b9441907350bc6302882c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000006 +0000\n","Type" => "Upstream"} 1049s git-debrebase get_differs 6587c6c396e0002956dd3b151fe4b82e0bd7611c 6d28f15d394bda27c6a9a8961b2bc81fcf61e781 = 0x34 1049s git-debrebase get_differs 969f770a4ce0e44543c83f86bc52b1086e105a4f 6d28f15d394bda27c6a9a8961b2bc81fcf61e781 = 0x36 1049s git-debrebase classify e5eb08492f31d817c6b9441907350bc6302882c8 $t=6d28f15d394bda27c6a9a8961b2bc81fcf61e781 @p 6587c6c396e0002956dd3b151fe4b82e0bd7611c/0x34 969f770a4ce0e44543c83f86bc52b1086e105a4f/0x36 1049s git-debrebase = DgitImportUnpatched {"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","CommitId" => "e5eb08492f31d817c6b9441907350bc6302882c8","Hdr" => "tree 6d28f15d394bda27c6a9a8961b2bc81fcf61e781\nparent 6587c6c396e0002956dd3b151fe4b82e0bd7611c\nparent 969f770a4ce0e44543c83f86bc52b1086e105a4f\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000006 +0000\n","Type" => "DgitImportUnpatched","Parents" => [{"CommitId" => "6587c6c396e0002956dd3b151fe4b82e0bd7611c","IsOrigin" => 1,"IsDgitImport" => "orig","Ix" => 0,"Differs" => 52},{"Differs" => 54,"CommitId" => "969f770a4ce0e44543c83f86bc52b1086e105a4f","IsOrigin" => 1,"IsDgitImport" => "tarball","Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[0]],"Tree" => "6d28f15d394bda27c6a9a8961b2bc81fcf61e781","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"} 1049s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1049s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1049s 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","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Type" => "AddPatches"} 1049s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1049s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1049s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1049s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1049s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1049s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Type" => "Changelog"} 1049s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1049s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1049s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1049s git-debrebase = Pseudomerge {"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Overwritten" => [{"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Ix" => 1}],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge"} 1049s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1049s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1049s git-debrebase = Upstream {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0,"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","Type" => "Upstream"} 1049s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1049s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1049s git-debrebase = Upstream {"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","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0,"Differs" => 2}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c"} 1049s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1049s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1049s git-debrebase = Upstream {"Type" => "Upstream","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","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2}]} 1049s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1049s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1049s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1049s 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","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},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]]} 1049s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 4 upp 10 proc 18 pm 1 1049s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1049s ' 1049s + local ocid otype oinfo 1049s + read ocid otype oinfo 1049s + case "$otype" in 1049s + test xContributor=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 '!=' xContributor=e76b40833a6827a6dda6f8583fb72ed7affa43da 1049s ++ wc -w 1049s ++ printf %s '3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1049s + local cnparents=2 1049s + test 2 = 2 1049s ++ for f in $parents 1049s ++ echo 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1049s ++ for f in $parents 1049s ++ echo 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1049s ++ wc -w 1049s ++ t-sort -u 1049s ++ LC_COLLATE=C 1049s ++ sort -u 1049s + local cndparents=2 1049s + test 2 = 2 1049s + case "$parents" in 1049s + case "$ctype" in 1049s + read cid ctype info 1049s + : ===== 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 Upstream ===== 1049s + test 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 = 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1049s + local cetype=Upstream 1049s + '[' xUpstream = xUpstream ']' 1049s + cetype=SAME 1049s ++ git log -n1 --pretty=format:%P 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1049s + local parents=61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1049s + expect=61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1049s + enparents=1 1049s + : Upstream/SAME 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1049s + case "$ctype/$cetype" in 1049s + case "$ctype/$etypes" in 1049s + case "$cetype" in 1049s + case "$ctype" in 1049s ++ printf %s 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1049s ++ wc -w 1049s + local cnparents=1 1049s + test 1 = 1 1049s ++ for f in $parents 1049s ++ echo 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1049s ++ t-sort -u 1049s ++ wc -w 1049s ++ LC_COLLATE=C 1049s ++ sort -u 1049s + local cndparents=1 1049s + test 1 = 1 1049s + case "$parents" in 1049s + case "$ctype" in 1049s + read cid ctype info 1049s + : ===== 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a Upstream ===== 1049s + test 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a = 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1049s + local cetype=Upstream 1049s + '[' xUpstream = xUpstream ']' 1049s + cetype=SAME 1049s ++ git log -n1 --pretty=format:%P 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 1049s + local parents=677859b96829ce23dbcd8a3baa95a2353bc42da2 1049s + expect=677859b96829ce23dbcd8a3baa95a2353bc42da2 1049s + enparents=1 1049s + : Upstream/SAME 677859b96829ce23dbcd8a3baa95a2353bc42da2 1049s + case "$ctype/$cetype" in 1049s + case "$ctype/$etypes" in 1049s + case "$cetype" in 1049s + case "$ctype" in 1049s ++ printf %s 677859b96829ce23dbcd8a3baa95a2353bc42da2 1049s ++ wc -w 1049s + local cnparents=1 1049s + test 1 = 1 1049s ++ for f in $parents 1049s ++ echo 677859b96829ce23dbcd8a3baa95a2353bc42da2 1049s ++ wc -w 1049s ++ t-sort -u 1049s ++ LC_COLLATE=C 1049s ++ sort -u 1049s + local cndparents=1 1049s + test 1 = 1 1049s + case "$parents" in 1049s + case "$ctype" in 1049s + read cid ctype info 1049s + : ===== 677859b96829ce23dbcd8a3baa95a2353bc42da2 Upstream ===== 1049s + test 677859b96829ce23dbcd8a3baa95a2353bc42da2 = 677859b96829ce23dbcd8a3baa95a2353bc42da2 1049s + local cetype=Upstream 1049s + '[' xUpstream = xUpstream ']' 1049s + cetype=SAME 1049s ++ git log -n1 --pretty=format:%P 677859b96829ce23dbcd8a3baa95a2353bc42da2 1049s + local parents=f9ddccb3801445213b338eaa4f0d5881a35a84dc 1049s + expect=f9ddccb3801445213b338eaa4f0d5881a35a84dc 1049s + enparents=1 1049s + : Upstream/SAME f9ddccb3801445213b338eaa4f0d5881a35a84dc 1049s + case "$ctype/$cetype" in 1049s + case "$ctype/$etypes" in 1049s + case "$cetype" in 1049s + case "$ctype" in 1049s ++ printf %s f9ddccb3801445213b338eaa4f0d5881a35a84dc 1049s ++ wc -w 1049s + local cnparents=1 1049s + test 1 = 1 1049s ++ for f in $parents 1049s ++ echo f9ddccb3801445213b338eaa4f0d5881a35a84dc 1049s ++ t-sort -u 1049s ++ wc -w 1049s ++ LC_COLLATE=C 1049s ++ sort -u 1049s + local cndparents=1 1049s + test 1 = 1 1049s + case "$parents" in 1049s + case "$ctype" in 1049s + read cid ctype info 1049s + : ===== f9ddccb3801445213b338eaa4f0d5881a35a84dc Upstream ===== 1049s + test f9ddccb3801445213b338eaa4f0d5881a35a84dc = f9ddccb3801445213b338eaa4f0d5881a35a84dc 1049s + local cetype=Upstream 1049s + '[' xUpstream = xUpstream ']' 1049s + cetype=SAME 1049s ++ git log -n1 --pretty=format:%P f9ddccb3801445213b338eaa4f0d5881a35a84dc 1049s + local parents=97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1049s + expect=97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1049s + enparents=1 1049s + : Upstream/SAME 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1049s + case "$ctype/$cetype" in 1049s + case "$ctype/$etypes" in 1049s + case "$cetype" in 1049s + case "$ctype" in 1049s ++ printf %s 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1049s ++ wc -w 1049s + local cnparents=1 1049s + test 1 = 1 1049s ++ for f in $parents 1049s ++ echo 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1049s ++ t-sort -u 1049s ++ LC_COLLATE=C 1049s ++ sort -u 1049s ++ wc -w 1049s + local cndparents=1 1049s + test 1 = 1 1049s + case "$parents" in 1049s + case "$ctype" in 1049s + read cid ctype info 1049s + : ===== 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 Upstream ===== 1049s + test 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 = 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1049s + local cetype=Upstream 1049s + '[' xUpstream = xUpstream ']' 1049s + cetype=SAME 1049s ++ git log -n1 --pretty=format:%P 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 1049s + local parents=e4eca65c490ba804c753f8fc1ef367ba07d51c08 1049s + expect=e4eca65c490ba804c753f8fc1ef367ba07d51c08 1049s + enparents=1 1049s + : Upstream/SAME e4eca65c490ba804c753f8fc1ef367ba07d51c08 1049s + case "$ctype/$cetype" in 1049s + case "$ctype/$etypes" in 1049s + case "$cetype" in 1049s + case "$ctype" in 1049s ++ printf %s e4eca65c490ba804c753f8fc1ef367ba07d51c08 1049s ++ wc -w 1049s + local cnparents=1 1049s + test 1 = 1 1049s ++ for f in $parents 1049s ++ echo e4eca65c490ba804c753f8fc1ef367ba07d51c08 1049s ++ wc -w 1049s ++ t-sort -u 1049s ++ LC_COLLATE=C 1049s ++ sort -u 1049s + local cndparents=1 1049s + test 1 = 1 1049s + case "$parents" in 1049s + case "$ctype" in 1049s + read cid ctype info 1049s + : ===== e4eca65c490ba804c753f8fc1ef367ba07d51c08 Packaging ===== 1049s + test e4eca65c490ba804c753f8fc1ef367ba07d51c08 = e4eca65c490ba804c753f8fc1ef367ba07d51c08 1049s + local cetype=Upstream 1049s + '[' xPackaging = xUpstream ']' 1049s ++ git log -n1 --pretty=format:%P e4eca65c490ba804c753f8fc1ef367ba07d51c08 1049s + local parents=8397762c3c6a31b895366f874e97ed0805b1939e 1049s + expect=8397762c3c6a31b895366f874e97ed0805b1939e 1049s + enparents=1 1049s + : Packaging/Upstream 8397762c3c6a31b895366f874e97ed0805b1939e 1049s + case "$ctype/$cetype" in 1049s + case "$ctype/$etypes" in 1049s + '[' x '!=' x ']' 1049s + case "$cetype" in 1049s + case "$ctype" in 1049s + git diff --quiet 8397762c3c6a31b895366f874e97ed0805b1939e..e4eca65c490ba804c753f8fc1ef367ba07d51c08 -- :. ':!debian' 1049s + git diff --quiet 8397762c3c6a31b895366f874e97ed0805b1939e..e4eca65c490ba804c753f8fc1ef367ba07d51c08 -- :debian/patches 1049s + etypes=Packaging 1049s ++ printf %s 8397762c3c6a31b895366f874e97ed0805b1939e 1049s ++ wc -w 1049s + local cnparents=1 1049s + test 1 = 1 1049s ++ for f in $parents 1049s ++ echo 8397762c3c6a31b895366f874e97ed0805b1939e 1049s ++ t-sort -u 1049s ++ LC_COLLATE=C 1049s ++ sort -u 1049s ++ wc -w 1049s + local cndparents=1 1049s + test 1 = 1 1049s + case "$parents" in 1049s + case "$ctype" in 1049s + read cid ctype info 1049s + : ===== 8397762c3c6a31b895366f874e97ed0805b1939e Changelog ===== 1049s + test 8397762c3c6a31b895366f874e97ed0805b1939e = 8397762c3c6a31b895366f874e97ed0805b1939e 1049s + local cetype=Packaging 1049s + '[' xChangelog = xPackaging ']' 1049s ++ git log -n1 --pretty=format:%P 8397762c3c6a31b895366f874e97ed0805b1939e 1049s + local parents=d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1049s + expect=d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1049s + enparents=1 1049s + : Changelog/Packaging d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1049s + case "$ctype/$cetype" in 1049s + case "$ctype/$etypes" in 1049s + case "$cetype" in 1049s + case "$ctype" in 1049s + git diff --quiet d640e62b152fddf68faaa04c9d3ca9ab8f417ca3..8397762c3c6a31b895366f874e97ed0805b1939e -- :. ':!debian/changelog' 1049s + etypes=Packaging 1049s ++ printf %s d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1049s ++ wc -w 1049s + local cnparents=1 1049s + test 1 = 1 1049s ++ for f in $parents 1049s ++ echo d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1049s ++ t-sort -u 1049s ++ LC_COLLATE=C 1049s ++ sort -u 1049s ++ wc -w 1049s + local cndparents=1 1049s + test 1 = 1 1049s + case "$parents" in 1049s + case "$ctype" in 1049s + read cid ctype info 1049s + : ===== d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 Changelog ===== 1049s + test d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 = d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1049s + local cetype=Packaging 1049s + '[' xChangelog = xPackaging ']' 1049s ++ git log -n1 --pretty=format:%P d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 1049s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1049s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1049s + enparents=1 1049s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1049s + case "$ctype/$cetype" in 1049s + case "$ctype/$etypes" in 1049s + case "$cetype" in 1049s + case "$ctype" in 1049s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 -- :. ':!debian/changelog' 1049s + etypes=Packaging 1049s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1049s ++ wc -w 1049s + local cnparents=1 1049s + test 1 = 1 1049s ++ for f in $parents 1049s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1049s ++ wc -w 1049s ++ t-sort -u 1049s ++ LC_COLLATE=C 1049s ++ sort -u 1049s + local cndparents=1 1049s + test 1 = 1 1049s + case "$parents" in 1049s + case "$ctype" in 1049s + read cid ctype info 1049s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1049s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1049s + local cetype=Packaging 1049s + '[' xAnchor = xPackaging ']' 1049s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1049s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1049s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1049s + enparents=1 1049s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1049s + case "$ctype/$cetype" in 1049s + case "$ctype/$etypes" in 1049s + case "$cetype" in 1049s + case "$ctype" in 1049s + break 1049s + v=2.0-3 1049s + t-dch-commit -v 2.0-3 -m 'incorporate nmu' 1049s + t-debchange -v 2.0-3 -m 'incorporate nmu' 1049s + DEBEMAIL=dgit-tests@example.org 1049s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-3 -m 'incorporate nmu' 1049s + 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 1049s + git commit -m 'dch -v 2.0-3 -m incorporate nmu' debian/changelog 1049s [master 95f78a1] dch -v 2.0-3 -m incorporate nmu 1049s 1 file changed, 6 insertions(+) 1049s + t-dch-commit-r 1049s + t-dch-r-rune t-dch-commit 1049s + local cmd=t-dch-commit 1049s + shift 1049s + local suite=unstable 1049s + t-dch-commit -r -D unstable '' 1049s + t-debchange -r -D unstable '' 1049s + DEBEMAIL=dgit-tests@example.org 1049s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1049s + exec env TZ=UTC faketime -f 2018-06-26 08:00:09 env -u TZ /usr/bin/debchange -r -D unstable 1049s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1049s libdistro-info-perl is not installed, Debian release names are not known. 1049s libdistro-info-perl is not installed, Ubuntu release names are not known. 1049s + git commit -m 'dch -r -D unstable ' debian/changelog 1049s [master 64bcb7d] dch -r -D unstable 1049s 1 file changed, 1 insertion(+), 1 deletion(-) 1049s + t-dgit -wgf push-source 1049s + local dgit=dgit 1049s + pwd 1049s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1049s + : ' 1049s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1049s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source 1049s | git rev-parse --show-toplevel 1049s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1049s | git config -z --get-regexp --local '.*' 1049s | git config -z --get-regexp --local '.*' 1049s | git config -z --get-regexp --global '.*' 1049s | git config -z --get-regexp --system '.*' 1049s format 3.0 (quilt), quilt mode linear 1049s Format `3.0 (quilt)', need to check/update patch stack 1049s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1049s => `' 1049s + git diff --quiet HEAD 1049s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1049s canonical suite name for unstable is sid 1049s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1049s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1049s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1049s | git rev-parse 'HEAD~0' 1049s => `64bcb7d55956b0e3ebe624bf9040a976b183e414' 1049s | git symbolic-ref -q HEAD 1049s => `refs/heads/master' 1049s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1049s CD work 1049s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1049s + git reset -q --hard 64bcb7d55956b0e3ebe624bf9040a976b183e414 1049s examining quilt state (multiple patches, linear mode) 1049s branch_is_gdr 64bcb7d55956b0e3ebe624bf9040a976b183e414... 1049s branch_is_gdr a0e76af573321d5714d63cd5c464d783da6b72b4 gdr pseudomerge YES 1049s + git reset -q --hard 64bcb7d55956b0e3ebe624bf9040a976b183e414 1049s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1050s HEAD is now at 4b8c76d Commit patch queue (exported by git-debrebase) 1050s | git rev-parse 'HEAD~0' 1050s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1050s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1050s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1050s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1050s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1050s CD fake 1050s | find -name .git -prune -print0 1050s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1050s + git checkout -f 4b8c76d051e32cfd5c0f423504742148ed9e07a4 -- debian 1050s + git add -Af . 1050s | git write-tree 1050s => `bfd118a0d0c903dd1034a01f06ec8634a45837c9' 1050s fake orig tree object bfd118a0d0c903dd1034a01f06ec8634a45837c9 1050s CD .. 1050s + git reset -q --hard 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1050s CD ../fake 1050s + git add -Af . 1050s | git write-tree 1050s => `3646aeb322533be919f218f7670519af795187ec' 1050s fake o+d/p tree object bfd118a0d0c903dd1034a01f06ec8634a45837c9 1050s CD ../work 1050s | git ls-tree --name-only -z 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1050s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1050s | git diff-tree -z --no-renames -r bfd118a0d0c903dd1034a01f06ec8634a45837c9 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1050s => `: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' 1050s quiltify_trees_differ bfd118a0d0c903dd1034a01f06ec8634a45837c9 4b8c76d051e32cfd5c0f423504742148ed9e07a4 => 1 1050s | git diff-tree -z --no-renames --name-only -r 4b8c76d051e32cfd5c0f423504742148ed9e07a4 3646aeb322533be919f218f7670519af795187ec 1050s => `' 1050s quiltify_trees_differ 4b8c76d051e32cfd5c0f423504742148ed9e07a4 3646aeb322533be919f218f7670519af795187ec => 0 1050s | git diff-tree -z --no-renames --name-only -r bfd118a0d0c903dd1034a01f06ec8634a45837c9 3646aeb322533be919f218f7670519af795187ec 1050s => `lib.c\x00new-upstream-file\x00src.c\x00' 1050s quiltify_trees_differ bfd118a0d0c903dd1034a01f06ec8634a45837c9 3646aeb322533be919f218f7670519af795187ec => 1 1050s differences @dl ## ## == == == ==. 1050s dgit: base trees orig=bfd118a0d0c903dd1034 o+d/p=3646aeb322533be919f2 1050s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1050s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1050s starting quiltify (multiple patches, linear mode) 1050s | git ls-tree --name-only 4b8c76d051e32cfd5c0f423504742148ed9e07a4 -- debian/rules debian/control 1050s => `debian/control'... 1050s quiltify investigate 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1050s | git diff-tree -z --no-renames --name-only 4b8c76d051e32cfd5c0f423504742148ed9e07a4 3646aeb322533be919f218f7670519af795187ec 1050s => `' 1050s quiltify_trees_differ 4b8c76d051e32cfd5c0f423504742148ed9e07a4 3646aeb322533be919f218f7670519af795187ec => 0 1050s search finished hooray! 1050s quiltify linearisation planning successful, executing... 1050s + git checkout -q master 1050s | git status --ignored --porcelain 1050s => `?? .pc/' 1050s nothing quilty to commit, ok. 1050s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1050s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1050s | git rev-parse 'HEAD~0' 1050s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1050s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1050s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1050s CD work 1050s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1050s + git reset -q --hard 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1050s CD .. 1050s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1050s dpkg-source: info: using source format '3.0 (quilt)' 1050s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1050s dpkg-source: info: using patch list from debian/patches/series 1050s dpkg-source: info: building example in example_2.0-3.debian.tar.xz 1050s dpkg-source: info: building example in example_2.0-3.dsc 1050s CD work 1050s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1050s changelog will contain changes since 2.0-2+nmu1 1050s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-3_source.changes dpkg-genchanges -S '-v2.0-2+nmu1' 1050s dpkg-genchanges: info: not including original source code in upload 1050s CD .. 1050s moving example_2.0-3.dsc, example_2.0-3_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1050s renaming (Files) example_2.0.orig.tar.gz 1050s renaming (Files) example_2.0-3.debian.tar.xz 1050s renaming (dsc) example_2.0-3.dsc 1050s renaming (changes) example_2.0-3_source.changes 1050s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1050s actually entering push 1050s query: fetching http://127.0.0.1:46301/example.git/HEAD... 1050s dgit-repos check_for_git => 1. 1050s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1050s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1050s git_lrfetch_sane iteration 0 1050s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1051s => 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit/sid 1051s => fef4abd7f57b33d60ca1a8539604aea0d854328b refs/tags/archive/test-dummy/2.0-1 1051s => c9f0c7241f3ae8094eced5e523351ff658872f89 refs/tags/archive/test-dummy/2.0-2 1051s => d433645978da1daa8e72318c1dd5353dc0e3ce71 refs/tags/test-dummy/2.0-1 1051s => 7552395cff8db2ee1364171a417465c663fe49fe refs/tags/test-dummy/2.0-2 1051s 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 1051s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1051s | git for-each-ref refs/dgit-fetch/test-dummy 1051s |> 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit refs/dgit-fetch/test-dummy/dgit/sid 1051s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1051s |> c9f0c7241f3ae8094eced5e523351ff658872f89 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1051s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1051s |> 7552395cff8db2ee1364171a417465c663fe49fe tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1051s git_lrfetch_sane: tidying any old suite lrfetchrefs 1051s | git for-each-ref refs/dgit-fetch/sid 1051s git_lrfetch_sane: git fetch --no-insane emulation complete 1051s $VAR1 = { 1051s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => 'fef4abd7f57b33d60ca1a8539604aea0d854328b', 1051s 'refs/dgit-fetch/test-dummy/dgit/sid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1051s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => '7552395cff8db2ee1364171a417465c663fe49fe', 1051s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => 'c9f0c7241f3ae8094eced5e523351ff658872f89', 1051s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'd433645978da1daa8e72318c1dd5353dc0e3ce71' 1051s }; 1051s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1051s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/tags/archive/test-dummy/2.0-1 1051s currently refs/tags/archive/test-dummy/2.0-1=fef4abd7f57b33d60ca1a8539604aea0d854328b 1051s |> c9f0c7241f3ae8094eced5e523351ff658872f89 tag refs/tags/archive/test-dummy/2.0-2 1051s currently refs/tags/archive/test-dummy/2.0-2=c9f0c7241f3ae8094eced5e523351ff658872f89 1051s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/tags/test-dummy/2.0-1 1051s currently refs/tags/test-dummy/2.0-1=d433645978da1daa8e72318c1dd5353dc0e3ce71 1051s |> 7552395cff8db2ee1364171a417465c663fe49fe tag refs/tags/test-dummy/2.0-2 1051s currently refs/tags/test-dummy/2.0-2=7552395cff8db2ee1364171a417465c663fe49fe 1051s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1051s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1051s offered refs/tags/archive/test-dummy/2.0-1=fef4abd7f57b33d60ca1a8539604aea0d854328b 1051s |> c9f0c7241f3ae8094eced5e523351ff658872f89 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1051s offered refs/tags/archive/test-dummy/2.0-2=c9f0c7241f3ae8094eced5e523351ff658872f89 1051s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1051s offered refs/tags/test-dummy/2.0-1=d433645978da1daa8e72318c1dd5353dc0e3ce71 1051s |> 7552395cff8db2ee1364171a417465c663fe49fe tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1051s offered refs/tags/test-dummy/2.0-2=7552395cff8db2ee1364171a417465c663fe49fe 1051s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1051s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.0-2+nmu1.dsc... 1051s get_archive_dsc: Version 2.0-2+nmu1 1051s last upload to archive: NO git hash 1051s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1051s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1051s previous reference hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1051s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1051s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1051s fetch_from_archive: lastfetch=1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1051s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1051s considering reusing example_2.0.orig.tar.gz: (No such file or directory) linked. 1051s using existing example_2.0.orig.tar.gz 1051s considering saving example_2.0.orig.tar.gz: (File exists) no need. 1051s considering reusing example_2.0-2+nmu1.debian.tar.xz: (No such file or directory) linked. 1051s using existing example_2.0-2+nmu1.debian.tar.xz 1051s considering saving example_2.0-2+nmu1.debian.tar.xz: (File exists) no need. 1051s import considering example_2.0.orig.tar.gz Y .gz orig 1051s + chmod -R '+rwX' _unpack-tar 1051s CD _unpack-tar 1051s | find -name .git -prune -print0 1051s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1051s + git add -Af . 1051s | git write-tree 1051s => `e24142d5bb711d7b480f1e58dfc3e8c461c6e106' 1051s | git ls-tree -z e24142d5bb711d7b480f1e58dfc3e8c461c6e106 1051s => `040000 tree bdaae868b00952ee2af5782628959ae01469b2e3\x09example-2.0\x00' 1051s one subtree bdaae868b00952ee2af5782628959ae01469b2e3 1051s CD .. 1051s import considering example_2.0-2+nmu1.debian.tar.xz Y .xz (none) 1051s + chmod -R '+rwX' _unpack-tar 1051s CD _unpack-tar 1051s | find -name .git -prune -print0 1051s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1051s + git add -Af . 1051s | git write-tree 1051s => `f423a4033bb213dc3f6479fa9fe8938121cd3bb5' 1051s | git ls-tree -z f423a4033bb213dc3f6479fa9fe8938121cd3bb5 1051s => `040000 tree 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54\x09debian\x00' 1051s one subtree 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54 1051s CD .. 1051s + dpkg-source --no-check --skip-patches -x -- example.dsc 1051s dpkg-source: info: extracting example in example-2.0 1051s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1051s dpkg-source: info: unpacking example_2.0-2+nmu1.debian.tar.xz 1051s CD example-2.0 1051s | find -name .git -prune -print0 1051s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1051s + git add -Af . 1051s | git write-tree 1051s => `6d28f15d394bda27c6a9a8961b2bc81fcf61e781' 1051s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1051s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1051s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1051s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 1051s + git add -Af . 1051s | git write-tree 1051s => `c35a831ed16058cd02d5b26782482c07fdbe3b0a' 1051s import clog search... 1051s | dpkg-parsechangelog --format rfc822 --all 1051s import clog 2.0-2+nmu1 package changelog, entry no.1... 1051s import clog 2.0-2+nmu1 vs 2.0... 1051s import clog 2.0-2+nmu1 becomes r1 1051s import clog 2.0-2 package changelog, entry no.2... 1051s import clog 2.0-2 vs 2.0... 1051s import clog 2.0-2 becomes r1 1051s import clog 2.0-1 package changelog, entry no.3... 1051s import clog 2.0-1 vs 2.0... 1051s import clog 2.0-1 becomes r1 1051s import clog 1.0-1 package changelog, entry no.4... 1051s import clog 1.0-1 vs 2.0... 1051s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 1051s => `1530000006 +0000' 1051s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1051s => `1530000000 +0000' 1051s import tartrees authline dgit test git user 1530000006 +0000 1051s import tartrees r1authline dgit test git user 1530000000 +0000 1051s import tartree example_2.0.orig.tar.gz bdaae868b00952ee2af5782628959ae01469b2e3 1051s | git hash-object -w -t commit --stdin 1051s => 6587c6c396e0002956dd3b151fe4b82e0bd7611c 1051s import tartree example_2.0-2+nmu1.debian.tar.xz 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54 1051s | git hash-object -w -t commit --stdin 1051s => 969f770a4ce0e44543c83f86bc52b1086e105a4f 1051s import main commit 1051s | git hash-object -w -t commit ../commit.tmp 1051s => `e5eb08492f31d817c6b9441907350bc6302882c8' 1051s import apply patches... 1051s | git hash-object -w -t commit --stdin 1051s => e9f96320b1318ff6811938626ebe0fc74d4f5555 1051s + git checkout -q -b dapplied e9f96320b1318ff6811938626ebe0fc74d4f5555 1051s + git checkout -q -b unpa e5eb08492f31d817c6b9441907350bc6302882c8 1051s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 1051s => `1530000006 +0000' 1051s + git checkout -q unpa 1051s + git update-ref -d refs/heads/patch-queue/unpa 1051s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 1051s | git rev-parse 'HEAD~0' 1051s => `e76b40833a6827a6dda6f8583fb72ed7affa43da' 1051s | git rev-parse HEAD: 1051s => `c35a831ed16058cd02d5b26782482c07fdbe3b0a' 1051s synthesised git commit from .dsc 2.0-2+nmu1 1051s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:debian/changelog 1051s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1051s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 1c8e3b534eac1867c8911d4e5f923d5f7bcee275:debian/changelog 1051s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob e76b40833a6827a6dda6f8583fb72ed7affa43da:debian/changelog 1051s | git merge-base 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1051s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1051s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 1051s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1051s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 1051s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1051s fetch mergeinfos: 1051s commit 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 dgit client's archive history view 1051s fetch hash=1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1051s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1051s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1051s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1051s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1051s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1051s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1051s | git merge-base 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1051s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1051s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 1051s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1051s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 1051s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1051s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1051s | git log -n2 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1051s => `commit 1c8e3b534eac1867c8911d4e5f923d5f7bcee275'... 1051s | git ls-tree -lrz -- 1c8e3b534eac1867c8911d4e5f923d5f7bcee275: 1051s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1051s + git check-ref-format archive/test-dummy/2.0-3 1051s | git symbolic-ref -q HEAD 1051s => `refs/heads/master' 1051s | git rev-parse 'HEAD~0' 1051s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1051s ffq_prev_branchinfo branch current refs/heads/master 1051s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1051s => `' 1051s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1051s => `a0e76af573321d5714d63cd5c464d783da6b72b4' 1051s | git merge-base a0e76af573321d5714d63cd5c464d783da6b72b4 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1051s => `a0e76af573321d5714d63cd5c464d783da6b72b4' 1051s | git rev-parse 'a0e76af573321d5714d63cd5c464d783da6b72b4~0' 1051s => `a0e76af573321d5714d63cd5c464d783da6b72b4' 1051s | git rev-parse 'a0e76af573321d5714d63cd5c464d783da6b72b4~0' 1051s => `a0e76af573321d5714d63cd5c464d783da6b72b4' 1051s | git status --ignored --porcelain 1051s => `' 1051s nothing quilty to commit, ok. 1051s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1051s => `' 1051s + git diff --quiet HEAD 1051s | git merge-base 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1051s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1051s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 1051s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1051s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 1051s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 1051s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-3' 1051s => `' 1051s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1051s checking that example_2.0-3.dsc corresponds to HEAD 1051s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-3.dsc 1051s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-3.dsc) 1051s dpkg-source: info: extracting example in example-2.0 1051s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1051s dpkg-source: info: unpacking example_2.0-3.debian.tar.xz 1051s dpkg-source: info: using patch list from debian/patches/series 1051s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1051s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1051s dpkg-source: info: applying subdir/addnewups 1051s dpkg-source: info: applying upstream-edit-src.c-.patch 1051s dpkg-source: info: applying mixed-add-both-.patch 1051s CD example-2.0 1051s | find -name .git -prune -print0 1051s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1052s + git add -Af . 1052s | git write-tree 1052s => `3646aeb322533be919f218f7670519af795187ec' 1052s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1052s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1052s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1052s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1052s + git diff --quiet 3646aeb322533be919f218f7670519af795187ec 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1052s files_compare_inputs example_2.0-3.dsc 1052s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 1052s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1052s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 example_2.0-3.debian.tar.xz 1052s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 1052s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1052s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 example_2.0-3.debian.tar.xz 1052s files_compare_inputs example_2.0-3.dsc Files 1052s files_compare_inputs example_2.0-3.dsc Files example_2.0.orig.tar.gz 1052s files_compare_inputs example_2.0-3.dsc Files example_2.0-3.debian.tar.xz 1052s files_compare_inputs example_2.0-3_source.changes 1052s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 1052s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 example_2.0-3.dsc 1052s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 example_2.0-3.debian.tar.xz 1052s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 1052s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 example_2.0-3.dsc 1052s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 example_2.0-3.debian.tar.xz 1052s files_compare_inputs example_2.0-3_source.changes Files 1052s files_compare_inputs example_2.0-3_source.changes Files example_2.0-3.dsc 1052s files_compare_inputs example_2.0-3_source.changes Files example_2.0-3.debian.tar.xz 1052s checking origs needed (2.0)... 1052s checking origs needed placement 'devel extra'... 1052s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1052s origs example_2.0.orig.tar.gz is_orig 1052s -| sh -ec 'cd "$1"; shift 1052s 1052s find -name "$1" -print0 | 1052s xargs -0r sha256sum 1052s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1052s | 0e1bd42ce3bea52885dcc33e1deaea0259dd4088494c1ecdfa4c50fbea0aceb2 ./pool/main/example_2.0.orig.tar.gz 1052s origs example_2.0.orig.tar.gz $#$have=0 1052s origs example_2.0.orig.tar.gz f.same=1 #f._differ=-1 1052s origs example_2.0-3.debian.tar.xz | 61dcee8c39efb050e048cd775e4e468f 1544 example_2.0-3.debian.tar.xz 1052s ../example_2.0-3_source.changes already has appropriate .orig(s) (if any) 1052s push_tagwants: $VAR1 = [ 1052s '2.0-3', 1052s '4b8c76d051e32cfd5c0f423504742148ed9e07a4', 1052s undef, 1052s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1052s ]; 1052s $VAR2 = [ 1052s { 1052s 'TagFn' => sub { "DUMMY" }, 1052s 'Tfn' => sub { "DUMMY" }, 1052s 'View' => 'dgit', 1052s 'Objid' => '4b8c76d051e32cfd5c0f423504742148ed9e07a4', 1052s 'TfSuffix' => '', 1052s 'Tag' => 'archive/test-dummy/2.0-3' 1052s }, 1052s { 1052s 'View' => 'dgit', 1052s 'TagFn' => sub { "DUMMY" }, 1052s 'Tfn' => sub { "DUMMY" }, 1052s 'TfSuffix' => '-dgit', 1052s 'Objid' => '4b8c76d051e32cfd5c0f423504742148ed9e07a4', 1052s 'Tag' => 'test-dummy/2.0-3' 1052s } 1052s ]; 1052s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:09 +0000' 1052s => `1530000009 +0000' 1052s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1052s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1052s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1052s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1052s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1052s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1052s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1052s => `4b415ea11732c6a30e468ffac10bb508d138eb95' 1052s + git verify-tag 4b415ea11732c6a30e468ffac10bb508d138eb95 1052s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1052s gpg: Signature made Mon Mar 31 23:04:42 2025 UTC 1052s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1052s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1052s gpg: WARNING: This key is not certified with a trusted signature! 1052s gpg: There is no indication that the signature belongs to the owner. 1052s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1052s + git update-ref refs/tags/archive/test-dummy/2.0-3 4b415ea11732c6a30e468ffac10bb508d138eb95 1052s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1052s => `28673b3f3ba3f6fee075205c53ceb386e2ac89f6' 1052s + git verify-tag 28673b3f3ba3f6fee075205c53ceb386e2ac89f6 1052s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1052s gpg: Signature made Mon Mar 31 23:04:42 2025 UTC 1052s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1052s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1052s gpg: WARNING: This key is not certified with a trusted signature! 1052s gpg: There is no indication that the signature belongs to the owner. 1052s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1052s + git update-ref refs/tags/test-dummy/2.0-3 28673b3f3ba3f6fee075205c53ceb386e2ac89f6 1052s query: fetching http://127.0.0.1:46301/example.git/HEAD... 1052s dgit-repos check_for_git => 1. 1052s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 4b8c76d051e32cfd5c0f423504742148ed9e07a4:refs/dgit/sid refs/tags/archive/test-dummy/2.0-3 refs/tags/test-dummy/2.0-3 1052s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1052s 6b22dd5..4b8c76d 4b8c76d051e32cfd5c0f423504742148ed9e07a4 -> refs/dgit/sid 1052s * [new tag] archive/test-dummy/2.0-3 -> archive/test-dummy/2.0-3 1052s * [new tag] test-dummy/2.0-3 -> test-dummy/2.0-3 1052s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1052s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-3_source.changes 1052s signfile dsc ../example_2.0-3.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1052s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1052s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1052s 1052s fixup_changes dsc ../example_2.0-3.dsc ../example_2.0-3_source.changes 1052s signfile changes ../example_2.0-3_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1052s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1052s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1052s 1052s Successfully signed dsc, changes files 1052s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-3_source.changes 1053s gpg: ../example_2.0-3_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1053s gpg: ../example_2.0-3.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1053s D: Setting host argument. 1053s Checking signature on .changes 1053s Checking signature on .dsc 1053s Uploading to test-dummy (via local to localhost): 1053s Successfully uploaded packages. 1053s dgit ok: pushed and uploaded 2.0-3 1053s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1053s del_lrfetchrefs... 1053s del_lrfetchrefs: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit-fetch/test-dummy/dgit/sid 1053s del_lrfetchrefs: fef4abd7f57b33d60ca1a8539604aea0d854328b refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1053s del_lrfetchrefs: c9f0c7241f3ae8094eced5e523351ff658872f89 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1053s del_lrfetchrefs: d433645978da1daa8e72318c1dd5353dc0e3ce71 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1053s del_lrfetchrefs: 7552395cff8db2ee1364171a417465c663fe49fe refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1053s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1053s ' 1053s + : 'now test a new upstream' 1053s + t-make-new-upstream-tarball 2.1 1053s + local uv=2.1 1053s + git checkout make-upstream 1053s Switched to branch 'make-upstream' 1053s + echo 'upstream 2.1' 1053s + git commit -a -m 'upstream 2.1 tarball' 1053s [make-upstream eb18467] upstream 2.1 tarball 1053s 1 file changed, 1 insertion(+) 1053s + t-make-orig example 2.1 make-upstream 1053s + local p=example 1053s + local v=2.1 1053s + local tag=make-upstream 1053s + ust=example_2.1.orig.tar.gz 1053s + GZIP=-1 1053s + git archive -o ../example_2.1.orig.tar.gz --prefix=example-2.1/ make-upstream 1053s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1053s + git checkout master 1053s Switched to branch 'master' 1053s Your branch is ahead of 'origin/master' by 21 commits. 1053s (use "git push" to publish your local commits) 1053s + v=2.1-0+nmu1 1053s + t-nmu-upload-1 nmu2 1053s + t-git-next-date 1053s + GIT_COMMITTER_DATE='1530000010 +0100' 1053s + GIT_AUTHOR_DATE='1530000010 +0100' 1053s + nmubranch=nmu2 1053s + git checkout -f -b nmu2 1053s Switched to a new branch 'nmu2' 1053s + t-git-debrebase 1053s + local gdr=git-debrebase 1053s + : ' 1053s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1053s + git-debrebase --dgit=dgit -D 1053s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu2 1053s git-debrebase ffq check_specs * 1053s git-debrebase *** WALK 4b8c76d051e32cfd5c0f423504742148ed9e07a4 0 - 1053s git-debrebase get_differs 64bcb7d55956b0e3ebe624bf9040a976b183e414 3646aeb322533be919f218f7670519af795187ec = 0x4 1053s git-debrebase classify 4b8c76d051e32cfd5c0f423504742148ed9e07a4 $t=3646aeb322533be919f218f7670519af795187ec @p 64bcb7d55956b0e3ebe624bf9040a976b183e414/0x4 1053s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Tree" => "3646aeb322533be919f218f7670519af795187ec","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414"}],"CommitId" => "4b8c76d051e32cfd5c0f423504742148ed9e07a4","Hdr" => "tree 3646aeb322533be919f218f7670519af795187ec\nparent 64bcb7d55956b0e3ebe624bf9040a976b183e414\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "AddPatches"} 1053s git-debrebase get_differs 95f78a1ec281f58eba538b9baef816d74e131c60 588d548f5ba959c551704087c40f106f9f6369af = 0x10 1053s git-debrebase classify 64bcb7d55956b0e3ebe624bf9040a976b183e414 $t=588d548f5ba959c551704087c40f106f9f6369af @p 95f78a1ec281f58eba538b9baef816d74e131c60/0x10 1053s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Tree" => "588d548f5ba959c551704087c40f106f9f6369af","Parents" => [{"Differs" => 16,"CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Ix" => 0}],"Hdr" => "tree 588d548f5ba959c551704087c40f106f9f6369af\nparent 95f78a1ec281f58eba538b9baef816d74e131c60\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Type" => "Changelog"} 1053s git-debrebase get_differs a0e76af573321d5714d63cd5c464d783da6b72b4 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f = 0x10 1053s git-debrebase classify 95f78a1ec281f58eba538b9baef816d74e131c60 $t=7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f @p a0e76af573321d5714d63cd5c464d783da6b72b4/0x10 1053s git-debrebase = Changelog {"Tree" => "7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f","Msg" => "dch -v 2.0-3 -m incorporate nmu\n","Type" => "Changelog","Hdr" => "tree 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f\nparent a0e76af573321d5714d63cd5c464d783da6b72b4\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Parents" => [{"CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Ix" => 0,"Differs" => 16}]} 1053s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0 1053s git-debrebase get_differs 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x8 1053s git-debrebase classify a0e76af573321d5714d63cd5c464d783da6b72b4 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5/0 1c8e3b534eac1867c8911d4e5f923d5f7bcee275/0x8 1053s git-debrebase = Pseudomerge {"Parents" => [{"Ix" => 0,"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Differs" => 0},{"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","Ix" => 1,"Differs" => 8}],"CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5\nparent 1c8e3b534eac1867c8911d4e5f923d5f7bcee275\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Contributor" => $VAR1->{"Parents"}[0],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe"} 1053s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 1053s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 1053s git-debrebase = Upstream {"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Type" => "Upstream","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Differs" => 2}]} 1053s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 1053s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 1053s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Parents" => [{"Differs" => 2,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Ix" => 0}],"Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch"} 1053s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 1053s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 1053s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Differs" => 2}]} 1053s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 1053s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 1053s git-debrebase = Upstream {"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}],"Type" => "Upstream","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n"} 1053s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 1053s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 1053s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Differs" => 2}],"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"} 1053s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1053s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1053s git-debrebase = Packaging {"Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","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","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Differs" => 48,"Ix" => 0,"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"}]} 1053s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1053s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1053s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Ix" => 0}],"Type" => "Changelog","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n"} 1053s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1053s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1053s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","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"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1053s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1053s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1053s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1053s 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","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 1053s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 4 upp 6 proc 14 pm 0 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1053s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 15 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1053s git-debrebase WALK BUILD d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 Debian (rewriting=0) 1053s git-debrebase WALK BUILD 8397762c3c6a31b895366f874e97ed0805b1939e Debian (rewriting=0) 1053s git-debrebase WALK BUILD e4eca65c490ba804c753f8fc1ef367ba07d51c08 Debian (rewriting=0) 1053s git-debrebase WALK BUILD 95f78a1ec281f58eba538b9baef816d74e131c60 Debian (rewriting=0) 1053s git-debrebase WALK REWRITING NOW cl=HASH(0x2456e3c9c78) procd=HASH(0x2456e47c5d8) 1053s git-debrebase WALK BUILD 64bcb7d55956b0e3ebe624bf9040a976b183e414 Debian (rewriting=1) 1053s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1053s git-debrebase WALK BUILD 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 Upstream (rewriting=1) 1053s git-debrebase WALK BUILD f9ddccb3801445213b338eaa4f0d5881a35a84dc Upstream (rewriting=1) 1053s git-debrebase WALK BUILD 677859b96829ce23dbcd8a3baa95a2353bc42da2 Upstream (rewriting=1) 1053s git-debrebase WALK BUILD 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a Upstream (rewriting=1) 1053s git-debrebase WALK BUILD 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 Upstream (rewriting=1) 1053s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1053s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1053s git-debrebase get_differs 1730142aa2f160b263adae4ebebd0b03e88e65db 4b8c76d051e32cfd5c0f423504742148ed9e07a4 = 0x4 1053s git-debrebase *** WALK RETURN 1730142aa2f160b263adae4ebebd0b03e88e65db 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1053s git-debrebase: laundered (head was 4b8c76d051e32cfd5c0f423504742148ed9e07a4) 1053s git-debrebase >= update refs/ffq-prev/heads/nmu2 4b8c76d051e32cfd5c0f423504742148ed9e07a4 0000000000000000000000000000000000000000 1053s git-debrebase >= delete refs/debrebase-last/heads/nmu2 1053s git-debrebase >= update HEAD 1730142aa2f160b263adae4ebebd0b03e88e65db 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1053s git-debrebase >$ 1053s Recorded previous head for preservation 1053s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1053s ' 1053s + t-git-debrebase convert-to-gbp 1053s + local gdr=git-debrebase 1053s + : ' 1053s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1053s + git-debrebase --dgit=dgit -D convert-to-gbp 1053s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu2 1053s git-debrebase get_differs 8e7cc4e38186cddfc4b3361cab4620764327ce86 588d548f5ba959c551704087c40f106f9f6369af = 0x2 1053s git-debrebase classify 1730142aa2f160b263adae4ebebd0b03e88e65db $t=588d548f5ba959c551704087c40f106f9f6369af @p 8e7cc4e38186cddfc4b3361cab4620764327ce86/0x2 1053s git-debrebase = Upstream {"CommitId" => "1730142aa2f160b263adae4ebebd0b03e88e65db","Parents" => [{"Differs" => 2,"CommitId" => "8e7cc4e38186cddfc4b3361cab4620764327ce86","Ix" => 0}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Hdr" => "tree 588d548f5ba959c551704087c40f106f9f6369af\nparent 8e7cc4e38186cddfc4b3361cab4620764327ce86\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "588d548f5ba959c551704087c40f106f9f6369af","Type" => "Upstream"} 1053s git-debrebase get_differs a1b7f18866012b961437b6f75ed0ae106783d5e3 f499c0659991db19beb67b16f469c055a223e7fc = 0x2 1053s git-debrebase classify 8e7cc4e38186cddfc4b3361cab4620764327ce86 $t=f499c0659991db19beb67b16f469c055a223e7fc @p a1b7f18866012b961437b6f75ed0ae106783d5e3/0x2 1053s git-debrebase = Upstream {"CommitId" => "8e7cc4e38186cddfc4b3361cab4620764327ce86","Parents" => [{"Ix" => 0,"CommitId" => "a1b7f18866012b961437b6f75ed0ae106783d5e3","Differs" => 2}],"Tree" => "f499c0659991db19beb67b16f469c055a223e7fc","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Hdr" => "tree f499c0659991db19beb67b16f469c055a223e7fc\nparent a1b7f18866012b961437b6f75ed0ae106783d5e3\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream"} 1053s git-debrebase get_differs 8ebe99a8eaeb097e7649649995e09351099b2837 a6c7fc2a683420c1079bc60ede79d9f59311059d = 0x2 1053s git-debrebase classify a1b7f18866012b961437b6f75ed0ae106783d5e3 $t=a6c7fc2a683420c1079bc60ede79d9f59311059d @p 8ebe99a8eaeb097e7649649995e09351099b2837/0x2 1053s git-debrebase = Upstream {"Parents" => [{"CommitId" => "8ebe99a8eaeb097e7649649995e09351099b2837","Ix" => 0,"Differs" => 2}],"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","Type" => "Upstream"} 1053s git-debrebase get_differs 4199dd68aeb91b09ff7d051eafcca2f7d224aa69 2d1cc236e6e89374bef4755396e3465a27536576 = 0x2 1053s git-debrebase classify 8ebe99a8eaeb097e7649649995e09351099b2837 $t=2d1cc236e6e89374bef4755396e3465a27536576 @p 4199dd68aeb91b09ff7d051eafcca2f7d224aa69/0x2 1053s git-debrebase = Upstream {"CommitId" => "8ebe99a8eaeb097e7649649995e09351099b2837","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4199dd68aeb91b09ff7d051eafcca2f7d224aa69"}],"Tree" => "2d1cc236e6e89374bef4755396e3465a27536576","Hdr" => "tree 2d1cc236e6e89374bef4755396e3465a27536576\nparent 4199dd68aeb91b09ff7d051eafcca2f7d224aa69\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"} 1053s git-debrebase get_differs 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee 8e868e2c82b6dd7ce537069074e9f89d840ecc4a = 0x2 1053s git-debrebase classify 4199dd68aeb91b09ff7d051eafcca2f7d224aa69 $t=8e868e2c82b6dd7ce537069074e9f89d840ecc4a @p 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee/0x2 1053s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee","Differs" => 2}],"CommitId" => "4199dd68aeb91b09ff7d051eafcca2f7d224aa69","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 8e868e2c82b6dd7ce537069074e9f89d840ecc4a\nparent 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "8e868e2c82b6dd7ce537069074e9f89d840ecc4a","Type" => "Upstream"} 1053s git-debrebase get_differs 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78 a025f915994e2a44e5b54ca34c824fa2ac1768a3 = 0x10 1053s git-debrebase classify 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee $t=a025f915994e2a44e5b54ca34c824fa2ac1768a3 @p 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78/0x10 1053s git-debrebase = Changelog {"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","Tree" => "a025f915994e2a44e5b54ca34c824fa2ac1768a3","Type" => "Changelog","CommitId" => "3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee","Parents" => [{"Ix" => 0,"CommitId" => "5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78","Differs" => 16}]} 1053s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0 = 0x10 1053s git-debrebase classify 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78 $t=f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0 @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x10 1053s git-debrebase = Changelog {"CommitId" => "5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"}],"Hdr" => "tree f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "dch -v 2.0-3 -m incorporate nmu\n","Tree" => "f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0","Type" => "Changelog"} 1053s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1053s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1053s git-debrebase = Packaging {"Parents" => [{"Differs" => 48,"Ix" => 0,"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"}],"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Type" => "Packaging","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","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"} 1053s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1053s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1053s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Ix" => 0}],"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"} 1053s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1053s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1053s git-debrebase = Changelog {"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","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 1530000009 +0100\n","Type" => "Changelog"} 1053s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1053s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1053s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1053s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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","Type" => "Anchor"} 1053s git-debrebase *** WALK 1730142aa2f160b263adae4ebebd0b03e88e65db 0 - 1053s git-debrebase get_differs 8e7cc4e38186cddfc4b3361cab4620764327ce86 588d548f5ba959c551704087c40f106f9f6369af = 0x2 1053s git-debrebase classify 1730142aa2f160b263adae4ebebd0b03e88e65db $t=588d548f5ba959c551704087c40f106f9f6369af @p 8e7cc4e38186cddfc4b3361cab4620764327ce86/0x2 1053s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Hdr" => "tree 588d548f5ba959c551704087c40f106f9f6369af\nparent 8e7cc4e38186cddfc4b3361cab4620764327ce86\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "588d548f5ba959c551704087c40f106f9f6369af","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "8e7cc4e38186cddfc4b3361cab4620764327ce86"}],"CommitId" => "1730142aa2f160b263adae4ebebd0b03e88e65db"} 1053s git-debrebase get_differs a1b7f18866012b961437b6f75ed0ae106783d5e3 f499c0659991db19beb67b16f469c055a223e7fc = 0x2 1053s git-debrebase classify 8e7cc4e38186cddfc4b3361cab4620764327ce86 $t=f499c0659991db19beb67b16f469c055a223e7fc @p a1b7f18866012b961437b6f75ed0ae106783d5e3/0x2 1053s git-debrebase = Upstream {"Tree" => "f499c0659991db19beb67b16f469c055a223e7fc","Hdr" => "tree f499c0659991db19beb67b16f469c055a223e7fc\nparent a1b7f18866012b961437b6f75ed0ae106783d5e3\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Type" => "Upstream","CommitId" => "8e7cc4e38186cddfc4b3361cab4620764327ce86","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "a1b7f18866012b961437b6f75ed0ae106783d5e3"}]} 1053s git-debrebase get_differs 8ebe99a8eaeb097e7649649995e09351099b2837 a6c7fc2a683420c1079bc60ede79d9f59311059d = 0x2 1053s git-debrebase classify a1b7f18866012b961437b6f75ed0ae106783d5e3 $t=a6c7fc2a683420c1079bc60ede79d9f59311059d @p 8ebe99a8eaeb097e7649649995e09351099b2837/0x2 1053s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "8ebe99a8eaeb097e7649649995e09351099b2837","Ix" => 0}],"CommitId" => "a1b7f18866012b961437b6f75ed0ae106783d5e3","Type" => "Upstream","Hdr" => "tree a6c7fc2a683420c1079bc60ede79d9f59311059d\nparent 8ebe99a8eaeb097e7649649995e09351099b2837\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","Tree" => "a6c7fc2a683420c1079bc60ede79d9f59311059d"} 1053s git-debrebase get_differs 4199dd68aeb91b09ff7d051eafcca2f7d224aa69 2d1cc236e6e89374bef4755396e3465a27536576 = 0x2 1053s git-debrebase classify 8ebe99a8eaeb097e7649649995e09351099b2837 $t=2d1cc236e6e89374bef4755396e3465a27536576 @p 4199dd68aeb91b09ff7d051eafcca2f7d224aa69/0x2 1053s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "2d1cc236e6e89374bef4755396e3465a27536576","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 2d1cc236e6e89374bef4755396e3465a27536576\nparent 4199dd68aeb91b09ff7d051eafcca2f7d224aa69\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "4199dd68aeb91b09ff7d051eafcca2f7d224aa69","Ix" => 0,"Differs" => 2}],"CommitId" => "8ebe99a8eaeb097e7649649995e09351099b2837"} 1053s git-debrebase get_differs 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee 8e868e2c82b6dd7ce537069074e9f89d840ecc4a = 0x2 1053s git-debrebase classify 4199dd68aeb91b09ff7d051eafcca2f7d224aa69 $t=8e868e2c82b6dd7ce537069074e9f89d840ecc4a @p 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee/0x2 1053s git-debrebase = Upstream {"Parents" => [{"CommitId" => "3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee","Ix" => 0,"Differs" => 2}],"CommitId" => "4199dd68aeb91b09ff7d051eafcca2f7d224aa69","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","Type" => "Upstream"} 1053s git-debrebase get_differs 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78 a025f915994e2a44e5b54ca34c824fa2ac1768a3 = 0x10 1053s git-debrebase classify 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee $t=a025f915994e2a44e5b54ca34c824fa2ac1768a3 @p 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78/0x10 1053s git-debrebase = Changelog {"CommitId" => "3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee","Parents" => [{"CommitId" => "5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78","Ix" => 0,"Differs" => 16}],"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","Type" => "Changelog"} 1053s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0 = 0x10 1053s git-debrebase classify 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78 $t=f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0 @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x10 1053s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0","Hdr" => "tree f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "dch -v 2.0-3 -m incorporate nmu\n","CommitId" => "5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78","Parents" => [{"Differs" => 16,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Ix" => 0}]} 1053s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1053s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1053s 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","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","Type" => "Packaging","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Parents" => [{"Ix" => 0,"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Differs" => 48}]} 1053s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1053s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1053s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Ix" => 0}],"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1053s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1053s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1053s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","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" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"} 1053s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1053s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1053s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1053s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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","Type" => "Anchor"} 1053s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 4 upp 4 proc 10 pm -1 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1053s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 11 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1053s git-debrebase WALK BUILD d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 Debian (rewriting=0) 1053s git-debrebase WALK BUILD 8397762c3c6a31b895366f874e97ed0805b1939e Debian (rewriting=0) 1053s git-debrebase WALK BUILD e4eca65c490ba804c753f8fc1ef367ba07d51c08 Debian (rewriting=0) 1053s git-debrebase WALK BUILD 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78 Debian (rewriting=0) 1053s git-debrebase WALK BUILD 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee Debian (rewriting=0) 1053s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1053s git-debrebase WALK BUILD 4199dd68aeb91b09ff7d051eafcca2f7d224aa69 Upstream (rewriting=0) 1053s git-debrebase WALK BUILD 8ebe99a8eaeb097e7649649995e09351099b2837 Upstream (rewriting=0) 1053s git-debrebase WALK BUILD a1b7f18866012b961437b6f75ed0ae106783d5e3 Upstream (rewriting=0) 1053s git-debrebase WALK BUILD 8e7cc4e38186cddfc4b3361cab4620764327ce86 Upstream (rewriting=0) 1053s git-debrebase WALK BUILD 1730142aa2f160b263adae4ebebd0b03e88e65db Upstream (rewriting=0) 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1053s git-debrebase get_differs 1730142aa2f160b263adae4ebebd0b03e88e65db 1730142aa2f160b263adae4ebebd0b03e88e65db = 0 1053s git-debrebase *** WALK RETURN 1730142aa2f160b263adae4ebebd0b03e88e65db 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1053s git-debrebase gbp_pq_export bw 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee 1730142aa2f160b263adae4ebebd0b03e88e65db 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1053s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1053s git-debrebase >= delete refs/ffq-prev/heads/nmu2 1053s git-debrebase >= delete refs/debrebase-last/heads/nmu2 1053s git-debrebase >= update HEAD 2a5668ff11df9ddd94edc26cda07e3574df9beb4 1730142aa2f160b263adae4ebebd0b03e88e65db 1053s git-debrebase >$ 1054s HEAD is now at 2a5668f Commit patch queue (converted from git-debrebase format) 1054s git-debrebase: converted to git-buildpackage branch format 1054s git-debrebase: WARNING: do not now run "git-debrebase" any more 1054s git-debrebase: WARNING: doing so would drop all upstream patches! 1054s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1054s ' 1054s + t-git-next-date 1054s + GIT_COMMITTER_DATE='1530000011 +0100' 1054s + GIT_AUTHOR_DATE='1530000011 +0100' 1054s + gbp import-orig --upstream-version=2.1 --debian-branch=nmu2 ../example_2.1.orig.tar.gz 1054s gbp:info: Importing '../example_2.1.orig.tar.gz' to branch 'upstream'... 1054s gbp:info: Source package is example 1054s gbp:info: Upstream version is 2.1 1054s gbp:info: Replacing upstream source on 'nmu2' 1054s gbp:info: Successfully imported version 2.1 of ../example_2.1.orig.tar.gz 1054s + t-dch-commit -v 2.1-0+nmu1 -m 'new upstream 2.1-0+nmu1' 1054s + t-debchange -v 2.1-0+nmu1 -m 'new upstream 2.1-0+nmu1' 1054s + DEBEMAIL=dgit-tests@example.org 1054s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.1-0+nmu1 -m 'new upstream 2.1-0+nmu1' 1054s + 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 1054s + git commit -m 'dch -v 2.1-0+nmu1 -m new upstream 2.1-0+nmu1' debian/changelog 1054s [nmu2 597525c] dch -v 2.1-0+nmu1 -m new upstream 2.1-0+nmu1 1054s 1 file changed, 6 insertions(+) 1054s + gbp pq import 1054s gbp:info: Trying to apply patches at '597525cfcf288a010cf1df875c22371c7509ca8b' 1054s gbp:info: 5 patches listed in 'debian/patches/series' imported on 'patch-queue/nmu2' 1054s + t-nmu-upload-2 1054s + t-git-next-date 1054s + GIT_COMMITTER_DATE='1530000012 +0100' 1054s + GIT_AUTHOR_DATE='1530000012 +0100' 1054s + t-dch-commit -v 2.1-0+nmu1 -m 'nmu nmu2 2.1-0+nmu1' 1054s + t-debchange -v 2.1-0+nmu1 -m 'nmu nmu2 2.1-0+nmu1' 1054s + DEBEMAIL=dgit-tests@example.org 1054s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.1-0+nmu1 -m 'nmu nmu2 2.1-0+nmu1' 1054s + 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 1054s + git commit -m 'dch -v 2.1-0+nmu1 -m nmu nmu2 2.1-0+nmu1' debian/changelog 1054s [patch-queue/nmu2 7e1722f] dch -v 2.1-0+nmu1 -m nmu nmu2 2.1-0+nmu1 1054s 1 file changed, 2 insertions(+), 1 deletion(-) 1054s + t-some-changes 1054s + local token= 1054s + local which=dum 1054s + local fsuffix= 1054s + t-git-next-date 1054s + GIT_COMMITTER_DATE='1530000013 +0100' 1054s + GIT_AUTHOR_DATE='1530000013 +0100' 1054s + case "$which" in 1054s + echo '// debian ' 1054s + git add debian/zorkmid 1054s + git commit -m 'DEBIAN add zorkmid ()' 1054s [patch-queue/nmu2 1648a0a] DEBIAN add zorkmid () 1054s 1 file changed, 1 insertion(+) 1054s + case "$which" in 1054s + echo '// upstream ' 1054s + git add src.c 1054s + git commit -m 'UPSTREAM edit src.c ()' 1054s [patch-queue/nmu2 c48a6ce] UPSTREAM edit src.c () 1054s 1 file changed, 1 insertion(+) 1054s + case "$which" in 1054s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1054s + echo '// both! ' 1054s + git add debian/zorkmid 1054s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1054s + echo '// both! ' 1054s + git add src.c 1054s + git commit -m 'MIXED add both() ()' 1054s [patch-queue/nmu2 33e3119] MIXED add both() () 1054s 2 files changed, 2 insertions(+) 1054s + t-git-next-date 1054s + GIT_COMMITTER_DATE='1530000014 +0100' 1054s + GIT_AUTHOR_DATE='1530000014 +0100' 1054s + t-nmu-upload-3 1054s + t-dch-commit-r 1054s + t-dch-r-rune t-dch-commit 1054s + local cmd=t-dch-commit 1054s + shift 1054s + local suite=unstable 1054s + t-dch-commit -r -D unstable '' 1054s + t-debchange -r -D unstable '' 1054s + DEBEMAIL=dgit-tests@example.org 1054s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1054s + exec env TZ=UTC faketime -f 2018-06-26 08:00:14 env -u TZ /usr/bin/debchange -r -D unstable 1054s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1054s libdistro-info-perl is not installed, Debian release names are not known. 1054s libdistro-info-perl is not installed, Ubuntu release names are not known. 1054s + git commit -m 'dch -r -D unstable ' debian/changelog 1054s [patch-queue/nmu2 ff9fa6f] dch -r -D unstable 1054s 1 file changed, 2 insertions(+), 2 deletions(-) 1054s + t-non-dgit-upload 1054s + t-dgit -wgf build-source 1054s + local dgit=dgit 1054s + pwd 1054s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1054s + : ' 1054s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1054s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf build-source 1054s | git rev-parse --show-toplevel 1054s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1054s | git config -z --get-regexp --local '.*' 1054s | git config -z --get-regexp --local '.*' 1054s | git config -z --get-regexp --global '.*' 1054s | git config -z --get-regexp --system '.*' 1054s format 3.0 (quilt), quilt mode linear 1054s Format `3.0 (quilt)', need to check/update patch stack 1054s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1054s => `' 1054s + git diff --quiet HEAD 1054s | git clean -dn 1054s => `' 1054s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1054s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1054s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1054s | git rev-parse 'HEAD~0' 1054s => `ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d' 1054s | git symbolic-ref -q HEAD 1054s => `refs/heads/patch-queue/nmu2' 1054s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1054s CD work 1054s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1054s + git reset -q --hard ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 1054s examining quilt state (multiple patches, linear mode) 1054s branch_is_gdr ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d... 1054s branch_is_gdr feb151382cbab92751733236265afcef5b81dd7e ?-2-merge NO 1054s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 1054s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1054s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 1054s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1055s CD fake 1055s | find -name .git -prune -print0 1055s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1055s + git checkout -f ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d -- debian 1055s + git add -Af . 1055s | git write-tree 1055s => `dfd5341a8fd62ac03b2b10fa0b69d779addacecd' 1055s fake orig tree object dfd5341a8fd62ac03b2b10fa0b69d779addacecd 1055s CD .. 1055s + git reset -q --hard ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 1055s CD ../fake 1055s + git add -Af . 1055s | git write-tree 1055s => `e9b1e9ee7732b4a589a8ac9d7221d12096ce784e' 1055s fake o+d/p tree object dfd5341a8fd62ac03b2b10fa0b69d779addacecd 1055s CD ../work 1055s | git ls-tree --name-only -z ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 1055s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1055s | git diff-tree -z --no-renames -r dfd5341a8fd62ac03b2b10fa0b69d779addacecd ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 1055s => `: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' 1055s quiltify_trees_differ dfd5341a8fd62ac03b2b10fa0b69d779addacecd ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d => 1 1055s | git diff-tree -z --no-renames --name-only -r ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 1055s => `src.c\x00' 1055s quiltify_trees_differ ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 1 1055s | git diff-tree -z --no-renames --name-only -r dfd5341a8fd62ac03b2b10fa0b69d779addacecd e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 1055s => `lib.c\x00new-upstream-file\x00src.c\x00' 1055s quiltify_trees_differ dfd5341a8fd62ac03b2b10fa0b69d779addacecd e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 1 1055s differences @dl ## ## ## == == ==. 1055s dgit: base trees orig=dfd5341a8fd62ac03b2b o+d/p=e9b1e9ee7732b4a589a8 1055s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1055s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1055s starting quiltify (multiple patches, linear mode) 1055s | git ls-tree --name-only ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d -- debian/rules debian/control 1055s => `debian/control'... 1055s quiltify investigate ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 1055s | git diff-tree -z --no-renames --name-only ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 1055s => `src.c\x00' 1055s quiltify_trees_differ ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 1 1055s | git ls-tree --name-only ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d -- debian/rules debian/control 1055s => `debian/control'... 1055s | git cat-file commit ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 1055s => `tree b7719de99f15ce9e6a317fa90890f1113985c6e3'... 1055s | git diff-tree -z --no-renames --name-only 33e3119e9ec3925192450b99116358f1815922eb ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 1055s => `debian\x00' 1055s quiltify_trees_differ 33e3119e9ec3925192450b99116358f1815922eb ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d => 0 1055s considering C=ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d P=33e3119e9ec3925192450b99116358f1815922eb 1055s | git diff-tree -r --name-only 33e3119e9ec3925192450b99116358f1815922eb ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d -- debian/patches .pc debian/source/format 1055s => `' 1055s search queue P=33e3119e9ec3925192450b99116358f1815922eb triv 1055s quiltify investigate 33e3119e9ec3925192450b99116358f1815922eb 1055s | git diff-tree -z --no-renames --name-only 33e3119e9ec3925192450b99116358f1815922eb e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 1055s => `debian\x00src.c\x00' 1055s quiltify_trees_differ 33e3119e9ec3925192450b99116358f1815922eb e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 1 1055s | git ls-tree --name-only 33e3119e9ec3925192450b99116358f1815922eb -- debian/rules debian/control 1055s => `debian/control'... 1055s | git cat-file commit 33e3119e9ec3925192450b99116358f1815922eb 1055s => `tree abb5b6d47ae13d94d3433ce9ed02c0f15aa9d357'... 1055s | git diff-tree -z --no-renames --name-only c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 33e3119e9ec3925192450b99116358f1815922eb 1055s => `debian\x00src.c\x00' 1055s quiltify_trees_differ c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 33e3119e9ec3925192450b99116358f1815922eb => 1 1055s considering C=33e3119e9ec3925192450b99116358f1815922eb P=c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 1055s | git diff-tree -r --name-only c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 33e3119e9ec3925192450b99116358f1815922eb -- debian/patches .pc debian/source/format 1055s => `' 1055s search queue P=c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 NT 1055s quiltify investigate c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 1055s | git diff-tree -z --no-renames --name-only c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 1055s => `debian\x00src.c\x00' 1055s quiltify_trees_differ c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 1 1055s | git ls-tree --name-only c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 -- debian/rules debian/control 1055s => `debian/control'... 1055s | git cat-file commit c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 1055s => `tree 5da388363c347c99285c2c904a43bb9b56c8fa55'... 1055s | git diff-tree -z --no-renames --name-only 1648a0a3cb34c619a5a1447b0840792a114b6417 c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 1055s => `src.c\x00' 1055s quiltify_trees_differ 1648a0a3cb34c619a5a1447b0840792a114b6417 c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 => 1 1055s considering C=c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 P=1648a0a3cb34c619a5a1447b0840792a114b6417 1055s | git diff-tree -r --name-only 1648a0a3cb34c619a5a1447b0840792a114b6417 c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 -- debian/patches .pc debian/source/format 1055s => `' 1055s search queue P=1648a0a3cb34c619a5a1447b0840792a114b6417 NT 1055s quiltify investigate 1648a0a3cb34c619a5a1447b0840792a114b6417 1055s | git diff-tree -z --no-renames --name-only 1648a0a3cb34c619a5a1447b0840792a114b6417 e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 1055s => `debian\x00' 1055s quiltify_trees_differ 1648a0a3cb34c619a5a1447b0840792a114b6417 e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 0 1055s search finished hooray! 1055s quiltify linearisation planning successful, executing... 1055s quiltify traverse 1648a0a3cb34c619a5a1447b0840792a114b6417..c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 1055s | git cat-file commit c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 1055s => `tree 5da388363c347c99285c2c904a43bb9b56c8fa55'... 1055s | git log -n1 '--pretty=format:%aD' c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 1055s => `Tue, 26 Jun 2018 09:00:13 +0100' 1055s + git checkout -q c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 1055s + git checkout -q ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d debian/changelog 1055s | realpath -- /usr/bin/dgit 1055s => `/usr/bin/dgit' 1055s | realpath -- .git/dgit/quilt-description.tmp 1055s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1055s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-.patch1 1055s dpkg-source: info: using patch list from debian/patches/series 1055s dpkg-source: info: local changes detected, the modified files are: 1055s work/src.c 1055s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-.patch1 1055s + git checkout -q c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 debian/changelog 1055s quiltify traverse c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26..33e3119e9ec3925192450b99116358f1815922eb 1055s | git cat-file commit 33e3119e9ec3925192450b99116358f1815922eb 1055s => `tree abb5b6d47ae13d94d3433ce9ed02c0f15aa9d357'... 1055s | git log -n1 '--pretty=format:%aD' 33e3119e9ec3925192450b99116358f1815922eb 1055s => `Tue, 26 Jun 2018 09:00:13 +0100' 1055s + git checkout -q 33e3119e9ec3925192450b99116358f1815922eb 1055s + git checkout -q ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d debian/changelog 1055s | realpath -- /usr/bin/dgit 1055s => `/usr/bin/dgit' 1055s | realpath -- .git/dgit/quilt-description.tmp 1055s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1055s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-.patch1 1055s dpkg-source: info: using patch list from debian/patches/series 1055s dpkg-source: info: local changes detected, the modified files are: 1055s work/src.c 1056s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-.patch1 1056s + git checkout -q 33e3119e9ec3925192450b99116358f1815922eb debian/changelog 1056s quiltify traverse 33e3119e9ec3925192450b99116358f1815922eb..ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 1056s + git checkout -q master 1056s | git status --ignored --porcelain 1056s => ` M debian/patches/series'... 1056s + git add -f debian/patches 1056s Commit Debian 3.0 (quilt) metadata 1056s 1056s [dgit (9.15) quilt-fixup] 1056s 1056s + git commit -m 'Commit Debian 3.0 (quilt) metadata 1056s 1056s [dgit (9.15) quilt-fixup] 1056s ' 1056s [master 5100621] Commit Debian 3.0 (quilt) metadata 1056s 3 files changed, 32 insertions(+) 1056s create mode 100644 debian/patches/mixed-add-both-.patch1 1056s create mode 100644 debian/patches/upstream-edit-src.c-.patch1 1056s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1056s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1056s | git rev-parse 'HEAD~0' 1056s => `5100621d624b5770c893f72700cc63040238aea6' 1056s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1056s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 1056s CD work 1056s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1056s + git reset -q --hard 5100621d624b5770c893f72700cc63040238aea6 1056s CD .. 1056s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1056s dpkg-source: info: using source format '3.0 (quilt)' 1056s dpkg-source: info: building example using existing ./example_2.1.orig.tar.gz 1056s dpkg-source: info: using patch list from debian/patches/series 1056s dpkg-source: info: building example in example_2.1-0+nmu1.debian.tar.xz 1056s dpkg-source: info: building example in example_2.1-0+nmu1.dsc 1056s CD work 1056s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1056s changelog will contain changes since 2.0-2+nmu1 1056s + sh -ec 'exec >../$1; shift; exec "$@"' x 'example_2.1-0+nmu1_source.changes' dpkg-genchanges -S '-v2.0-2+nmu1' 1056s dpkg-genchanges: info: not including original source code in upload 1056s CD .. 1056s moving example_2.1-0+nmu1.dsc, example_2.1-0+nmu1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1056s renaming (Files) example_2.1.orig.tar.gz 1056s renaming (Files) example_2.1-0+nmu1.debian.tar.xz 1056s renaming (dsc) example_2.1-0+nmu1.dsc 1056s renaming (changes) example_2.1-0+nmu1_source.changes 1056s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1056s dgit ok: source built, results in example_2.1-0+nmu1.dsc and example_2.1-0+nmu1_source.changes 1056s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1056s ' 1056s + cd .. 1056s + c=example_2.1-0+nmu1_source.changes 1056s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A example_2.1-0+nmu1_source.changes 1056s signfile dsc example_2.1-0+nmu1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1056s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1056s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1056s 1056s fixup_changes dsc example_2.1-0+nmu1.dsc example_2.1-0+nmu1_source.changes 1056s signfile changes example_2.1-0+nmu1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1056s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1056s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1056s 1056s Successfully signed dsc, changes files 1056s + dput -c /tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy example_2.1-0+nmu1_source.changes 1056s gpg: /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example_2.1-0+nmu1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1056s gpg: /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example_2.1-0+nmu1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1056s D: Setting host argument. 1056s Checking signature on .changes 1056s Checking signature on .dsc 1056s Uploading to test-dummy (via local to localhost): 1056s Successfully uploaded packages. 1056s + t-archive-process-incoming sid 1056s + local suite=sid 1056s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-3.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-3.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-3_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1-0+nmu1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1-0+nmu1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.1-0+nmu1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1056s + t-archive-query sid 1056s + local suite=sid 1056s + local dscf=main/example_2.1-0+nmu1.dsc 1056s + t-archive-query-aq sid example 2.1-0+nmu1 main/example_2.1-0+nmu1.dsc 1056s + local suite=sid 1056s + local p=example 1056s + local v=2.1-0+nmu1 1056s + local dscf=main/example_2.1-0+nmu1.dsc 1056s + local sha 1056s ++ sha256sum 1056s + sha='853ec53ef289344d1a86a7ba5eb084d8b2390fdbd672d20f3a8965ae0a48739e -' 1056s + echo '2.1-0+nmu1 853ec53ef289344d1a86a7ba5eb084d8b2390fdbd672d20f3a8965ae0a48739e main/example_2.1-0+nmu1.dsc' 1056s + t-aq-archive-updated sid example 1056s + local suite=sid 1056s + local p=example 1056s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1056s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1056s + perl -wne ' 1056s use JSON; 1056s use strict; 1056s our @v; 1056s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1056s push @v, { 1056s "version" => "$1", 1056s "sha256sum" => "$2", 1056s "component" => "$3", 1056s "filename" => "$4", 1056s }; 1056s END { 1056s my $json = JSON->new->canonical(); 1056s print $json->encode(\@v) or die $!; 1056s } 1056s ' 1056s + t-git-next-date 1056s + GIT_COMMITTER_DATE='1530000015 +0100' 1056s + GIT_AUTHOR_DATE='1530000015 +0100' 1056s + cd example 1056s + git checkout master 1056s Switched to branch 'master' 1056s Your branch is ahead of 'origin/master' by 21 commits. 1056s (use "git push" to publish your local commits) 1056s + : 'done the nmu, back to the maintainer' 1056s + nmu-fold 1056s + t-git-next-date 1056s + GIT_COMMITTER_DATE='1530000016 +0100' 1056s + GIT_AUTHOR_DATE='1530000016 +0100' 1056s + t-dgit fetch 1056s + local dgit=dgit 1056s + pwd 1056s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1056s + : ' 1056s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1056s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch 1057s | git rev-parse --show-toplevel 1057s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1057s | git config -z --get-regexp --local '.*' 1057s | git config -z --get-regexp --local '.*' 1057s | git config -z --get-regexp --global '.*' 1057s | git config -z --get-regexp --system '.*' 1057s | git symbolic-ref -q HEAD 1057s => `refs/heads/master' 1057s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1057s canonical suite name for unstable is sid 1057s query: fetching http://127.0.0.1:46301/example.git/HEAD... 1057s dgit-repos check_for_git => 1. 1057s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1057s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1057s git_lrfetch_sane iteration 0 1057s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1057s => 4b8c76d051e32cfd5c0f423504742148ed9e07a4 refs/dgit/sid 1057s => fef4abd7f57b33d60ca1a8539604aea0d854328b refs/tags/archive/test-dummy/2.0-1 1057s => c9f0c7241f3ae8094eced5e523351ff658872f89 refs/tags/archive/test-dummy/2.0-2 1057s => 4b415ea11732c6a30e468ffac10bb508d138eb95 refs/tags/archive/test-dummy/2.0-3 1057s => d433645978da1daa8e72318c1dd5353dc0e3ce71 refs/tags/test-dummy/2.0-1 1057s => 7552395cff8db2ee1364171a417465c663fe49fe refs/tags/test-dummy/2.0-2 1057s => 28673b3f3ba3f6fee075205c53ceb386e2ac89f6 refs/tags/test-dummy/2.0-3 1057s 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 1057s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1057s | git for-each-ref refs/dgit-fetch/test-dummy 1057s |> 4b8c76d051e32cfd5c0f423504742148ed9e07a4 commit refs/dgit-fetch/test-dummy/dgit/sid 1057s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1057s |> c9f0c7241f3ae8094eced5e523351ff658872f89 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1057s |> 4b415ea11732c6a30e468ffac10bb508d138eb95 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 1057s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1057s |> 7552395cff8db2ee1364171a417465c663fe49fe tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1057s |> 28673b3f3ba3f6fee075205c53ceb386e2ac89f6 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 1057s git_lrfetch_sane: tidying any old suite lrfetchrefs 1057s | git for-each-ref refs/dgit-fetch/sid 1057s git_lrfetch_sane: git fetch --no-insane emulation complete 1057s $VAR1 = { 1057s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => 'fef4abd7f57b33d60ca1a8539604aea0d854328b', 1057s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3' => '28673b3f3ba3f6fee075205c53ceb386e2ac89f6', 1057s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => 'c9f0c7241f3ae8094eced5e523351ff658872f89', 1057s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'd433645978da1daa8e72318c1dd5353dc0e3ce71', 1057s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3' => '4b415ea11732c6a30e468ffac10bb508d138eb95', 1057s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => '7552395cff8db2ee1364171a417465c663fe49fe', 1057s 'refs/dgit-fetch/test-dummy/dgit/sid' => '4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s }; 1057s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1057s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/tags/archive/test-dummy/2.0-1 1057s currently refs/tags/archive/test-dummy/2.0-1=fef4abd7f57b33d60ca1a8539604aea0d854328b 1057s |> c9f0c7241f3ae8094eced5e523351ff658872f89 tag refs/tags/archive/test-dummy/2.0-2 1057s currently refs/tags/archive/test-dummy/2.0-2=c9f0c7241f3ae8094eced5e523351ff658872f89 1057s |> 4b415ea11732c6a30e468ffac10bb508d138eb95 tag refs/tags/archive/test-dummy/2.0-3 1057s currently refs/tags/archive/test-dummy/2.0-3=4b415ea11732c6a30e468ffac10bb508d138eb95 1057s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/tags/test-dummy/2.0-1 1057s currently refs/tags/test-dummy/2.0-1=d433645978da1daa8e72318c1dd5353dc0e3ce71 1057s |> 7552395cff8db2ee1364171a417465c663fe49fe tag refs/tags/test-dummy/2.0-2 1057s currently refs/tags/test-dummy/2.0-2=7552395cff8db2ee1364171a417465c663fe49fe 1057s |> 28673b3f3ba3f6fee075205c53ceb386e2ac89f6 tag refs/tags/test-dummy/2.0-3 1057s currently refs/tags/test-dummy/2.0-3=28673b3f3ba3f6fee075205c53ceb386e2ac89f6 1057s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1057s |> fef4abd7f57b33d60ca1a8539604aea0d854328b tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1057s offered refs/tags/archive/test-dummy/2.0-1=fef4abd7f57b33d60ca1a8539604aea0d854328b 1057s |> c9f0c7241f3ae8094eced5e523351ff658872f89 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1057s offered refs/tags/archive/test-dummy/2.0-2=c9f0c7241f3ae8094eced5e523351ff658872f89 1057s |> 4b415ea11732c6a30e468ffac10bb508d138eb95 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 1057s offered refs/tags/archive/test-dummy/2.0-3=4b415ea11732c6a30e468ffac10bb508d138eb95 1057s |> d433645978da1daa8e72318c1dd5353dc0e3ce71 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1057s offered refs/tags/test-dummy/2.0-1=d433645978da1daa8e72318c1dd5353dc0e3ce71 1057s |> 7552395cff8db2ee1364171a417465c663fe49fe tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1057s offered refs/tags/test-dummy/2.0-2=7552395cff8db2ee1364171a417465c663fe49fe 1057s |> 28673b3f3ba3f6fee075205c53ceb386e2ac89f6 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 1057s offered refs/tags/test-dummy/2.0-3=28673b3f3ba3f6fee075205c53ceb386e2ac89f6 1057s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1057s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.1-0+nmu1.dsc... 1057s get_archive_dsc: Version 2.1-0+nmu1 1057s last upload to archive: NO git hash 1057s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s previous reference hash=4b8c76d051e32cfd5c0f423504742148ed9e07a4 1057s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s fetch_from_archive: lastfetch=4b8c76d051e32cfd5c0f423504742148ed9e07a4 1057s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1057s considering reusing example_2.1.orig.tar.gz: (No such file or directory) linked. 1057s using existing example_2.1.orig.tar.gz 1057s considering saving example_2.1.orig.tar.gz: (File exists) no need. 1057s considering reusing example_2.1-0+nmu1.debian.tar.xz: (No such file or directory) linked. 1057s using existing example_2.1-0+nmu1.debian.tar.xz 1057s considering saving example_2.1-0+nmu1.debian.tar.xz: (File exists) no need. 1057s import considering example_2.1.orig.tar.gz Y .gz orig 1057s + chmod -R '+rwX' _unpack-tar 1057s CD _unpack-tar 1057s | find -name .git -prune -print0 1057s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1057s + git add -Af . 1057s | git write-tree 1057s => `fbb99216bb0d1a7a2e1da73de5f8568c4b4e04d3' 1057s | git ls-tree -z fbb99216bb0d1a7a2e1da73de5f8568c4b4e04d3 1057s => `040000 tree 7ec50e88ff90f859d6b39f1078a1fa7580955823\x09example-2.1\x00' 1057s one subtree 7ec50e88ff90f859d6b39f1078a1fa7580955823 1057s CD .. 1057s import considering example_2.1-0+nmu1.debian.tar.xz Y .xz (none) 1057s + chmod -R '+rwX' _unpack-tar 1057s CD _unpack-tar 1057s | find -name .git -prune -print0 1057s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1057s + git add -Af . 1057s | git write-tree 1057s => `0990bee1a7fa5ea7c6bcc4119f6718d9db638ae5' 1057s | git ls-tree -z 0990bee1a7fa5ea7c6bcc4119f6718d9db638ae5 1057s => `040000 tree 6d953e19e79376229c0456bd0cbfb70496fb5d1f\x09debian\x00' 1057s one subtree 6d953e19e79376229c0456bd0cbfb70496fb5d1f 1057s CD .. 1057s + dpkg-source --no-check --skip-patches -x -- example.dsc 1057s dpkg-source: info: extracting example in example-2.1 1057s dpkg-source: info: unpacking example_2.1.orig.tar.gz 1057s dpkg-source: info: unpacking example_2.1-0+nmu1.debian.tar.xz 1057s CD example-2.1 1057s | find -name .git -prune -print0 1057s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1057s + git add -Af . 1057s | git write-tree 1057s => `648a3758d9b667d29500784c4b37ed8354be0810' 1057s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1057s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1057s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1057s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 1057s + git add -Af . 1057s | git write-tree 1057s => `fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6' 1057s import clog search... 1057s | dpkg-parsechangelog --format rfc822 --all 1057s import clog 2.1-0+nmu1 package changelog, entry no.1... 1057s import clog 2.1-0+nmu1 vs 2.1... 1057s import clog 2.1-0+nmu1 becomes r1 1057s import clog 2.0-3 package changelog, entry no.2... 1057s import clog 2.0-3 vs 2.1... 1057s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:14 +0000' 1057s => `1530000014 +0000' 1057s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:14 +0000' 1057s => `1530000014 +0000' 1057s import tartrees authline dgit test git user 1530000014 +0000 1057s import tartrees r1authline dgit test git user 1530000014 +0000 1057s import tartree example_2.1.orig.tar.gz 7ec50e88ff90f859d6b39f1078a1fa7580955823 1057s | git hash-object -w -t commit --stdin 1057s => 8c5d0e0174b5de39e69e18884925db0015d27527 1057s import tartree example_2.1-0+nmu1.debian.tar.xz 6d953e19e79376229c0456bd0cbfb70496fb5d1f 1057s | git hash-object -w -t commit --stdin 1057s => d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81 1057s import main commit 1057s | git hash-object -w -t commit ../commit.tmp 1057s => `3840466cb74b8a6a4ed3ec06a72e03175d74a9ce' 1057s import apply patches... 1057s | git hash-object -w -t commit --stdin 1057s => 055d67275a015e32ca8cd174f7ee6623945ba156 1057s + git checkout -q -b dapplied 055d67275a015e32ca8cd174f7ee6623945ba156 1057s + git checkout -q -b unpa 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce 1057s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:14 +0000' 1057s => `1530000014 +0000' 1057s + git checkout -q unpa 1057s + git update-ref -d refs/heads/patch-queue/unpa 1057s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 1057s | git rev-parse 'HEAD~0' 1057s => `a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7' 1057s | git rev-parse HEAD: 1057s => `fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6' 1057s synthesised git commit from .dsc 2.1-0+nmu1 1057s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 4b8c76d051e32cfd5c0f423504742148ed9e07a4:debian/changelog 1057s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1057s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7:debian/changelog 1057s | git merge-base 4b8c76d051e32cfd5c0f423504742148ed9e07a4 a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 1057s =>!256 1057s | git merge-base 4b8c76d051e32cfd5c0f423504742148ed9e07a4 4b8c76d051e32cfd5c0f423504742148ed9e07a4 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s fetch mergeinfos: 1057s commit a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 Import of source package 1057s commit 4b8c76d051e32cfd5c0f423504742148ed9e07a4 dgit suite branch on dgit git server 1057s ReverseParents=1 Message=Record example (2.1-0+nmu1) in archive suite sid 1057s | git cat-file commit a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 1057s => `tree fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6'... 1057s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:14 +0000' 1057s => `1530000014 +0000' 1057s | git hash-object -w -t commit /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/mergecommit 1057s => `cfab37c19bff9fd6c55919a11af887e45eb3af44' 1057s fetch hash=cfab37c19bff9fd6c55919a11af887e45eb3af44 1057s | git merge-base 4b8c76d051e32cfd5c0f423504742148ed9e07a4 cfab37c19bff9fd6c55919a11af887e45eb3af44 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s | git merge-base 4b8c76d051e32cfd5c0f423504742148ed9e07a4 cfab37c19bff9fd6c55919a11af887e45eb3af44 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 1057s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 1057s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE cfab37c19bff9fd6c55919a11af887e45eb3af44 1057s | git log -n2 cfab37c19bff9fd6c55919a11af887e45eb3af44 1057s => `commit cfab37c19bff9fd6c55919a11af887e45eb3af44'... 1057s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid cfab37c19bff9fd6c55919a11af887e45eb3af44 1057s => `' 1057s | git ls-tree -lrz -- cfab37c19bff9fd6c55919a11af887e45eb3af44: 1057s dgit ok: fetched into refs/remotes/dgit/dgit/sid 1057s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1057s del_lrfetchrefs... 1057s del_lrfetchrefs: 4b8c76d051e32cfd5c0f423504742148ed9e07a4 refs/dgit-fetch/test-dummy/dgit/sid 1057s del_lrfetchrefs: fef4abd7f57b33d60ca1a8539604aea0d854328b refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1057s del_lrfetchrefs: c9f0c7241f3ae8094eced5e523351ff658872f89 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1057s del_lrfetchrefs: 4b415ea11732c6a30e468ffac10bb508d138eb95 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 1057s del_lrfetchrefs: d433645978da1daa8e72318c1dd5353dc0e3ce71 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1057s del_lrfetchrefs: 7552395cff8db2ee1364171a417465c663fe49fe refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1057s del_lrfetchrefs: 28673b3f3ba3f6fee075205c53ceb386e2ac89f6 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 1057s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1057s ' 1057s + t-git-next-date 1057s + GIT_COMMITTER_DATE='1530000017 +0100' 1057s + GIT_AUTHOR_DATE='1530000017 +0100' 1057s + git merge --ff-only dgit/dgit/sid 1057s Updating 4b8c76d..cfab37c 1057s Fast-forward 1057s debian/changelog | 7 +++++++ 1057s debian/patches/mixed-add-both-.patch1 | 15 +++++++++++++++ 1057s debian/patches/series | 2 ++ 1057s debian/patches/upstream-edit-src.c-.patch1 | 15 +++++++++++++++ 1057s debian/zorkmid | 2 ++ 1057s docs/README | 1 + 1057s src.c | 2 ++ 1057s 7 files changed, 44 insertions(+) 1057s create mode 100644 debian/patches/mixed-add-both-.patch1 1057s create mode 100644 debian/patches/upstream-edit-src.c-.patch1 1057s + git diff --exit-code patch-queue/nmu2 1057s + git branch unlaundered.nmu2 1057s + t-git-debrebase 1057s + local gdr=git-debrebase 1057s + : ' 1057s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1057s + git-debrebase --dgit=dgit -D 1058s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1058s git-debrebase ffq check_specs * 1058s git-debrebase ffq merge master 1058s git-debrebase ffq check_remote origin remote fetch/merge branch 1058s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1058s OK, you are ahead of refs/remotes/origin/master 1058s git-debrebase ffq check_remote undef remote push branch 1058s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1058s OK, you are ahead of refs/remotes/dgit/dgit/sid 1058s git-debrebase *** WALK cfab37c19bff9fd6c55919a11af887e45eb3af44 0 - 1058s git-debrebase get_differs 4b8c76d051e32cfd5c0f423504742148ed9e07a4 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0x36 1058s git-debrebase get_differs a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0 1058s git-debrebase classify cfab37c19bff9fd6c55919a11af887e45eb3af44 $t=fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 @p 4b8c76d051e32cfd5c0f423504742148ed9e07a4/0x36 a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7/0 1058s git-debrebase = Pseudomerge {"Parents" => [{"Ix" => 0,"Differs" => 54,"CommitId" => "4b8c76d051e32cfd5c0f423504742148ed9e07a4"},{"Differs" => 0,"Ix" => 1,"CommitId" => "a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7"}],"Overwritten" => [$VAR1->{"Parents"}[0]],"Contributor" => $VAR1->{"Parents"}[1],"Msg" => "Record example (2.1-0+nmu1) in archive suite sid\n","Hdr" => "tree fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6\nparent 4b8c76d051e32cfd5c0f423504742148ed9e07a4\nparent a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6","CommitId" => "cfab37c19bff9fd6c55919a11af887e45eb3af44","Type" => "Pseudomerge"} 1058s git-debrebase get_differs 81d8596985612b198bef8077a81b9f493a86bd17 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0x2 1058s git-debrebase classify a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 $t=fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 @p 81d8596985612b198bef8077a81b9f493a86bd17/0x2 1058s git-debrebase = Upstream {"Hdr" => "tree fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6\nparent 81d8596985612b198bef8077a81b9f493a86bd17\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6","Parents" => [{"CommitId" => "81d8596985612b198bef8077a81b9f493a86bd17","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","Type" => "Upstream","CommitId" => "a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7"} 1058s git-debrebase get_differs 9030a2f23038d2f402171d4ce0b637846272eabf 2b5743524074b13f18388c85f0ab3a4675727f25 = 0x2 1058s git-debrebase classify 81d8596985612b198bef8077a81b9f493a86bd17 $t=2b5743524074b13f18388c85f0ab3a4675727f25 @p 9030a2f23038d2f402171d4ce0b637846272eabf/0x2 1058s git-debrebase = Upstream {"CommitId" => "81d8596985612b198bef8077a81b9f493a86bd17","Type" => "Upstream","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "9030a2f23038d2f402171d4ce0b637846272eabf"}],"Tree" => "2b5743524074b13f18388c85f0ab3a4675727f25","Hdr" => "tree 2b5743524074b13f18388c85f0ab3a4675727f25\nparent 9030a2f23038d2f402171d4ce0b637846272eabf\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000014 +0000\n"} 1058s git-debrebase get_differs 90bfe62f6454203b392beea73d3366747a145432 e3680aec0b2b043eb1fc1bb33973bdece72374b5 = 0x2 1058s git-debrebase classify 9030a2f23038d2f402171d4ce0b637846272eabf $t=e3680aec0b2b043eb1fc1bb33973bdece72374b5 @p 90bfe62f6454203b392beea73d3366747a145432/0x2 1058s git-debrebase = Upstream {"Tree" => "e3680aec0b2b043eb1fc1bb33973bdece72374b5","Hdr" => "tree e3680aec0b2b043eb1fc1bb33973bdece72374b5\nparent 90bfe62f6454203b392beea73d3366747a145432\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000014 +0000\n","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "90bfe62f6454203b392beea73d3366747a145432"}],"Type" => "Upstream","CommitId" => "9030a2f23038d2f402171d4ce0b637846272eabf"} 1058s git-debrebase get_differs 1d3db2255664fa14deafceb28bea050df8f692f5 dd5fa39e05cd2d16628cd518828b599193709422 = 0x2 1058s git-debrebase classify 90bfe62f6454203b392beea73d3366747a145432 $t=dd5fa39e05cd2d16628cd518828b599193709422 @p 1d3db2255664fa14deafceb28bea050df8f692f5/0x2 1058s 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" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1d3db2255664fa14deafceb28bea050df8f692f5"}],"Type" => "Upstream","CommitId" => "90bfe62f6454203b392beea73d3366747a145432"} 1058s git-debrebase get_differs 5dd6a6e50a46e433773f5d68475b27acda36bd78 64dbf9bd449b82949cb964daf820d7d9c12ddc1b = 0x2 1058s git-debrebase classify 1d3db2255664fa14deafceb28bea050df8f692f5 $t=64dbf9bd449b82949cb964daf820d7d9c12ddc1b @p 5dd6a6e50a46e433773f5d68475b27acda36bd78/0x2 1058s git-debrebase = Upstream {"Hdr" => "tree 64dbf9bd449b82949cb964daf820d7d9c12ddc1b\nparent 5dd6a6e50a46e433773f5d68475b27acda36bd78\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "64dbf9bd449b82949cb964daf820d7d9c12ddc1b","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5dd6a6e50a46e433773f5d68475b27acda36bd78"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "1d3db2255664fa14deafceb28bea050df8f692f5"} 1058s git-debrebase get_differs 439d330e0a4b3e4941acdbce4cda9605ea1c993e 50ecbd6a17951348a127992f7a6688a3f830177b = 0x2 1058s git-debrebase classify 5dd6a6e50a46e433773f5d68475b27acda36bd78 $t=50ecbd6a17951348a127992f7a6688a3f830177b @p 439d330e0a4b3e4941acdbce4cda9605ea1c993e/0x2 1058s 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" => "439d330e0a4b3e4941acdbce4cda9605ea1c993e"}],"Tree" => "50ecbd6a17951348a127992f7a6688a3f830177b","Hdr" => "tree 50ecbd6a17951348a127992f7a6688a3f830177b\nparent 439d330e0a4b3e4941acdbce4cda9605ea1c993e\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000014 +0000\n","CommitId" => "5dd6a6e50a46e433773f5d68475b27acda36bd78","Type" => "Upstream"} 1058s git-debrebase get_differs 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce 1532541e2f6366582d6b27d965181748e3f8904a = 0x2 1058s git-debrebase classify 439d330e0a4b3e4941acdbce4cda9605ea1c993e $t=1532541e2f6366582d6b27d965181748e3f8904a @p 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce/0x2 1058s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "439d330e0a4b3e4941acdbce4cda9605ea1c993e","Hdr" => "tree 1532541e2f6366582d6b27d965181748e3f8904a\nparent 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "1532541e2f6366582d6b27d965181748e3f8904a","Parents" => [{"CommitId" => "3840466cb74b8a6a4ed3ec06a72e03175d74a9ce","Differs" => 2,"Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1058s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 648a3758d9b667d29500784c4b37ed8354be0810 = 0x34 1058s git-debrebase get_differs d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81 648a3758d9b667d29500784c4b37ed8354be0810 = 0x36 1058s git-debrebase classify 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce $t=648a3758d9b667d29500784c4b37ed8354be0810 @p 8c5d0e0174b5de39e69e18884925db0015d27527/0x34 d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81/0x36 1058s git-debrebase = DgitImportUnpatched {"Hdr" => "tree 648a3758d9b667d29500784c4b37ed8354be0810\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nparent d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "648a3758d9b667d29500784c4b37ed8354be0810","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","Type" => "DgitImportUnpatched","CommitId" => "3840466cb74b8a6a4ed3ec06a72e03175d74a9ce","Parents" => [{"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527","Differs" => 52,"IsOrigin" => 1,"IsDgitImport" => "orig","Ix" => 0},{"CommitId" => "d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81","Ix" => 1,"IsDgitImport" => "tarball","Differs" => 54,"IsOrigin" => 1}],"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]]} 1058s git-debrebase get_differs 64bcb7d55956b0e3ebe624bf9040a976b183e414 3646aeb322533be919f218f7670519af795187ec = 0x4 1058s git-debrebase classify 4b8c76d051e32cfd5c0f423504742148ed9e07a4 $t=3646aeb322533be919f218f7670519af795187ec @p 64bcb7d55956b0e3ebe624bf9040a976b183e414/0x4 1058s git-debrebase = AddPatches {"Hdr" => "tree 3646aeb322533be919f218f7670519af795187ec\nparent 64bcb7d55956b0e3ebe624bf9040a976b183e414\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "3646aeb322533be919f218f7670519af795187ec","Parents" => [{"CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Ix" => 0,"Differs" => 4}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Type" => "AddPatches","CommitId" => "4b8c76d051e32cfd5c0f423504742148ed9e07a4"} 1058s git-debrebase get_differs 95f78a1ec281f58eba538b9baef816d74e131c60 588d548f5ba959c551704087c40f106f9f6369af = 0x10 1058s git-debrebase classify 64bcb7d55956b0e3ebe624bf9040a976b183e414 $t=588d548f5ba959c551704087c40f106f9f6369af @p 95f78a1ec281f58eba538b9baef816d74e131c60/0x10 1058s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Tree" => "588d548f5ba959c551704087c40f106f9f6369af","Hdr" => "tree 588d548f5ba959c551704087c40f106f9f6369af\nparent 95f78a1ec281f58eba538b9baef816d74e131c60\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60"}]} 1058s git-debrebase get_differs a0e76af573321d5714d63cd5c464d783da6b72b4 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f = 0x10 1058s git-debrebase classify 95f78a1ec281f58eba538b9baef816d74e131c60 $t=7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f @p a0e76af573321d5714d63cd5c464d783da6b72b4/0x10 1058s git-debrebase = Changelog {"CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Type" => "Changelog","Parents" => [{"CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Ix" => 0,"Differs" => 16}],"Msg" => "dch -v 2.0-3 -m incorporate nmu\n","Hdr" => "tree 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f\nparent a0e76af573321d5714d63cd5c464d783da6b72b4\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f"} 1058s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0 1058s git-debrebase get_differs 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x8 1058s git-debrebase classify a0e76af573321d5714d63cd5c464d783da6b72b4 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5/0 1c8e3b534eac1867c8911d4e5f923d5f7bcee275/0x8 1058s git-debrebase = Pseudomerge {"Contributor" => {"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Ix" => 0,"Differs" => 0},"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5\nparent 1c8e3b534eac1867c8911d4e5f923d5f7bcee275\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Type" => "Pseudomerge","Parents" => [$VAR1->{"Contributor"},{"Differs" => 8,"Ix" => 1,"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275"}],"Overwritten" => [$VAR1->{"Parents"}[1]]} 1058s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 1058s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 1058s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","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","Parents" => [{"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Differs" => 2,"Ix" => 0}]} 1058s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 1058s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 1058s git-debrebase = Upstream {"Parents" => [{"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Differs" => 2,"Ix" => 0}],"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","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Type" => "Upstream"} 1058s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 1058s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 1058s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Ix" => 0,"Differs" => 2}],"Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Type" => "Upstream"} 1058s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 1058s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 1058s git-debrebase = Upstream {"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Ix" => 0,"Differs" => 2}],"Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n"} 1058s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 1058s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 1058s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","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"} 1058s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1058s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1058s git-debrebase = Packaging {"Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","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","Differs" => 48,"Ix" => 0}],"Type" => "Packaging","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"} 1058s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1058s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1058s git-debrebase = Changelog {"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"}],"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"} 1058s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1058s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1058s 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","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"} 1058s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1058s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1058s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1058s git-debrebase = Anchor {"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"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","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1058s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 14 proc 25 pm 1 1058s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1058s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1058s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 26 1058s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1058s git-debrebase WALK BUILD d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 Debian (rewriting=0) 1058s git-debrebase WALK BUILD 8397762c3c6a31b895366f874e97ed0805b1939e Debian (rewriting=0) 1058s git-debrebase WALK BUILD e4eca65c490ba804c753f8fc1ef367ba07d51c08 Debian (rewriting=0) 1058s git-debrebase WALK BUILD 95f78a1ec281f58eba538b9baef816d74e131c60 Debian (rewriting=0) 1058s git-debrebase WALK REWRITING NOW cl=HASH(0x3fa48ad2f20) procd=HASH(0x3fa48ae2e60) 1058s git-debrebase WALK BUILD 64bcb7d55956b0e3ebe624bf9040a976b183e414 Debian (rewriting=1) 1058s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1058s git-debrebase WALK BUILD 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce DgitImportUpstreamUpdate (rewriting=1) 1058s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce = 0x36 1058s git-debrebase WALK BUILD 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce DgitImportDebianUpdate (rewriting=1) 1058s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1058s git-debrebase WALK BUILD 439d330e0a4b3e4941acdbce4cda9605ea1c993e Upstream (rewriting=1) 1058s git-debrebase WALK BUILD 5dd6a6e50a46e433773f5d68475b27acda36bd78 Upstream (rewriting=1) 1058s git-debrebase WALK BUILD 1d3db2255664fa14deafceb28bea050df8f692f5 Upstream (rewriting=1) 1058s git-debrebase WALK BUILD 90bfe62f6454203b392beea73d3366747a145432 Upstream (rewriting=1) 1058s git-debrebase WALK BUILD 9030a2f23038d2f402171d4ce0b637846272eabf Upstream (rewriting=1) 1058s git-debrebase WALK BUILD 81d8596985612b198bef8077a81b9f493a86bd17 Upstream (rewriting=1) 1058s git-debrebase WALK BUILD a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 Upstream (rewriting=1) 1058s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1058s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1058s git-debrebase get_differs 84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44 = 0x4 1058s git-debrebase *** WALK RETURN 84ac322ff033ab96c026918c20e3a958c6d24146 f730b85f299afe1020b13e03243511c5bd8a6cbe 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1058s git-debrebase: laundered (head was cfab37c19bff9fd6c55919a11af887e45eb3af44) 1058s git-debrebase >= update refs/ffq-prev/heads/master cfab37c19bff9fd6c55919a11af887e45eb3af44 0000000000000000000000000000000000000000 1058s git-debrebase >= delete refs/debrebase-last/heads/master 1058s git-debrebase >= update HEAD 84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44 1058s git-debrebase >$ 1058s Recorded previous head for preservation 1058s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1058s ' 1058s + t-gdr-good laundered 1058s + local state=laundered 1058s + local beforetag= 1058s + case $state in 1058s + git diff --quiet -- :. ':!debian/patches' 1058s + LC_MESSAGES=C 1058s + t-git-debrebase status 1058s + local gdr=git-debrebase 1058s + : ' 1058s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1058s + git-debrebase --dgit=dgit -D status 1058s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 1058s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 1058s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Ix" => 0}],"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","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Type" => "Upstream"} 1058s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 1058s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 1058s 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","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Ix" => 0}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1"} 1058s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 1058s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 1058s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Parents" => [{"Ix" => 0,"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Differs" => 2}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch"} 1058s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 1058s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 1058s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Differs" => 2}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Hdr" => "tree 2de73fb98a33c21de5b8672952c1fd652dec8627\nparent 1ca66fb225fad62360bdceb664ba6d30edd5a9db\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "2de73fb98a33c21de5b8672952c1fd652dec8627","Type" => "Upstream"} 1058s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 1058s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 1058s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38","Hdr" => "tree 8ed831332c39bd0f121a33979bdcd4aeee8cff38\nparent a7dcce470e3e188e596a71a3b6a7046b999571ca\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000017 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1058s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 1058s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 1058s git-debrebase = Upstream {"Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831","CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Ix" => 0}]} 1058s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 1058s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 1058s git-debrebase = Upstream {"Parents" => [{"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Ix" => 0,"Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "616d04e4126efffc468fa930bc9ff5f98c51c790","Hdr" => "tree 616d04e4126efffc468fa930bc9ff5f98c51c790\nparent f730b85f299afe1020b13e03243511c5bd8a6cbe\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Type" => "Upstream"} 1058s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 1058s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 1058s git-debrebase = Packaging {"Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413","Hdr" => "tree 54841f8593cfec2b2b97883fcba32cab336ca413\nparent 90368bf36b087c93f0dfbdb6534beaf38a8f44b6\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Type" => "Packaging","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" => [{"Differs" => 48,"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Ix" => 0}]} 1058s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 1058s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 1058s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 1058s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"Ix" => 1,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527","Differs" => 48}],"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","Parents" => [{"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]],"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Hdr" => "tree b9594437541a0d9cd3cf49322f146f3e573967e7\nparent a5e5523a5fe98dba70b9397fa26103193cccbabd\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n"} 1058s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1058s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1058s ' 1058s + case $state in 1058s + egrep '^ *branch is laundered' ../status.check 1058s branch is laundered 1058s + t-gdr-good-analyse HEAD laundered 1058s + local head=HEAD 1058s + local state=laundered 1058s + local wsfx= 1058s + local etypes bwtip 1058s + case $state in 1058s + etypes=Upstream 1058s ++ t-git-debrebase breakwater 1058s ++ local gdr=git-debrebase 1058s ++ : ' 1058s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1058s ++ git-debrebase --dgit=dgit -D breakwater 1058s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 1058s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 1058s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f"}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 28033291551e80f8f5e16a90271754ad87575e3f\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Upstream","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14"} 1058s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 1058s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 1058s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547"}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Hdr" => "tree ff4553064af3dcb78ccc5c522da6fe428096e94a\nparent 8fc2dd44802dbfbda6714a8300c0f2ffd035c547\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Upstream","Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a"} 1058s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 1058s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 1058s git-debrebase = Upstream {"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Parents" => [{"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Ix" => 0,"Differs" => 2}],"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","Type" => "Upstream"} 1058s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 1058s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 1058s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db"}],"Tree" => "2de73fb98a33c21de5b8672952c1fd652dec8627","Type" => "Upstream","CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Hdr" => "tree 2de73fb98a33c21de5b8672952c1fd652dec8627\nparent 1ca66fb225fad62360bdceb664ba6d30edd5a9db\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n"} 1058s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 1058s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 1058s git-debrebase = Upstream {"Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38","Type" => "Upstream","CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","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","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca"}]} 1058s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 1058s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 1058s git-debrebase = Upstream {"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Upstream","Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831","Parents" => [{"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Ix" => 0,"Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1058s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 1058s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 1058s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "616d04e4126efffc468fa930bc9ff5f98c51c790","Hdr" => "tree 616d04e4126efffc468fa930bc9ff5f98c51c790\nparent f730b85f299afe1020b13e03243511c5bd8a6cbe\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe"}]} 1058s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 1058s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 1058s git-debrebase = Packaging {"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Hdr" => "tree 54841f8593cfec2b2b97883fcba32cab336ca413\nparent 90368bf36b087c93f0dfbdb6534beaf38a8f44b6\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Packaging","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"} 1058s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 1058s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 1058s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 1058s 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","Parents" => [{"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd","Ix" => 0,"Differs" => 2},{"Differs" => 48,"Ix" => 1,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"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","Type" => "Anchor"} 1058s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1058s ' 1058s + bwtip=Y:f730b85f299afe1020b13e03243511c5bd8a6cbe 1058s + anal=../anal 1058s + t-git-debrebase analyse HEAD 1058s + local gdr=git-debrebase 1058s + : ' 1058s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1058s + git-debrebase --dgit=dgit -D analyse HEAD 1058s git-debrebase *** WALK 84ac322ff033ab96c026918c20e3a958c6d24146 1 *main::STDOUT 1058s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 1058s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 1058s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f"}],"Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 28033291551e80f8f5e16a90271754ad87575e3f\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","Type" => "Upstream","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14"} 1058s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 1058s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 1058s 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"}],"Type" => "Upstream","Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a","CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1"} 1058s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 1058s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 1058s git-debrebase = Upstream {"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","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","Type" => "Upstream"} 1058s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 1058s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 1058s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "2de73fb98a33c21de5b8672952c1fd652dec8627","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Hdr" => "tree 2de73fb98a33c21de5b8672952c1fd652dec8627\nparent 1ca66fb225fad62360bdceb664ba6d30edd5a9db\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db"}]} 1058s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 1058s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 1058s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","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"} 1058s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 1058s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 1058s git-debrebase = Upstream {"Parents" => [{"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Ix" => 0,"Differs" => 2}],"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","Type" => "Upstream","Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831"} 1058s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 1058s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 1058s git-debrebase = Upstream {"Parents" => [{"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Ix" => 0,"Differs" => 2}],"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"} 1058s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 1058s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 1058s git-debrebase = 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","Type" => "Packaging","Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413","Parents" => [{"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Differs" => 48,"Ix" => 0}],"Hdr" => "tree 54841f8593cfec2b2b97883fcba32cab336ca413\nparent 90368bf36b087c93f0dfbdb6534beaf38a8f44b6\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n"} 1058s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 1058s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 1058s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 1058s git-debrebase = Anchor {"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","OrigParents" => [{"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527","Ix" => 1,"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 anchor: convert dgit import: upstream update]\n","Type" => "Anchor","Tree" => "b9594437541a0d9cd3cf49322f146f3e573967e7","Parents" => [{"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd","Differs" => 2,"Ix" => 0},$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"} 1058s git-debrebase *** WALK prep done cur=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 brw 0 upp 6 proc 8 pm -1 1058s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1058s ' 1058s ++ git rev-parse HEAD 1058s + expect=84ac322ff033ab96c026918c20e3a958c6d24146 1058s + exec 1058s + local cid ctype info nparents 1058s + read cid ctype info 1058s + : ===== 84ac322ff033ab96c026918c20e3a958c6d24146 Upstream ===== 1058s + test 84ac322ff033ab96c026918c20e3a958c6d24146 = 84ac322ff033ab96c026918c20e3a958c6d24146 1058s + local cetype=Upstream 1058s + '[' xUpstream = xUpstream ']' 1058s + cetype=SAME 1058s ++ git log -n1 --pretty=format:%P 84ac322ff033ab96c026918c20e3a958c6d24146 1058s + local parents=28033291551e80f8f5e16a90271754ad87575e3f 1058s + expect=28033291551e80f8f5e16a90271754ad87575e3f 1058s + enparents=1 1058s + : Upstream/SAME 28033291551e80f8f5e16a90271754ad87575e3f 1058s + case "$ctype/$cetype" in 1058s + case "$ctype/$etypes" in 1058s + case "$cetype" in 1058s + case "$ctype" in 1058s ++ printf %s 28033291551e80f8f5e16a90271754ad87575e3f 1058s ++ wc -w 1058s + local cnparents=1 1058s + test 1 = 1 1058s ++ for f in $parents 1058s ++ echo 28033291551e80f8f5e16a90271754ad87575e3f 1058s ++ wc -w 1058s ++ t-sort -u 1058s ++ LC_COLLATE=C 1058s ++ sort -u 1058s + local cndparents=1 1058s + test 1 = 1 1058s + case "$parents" in 1058s + case "$ctype" in 1058s + read cid ctype info 1058s + : ===== 28033291551e80f8f5e16a90271754ad87575e3f Upstream ===== 1058s + test 28033291551e80f8f5e16a90271754ad87575e3f = 28033291551e80f8f5e16a90271754ad87575e3f 1058s + local cetype=Upstream 1058s + '[' xUpstream = xUpstream ']' 1058s + cetype=SAME 1058s ++ git log -n1 --pretty=format:%P 28033291551e80f8f5e16a90271754ad87575e3f 1058s + local parents=8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1058s + expect=8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1058s + enparents=1 1058s + : Upstream/SAME 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1058s + case "$ctype/$cetype" in 1058s + case "$ctype/$etypes" in 1058s + case "$cetype" in 1058s + case "$ctype" in 1058s ++ printf %s 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1058s ++ wc -w 1058s + local cnparents=1 1058s + test 1 = 1 1058s ++ for f in $parents 1058s ++ echo 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1058s ++ wc -w 1058s ++ t-sort -u 1058s ++ LC_COLLATE=C 1058s ++ sort -u 1058s + local cndparents=1 1058s + test 1 = 1 1058s + case "$parents" in 1058s + case "$ctype" in 1058s + read cid ctype info 1058s + : ===== 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 Upstream ===== 1058s + test 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 = 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1058s + local cetype=Upstream 1058s + '[' xUpstream = xUpstream ']' 1058s + cetype=SAME 1058s ++ git log -n1 --pretty=format:%P 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1058s + local parents=efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1058s + expect=efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1058s + enparents=1 1058s + : Upstream/SAME efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1058s + case "$ctype/$cetype" in 1058s + case "$ctype/$etypes" in 1058s + case "$cetype" in 1058s + case "$ctype" in 1058s ++ printf %s efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1058s ++ wc -w 1058s + local cnparents=1 1058s + test 1 = 1 1058s ++ for f in $parents 1058s ++ echo efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1058s ++ wc -w 1058s ++ t-sort -u 1058s ++ LC_COLLATE=C 1058s ++ sort -u 1058s + local cndparents=1 1058s + test 1 = 1 1058s + case "$parents" in 1058s + case "$ctype" in 1058s + read cid ctype info 1058s + : ===== efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a Upstream ===== 1058s + test efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a = efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1058s + local cetype=Upstream 1058s + '[' xUpstream = xUpstream ']' 1058s + cetype=SAME 1058s ++ git log -n1 --pretty=format:%P efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1058s + local parents=1ca66fb225fad62360bdceb664ba6d30edd5a9db 1058s + expect=1ca66fb225fad62360bdceb664ba6d30edd5a9db 1058s + enparents=1 1058s + : Upstream/SAME 1ca66fb225fad62360bdceb664ba6d30edd5a9db 1058s + case "$ctype/$cetype" in 1058s + case "$ctype/$etypes" in 1058s + case "$cetype" in 1058s + case "$ctype" in 1058s ++ printf %s 1ca66fb225fad62360bdceb664ba6d30edd5a9db 1058s ++ wc -w 1058s + local cnparents=1 1058s + test 1 = 1 1058s ++ for f in $parents 1058s ++ echo 1ca66fb225fad62360bdceb664ba6d30edd5a9db 1058s ++ t-sort -u 1058s ++ wc -w 1058s ++ LC_COLLATE=C 1058s ++ sort -u 1058s + local cndparents=1 1058s + test 1 = 1 1058s + case "$parents" in 1058s + case "$ctype" in 1058s + read cid ctype info 1058s + : ===== 1ca66fb225fad62360bdceb664ba6d30edd5a9db Upstream ===== 1058s + test 1ca66fb225fad62360bdceb664ba6d30edd5a9db = 1ca66fb225fad62360bdceb664ba6d30edd5a9db 1058s + local cetype=Upstream 1058s + '[' xUpstream = xUpstream ']' 1058s + cetype=SAME 1058s ++ git log -n1 --pretty=format:%P 1ca66fb225fad62360bdceb664ba6d30edd5a9db 1058s + local parents=a7dcce470e3e188e596a71a3b6a7046b999571ca 1058s + expect=a7dcce470e3e188e596a71a3b6a7046b999571ca 1058s + enparents=1 1058s + : Upstream/SAME a7dcce470e3e188e596a71a3b6a7046b999571ca 1058s + case "$ctype/$cetype" in 1058s + case "$ctype/$etypes" in 1058s + case "$cetype" in 1058s + case "$ctype" in 1058s ++ printf %s a7dcce470e3e188e596a71a3b6a7046b999571ca 1058s ++ wc -w 1058s + local cnparents=1 1058s + test 1 = 1 1058s ++ for f in $parents 1058s ++ echo a7dcce470e3e188e596a71a3b6a7046b999571ca 1058s ++ wc -w 1058s ++ t-sort -u 1058s ++ LC_COLLATE=C 1058s ++ sort -u 1058s + local cndparents=1 1058s + test 1 = 1 1058s + case "$parents" in 1058s + case "$ctype" in 1058s + read cid ctype info 1058s + : ===== a7dcce470e3e188e596a71a3b6a7046b999571ca Upstream ===== 1058s + test a7dcce470e3e188e596a71a3b6a7046b999571ca = a7dcce470e3e188e596a71a3b6a7046b999571ca 1058s + local cetype=Upstream 1058s + '[' xUpstream = xUpstream ']' 1058s + cetype=SAME 1058s ++ git log -n1 --pretty=format:%P a7dcce470e3e188e596a71a3b6a7046b999571ca 1058s + local parents=1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1058s + expect=1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1058s + enparents=1 1058s + : Upstream/SAME 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1058s + case "$ctype/$cetype" in 1058s + case "$ctype/$etypes" in 1058s + case "$cetype" in 1058s + case "$ctype" in 1058s ++ printf %s 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1058s ++ wc -w 1058s + local cnparents=1 1058s + test 1 = 1 1058s ++ for f in $parents 1058s ++ echo 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1058s ++ t-sort -u 1058s ++ wc -w 1058s ++ LC_COLLATE=C 1058s ++ sort -u 1058s + local cndparents=1 1058s + test 1 = 1 1058s + case "$parents" in 1058s + case "$ctype" in 1058s + read cid ctype info 1058s + : ===== 1bda1595899985b5bc1d1b75fbf6dbb6645490dc Upstream ===== 1058s + test 1bda1595899985b5bc1d1b75fbf6dbb6645490dc = 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1058s + local cetype=Upstream 1058s + '[' xUpstream = xUpstream ']' 1058s + cetype=SAME 1058s ++ git log -n1 --pretty=format:%P 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1058s + local parents=f730b85f299afe1020b13e03243511c5bd8a6cbe 1058s + expect=f730b85f299afe1020b13e03243511c5bd8a6cbe 1058s + enparents=1 1058s + : Upstream/SAME f730b85f299afe1020b13e03243511c5bd8a6cbe 1058s + case "$ctype/$cetype" in 1058s + case "$ctype/$etypes" in 1058s + case "$cetype" in 1058s + case "$ctype" in 1058s ++ printf %s f730b85f299afe1020b13e03243511c5bd8a6cbe 1058s ++ wc -w 1058s + local cnparents=1 1058s + test 1 = 1 1058s ++ for f in $parents 1058s ++ echo f730b85f299afe1020b13e03243511c5bd8a6cbe 1058s ++ wc -w 1058s ++ t-sort -u 1058s ++ LC_COLLATE=C 1058s ++ sort -u 1058s + local cndparents=1 1058s + test 1 = 1 1058s + case "$parents" in 1058s + case "$ctype" in 1058s + read cid ctype info 1058s + : ===== f730b85f299afe1020b13e03243511c5bd8a6cbe Packaging ===== 1058s + test f730b85f299afe1020b13e03243511c5bd8a6cbe = f730b85f299afe1020b13e03243511c5bd8a6cbe 1058s + local cetype=Upstream 1058s + '[' xPackaging = xUpstream ']' 1058s ++ git log -n1 --pretty=format:%P f730b85f299afe1020b13e03243511c5bd8a6cbe 1058s + local parents=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1058s + expect=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1058s + enparents=1 1058s + : Packaging/Upstream 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1058s + case "$ctype/$cetype" in 1058s + case "$ctype/$etypes" in 1058s + '[' xY:f730b85f299afe1020b13e03243511c5bd8a6cbe '!=' x ']' 1058s + test Y:f730b85f299afe1020b13e03243511c5bd8a6cbe = Y:f730b85f299afe1020b13e03243511c5bd8a6cbe 1058s + bwtip= 1058s + case "$cetype" in 1058s + case "$ctype" in 1058s + git diff --quiet 90368bf36b087c93f0dfbdb6534beaf38a8f44b6..f730b85f299afe1020b13e03243511c5bd8a6cbe -- :. ':!debian' 1058s + git diff --quiet 90368bf36b087c93f0dfbdb6534beaf38a8f44b6..f730b85f299afe1020b13e03243511c5bd8a6cbe -- :debian/patches 1058s + etypes=Packaging 1058s ++ printf %s 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1058s ++ wc -w 1058s + local cnparents=1 1058s + test 1 = 1 1058s ++ for f in $parents 1058s ++ echo 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1058s ++ wc -w 1058s ++ t-sort -u 1058s ++ LC_COLLATE=C 1058s ++ sort -u 1058s + local cndparents=1 1058s + test 1 = 1 1058s + case "$parents" in 1058s + case "$ctype" in 1058s + read cid ctype info 1058s + : ===== 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 Anchor ===== 1058s + test 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 = 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1058s + local cetype=Packaging 1058s + '[' xAnchor = xPackaging ']' 1058s ++ git log -n1 --pretty=format:%P 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1058s + local 'parents=a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 1058s + expect='a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 1058s + enparents=1 1058s + : Anchor/Packaging 'a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 1058s + case "$ctype/$cetype" in 1058s + case "$ctype/$etypes" in 1058s + case "$cetype" in 1058s + case "$ctype" in 1058s + break 1058s + t-git-debrebase stitch 1058s + local gdr=git-debrebase 1058s + : ' 1058s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1058s + git-debrebase --dgit=dgit -D stitch 1059s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1059s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 1059s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f"}],"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","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146"} 1059s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 1059s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 1059s git-debrebase = Upstream {"Parents" => [{"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Differs" => 2,"Ix" => 0}],"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a","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","Type" => "Upstream"} 1059s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 1059s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Differs" => 2,"Ix" => 0}],"Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch"} 1059s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 1059s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 1059s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db"}],"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","CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Type" => "Upstream"} 1059s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 1059s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca"}],"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","CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38"} 1059s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 1059s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 1059s git-debrebase = Upstream {"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n","Parents" => [{"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1059s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 1059s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 1059s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe"}],"Tree" => "616d04e4126efffc468fa930bc9ff5f98c51c790","CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 616d04e4126efffc468fa930bc9ff5f98c51c790\nparent f730b85f299afe1020b13e03243511c5bd8a6cbe\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Upstream"} 1059s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 1059s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 1059s git-debrebase = Packaging {"Parents" => [{"Differs" => 48,"Ix" => 0,"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6"}],"Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413","CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","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","Type" => "Packaging"} 1059s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 1059s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 1059s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 1059s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527","Differs" => 48,"Ix" => 1}],"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd"},$VAR1->{"OrigParents"}[0]],"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","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","Type" => "Anchor","Tree" => "b9594437541a0d9cd3cf49322f146f3e573967e7"} 1059s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1059s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1059s git-debrebase >= delete refs/ffq-prev/heads/master cfab37c19bff9fd6c55919a11af887e45eb3af44 1059s git-debrebase >= update refs/debrebase-last/heads/master 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 0000000000000000000000000000000000000000 1059s git-debrebase >= update HEAD 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 84ac322ff033ab96c026918c20e3a958c6d24146 1059s git-debrebase >$ 1059s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1059s ' 1059s + t-gdr-good stitched 1059s + local state=stitched 1059s + local beforetag= 1059s + case $state in 1059s + git diff --quiet -- :. ':!debian/patches' 1059s + LC_MESSAGES=C 1059s + t-git-debrebase status 1059s + local gdr=git-debrebase 1059s + : ' 1059s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1059s + git-debrebase --dgit=dgit -D status 1059s git-debrebase get_differs 84ac322ff033ab96c026918c20e3a958c6d24146 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0 1059s git-debrebase get_differs cfab37c19bff9fd6c55919a11af887e45eb3af44 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x8 1059s git-debrebase classify 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 84ac322ff033ab96c026918c20e3a958c6d24146/0 cfab37c19bff9fd6c55919a11af887e45eb3af44/0x8 1059s git-debrebase = Pseudomerge {"Contributor" => {"CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Differs" => 0,"Ix" => 0},"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Type" => "Pseudomerge","CommitId" => "22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51","Parents" => [$VAR1->{"Contributor"},{"Differs" => 8,"CommitId" => "cfab37c19bff9fd6c55919a11af887e45eb3af44","Ix" => 1}],"Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 84ac322ff033ab96c026918c20e3a958c6d24146\nparent cfab37c19bff9fd6c55919a11af887e45eb3af44\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000017 +0100\n","Overwritten" => [$VAR1->{"Parents"}[1]],"Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14"} 1059s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 1059s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 1059s 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","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","Type" => "Upstream","CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f"}]} 1059s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 1059s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Differs" => 2,"Ix" => 0}],"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a","Hdr" => "tree ff4553064af3dcb78ccc5c522da6fe428096e94a\nparent 8fc2dd44802dbfbda6714a8300c0f2ffd035c547\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n"} 1059s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 1059s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 1059s git-debrebase = Upstream {"Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Parents" => [{"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 1059s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 1059s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 1059s git-debrebase = 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","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db"}],"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a"} 1059s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 1059s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 1059s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Ix" => 0}],"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Type" => "Upstream","Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 8ed831332c39bd0f121a33979bdcd4aeee8cff38\nparent a7dcce470e3e188e596a71a3b6a7046b999571ca\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000017 +0100\n"} 1059s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 1059s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Parents" => [{"Differs" => 2,"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Ix" => 0}],"Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1059s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 1059s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Ix" => 0}],"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "616d04e4126efffc468fa930bc9ff5f98c51c790","Hdr" => "tree 616d04e4126efffc468fa930bc9ff5f98c51c790\nparent f730b85f299afe1020b13e03243511c5bd8a6cbe\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000017 +0100\n"} 1059s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 1059s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 1059s git-debrebase = Packaging {"Parents" => [{"Differs" => 48,"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Ix" => 0}],"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Type" => "Packaging","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","Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413","Hdr" => "tree 54841f8593cfec2b2b97883fcba32cab336ca413\nparent 90368bf36b087c93f0dfbdb6534beaf38a8f44b6\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n"} 1059s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 1059s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 1059s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 1059s 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","Tree" => "b9594437541a0d9cd3cf49322f146f3e573967e7","Type" => "Anchor","CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Parents" => [{"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd","Differs" => 2,"Ix" => 0},{"Ix" => 1,"Differs" => 48,"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","OrigParents" => [$VAR1->{"Parents"}[1]]} 1059s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1059s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1059s ' 1059s + case $state in 1059s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 1059s branch contains furniture (not laundered) 1059s + egrep '^ stitched$' ../status.check 1059s stitched 1059s + t-gdr-good-analyse HEAD stitched 1059s + local head=HEAD 1059s + local state=stitched 1059s + local wsfx= 1059s + local etypes bwtip 1059s + case $state in 1059s + etypes=Pseudomerge-Upstream 1059s + anal=../anal 1059s + t-git-debrebase analyse HEAD 1059s + local gdr=git-debrebase 1059s + : ' 1059s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1059s + git-debrebase --dgit=dgit -D analyse HEAD 1059s git-debrebase *** WALK 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 1 *main::STDOUT 1059s git-debrebase get_differs 84ac322ff033ab96c026918c20e3a958c6d24146 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0 1059s git-debrebase get_differs cfab37c19bff9fd6c55919a11af887e45eb3af44 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x8 1059s git-debrebase classify 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 84ac322ff033ab96c026918c20e3a958c6d24146/0 cfab37c19bff9fd6c55919a11af887e45eb3af44/0x8 1059s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","CommitId" => "22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51","Type" => "Pseudomerge","Parents" => [{"Ix" => 0,"CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Differs" => 0},{"Differs" => 8,"CommitId" => "cfab37c19bff9fd6c55919a11af887e45eb3af44","Ix" => 1}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 84ac322ff033ab96c026918c20e3a958c6d24146\nparent cfab37c19bff9fd6c55919a11af887e45eb3af44\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000017 +0100\n"} 1059s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 1059s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Differs" => 2}],"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","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146"} 1059s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 1059s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 1059s git-debrebase = Upstream {"Hdr" => "tree ff4553064af3dcb78ccc5c522da6fe428096e94a\nparent 8fc2dd44802dbfbda6714a8300c0f2ffd035c547\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547"}],"Type" => "Upstream","CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1"} 1059s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 1059s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Ix" => 0,"Differs" => 2}],"Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86"} 1059s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 1059s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 1059s git-debrebase = Upstream {"Hdr" => "tree 2de73fb98a33c21de5b8672952c1fd652dec8627\nparent 1ca66fb225fad62360bdceb664ba6d30edd5a9db\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Ix" => 0}],"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Tree" => "2de73fb98a33c21de5b8672952c1fd652dec8627","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch"} 1059s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 1059s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 1059s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Ix" => 0}],"Hdr" => "tree 8ed831332c39bd0f121a33979bdcd4aeee8cff38\nparent a7dcce470e3e188e596a71a3b6a7046b999571ca\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000017 +0100\n"} 1059s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 1059s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 1059s git-debrebase = Upstream {"Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc"}],"Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831","CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1059s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 1059s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Ix" => 0,"Differs" => 2}],"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"} 1059s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 1059s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 1059s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Ix" => 0,"Differs" => 48}],"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","CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413"} 1059s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 1059s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 1059s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 1059s 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","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527"}],"Tree" => "b9594437541a0d9cd3cf49322f146f3e573967e7","CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Type" => "Anchor","Parents" => [{"Differs" => 2,"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd","Ix" => 0},$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"} 1059s git-debrebase *** WALK prep done cur=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 brw 0 upp 7 proc 10 pm 0 1059s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1059s ' 1059s ++ git rev-parse HEAD 1059s + expect=22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 1059s + exec 1059s + local cid ctype info nparents 1059s + read cid ctype info 1059s + : ===== 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 Pseudomerge Contributor=84ac322ff033ab96c026918c20e3a958c6d24146 ===== 1059s + test 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 = 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 1059s + local cetype=Pseudomerge 1059s + '[' xPseudomerge = xPseudomerge ']' 1059s + cetype=SAME 1059s ++ git log -n1 --pretty=format:%P 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 1059s + local 'parents=84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44' 1059s + expect='84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44' 1059s + enparents=1 1059s + : Pseudomerge/SAME '84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44' 1059s + case "$ctype/$cetype" in 1059s + case "$ctype/$etypes" in 1059s + case "$cetype" in 1059s + case "$ctype" in 1059s + expect=84ac322ff033ab96c026918c20e3a958c6d24146 1059s + expect=84ac322ff033ab96c026918c20e3a958c6d24146 1059s + enparents=2 1059s + git diff --quiet 84ac322ff033ab96c026918c20e3a958c6d24146..22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 1059s + etypes=Upstream 1059s + : 'reject pointless pseudomerges' 1059s + local 'overwritten= cfab37c19bff9fd6c55919a11af887e45eb3af44' 1059s + overwritten=cfab37c19bff9fd6c55919a11af887e45eb3af44 1059s + t-git-debrebase analyse cfab37c19bff9fd6c55919a11af887e45eb3af44 1059s + local gdr=git-debrebase 1059s + : ' 1059s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1059s + git-debrebase --dgit=dgit -D analyse cfab37c19bff9fd6c55919a11af887e45eb3af44 1059s git-debrebase *** WALK cfab37c19bff9fd6c55919a11af887e45eb3af44 1 *main::STDOUT 1059s git-debrebase get_differs 4b8c76d051e32cfd5c0f423504742148ed9e07a4 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0x36 1059s git-debrebase get_differs a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0 1059s git-debrebase classify cfab37c19bff9fd6c55919a11af887e45eb3af44 $t=fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 @p 4b8c76d051e32cfd5c0f423504742148ed9e07a4/0x36 a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7/0 1059s git-debrebase = Pseudomerge {"Contributor" => {"CommitId" => "a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7","Differs" => 0,"Ix" => 1},"Parents" => [{"Ix" => 0,"CommitId" => "4b8c76d051e32cfd5c0f423504742148ed9e07a4","Differs" => 54},$VAR1->{"Contributor"}],"Overwritten" => [$VAR1->{"Parents"}[0]],"Type" => "Pseudomerge","Tree" => "fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6","Msg" => "Record example (2.1-0+nmu1) in archive suite sid\n","CommitId" => "cfab37c19bff9fd6c55919a11af887e45eb3af44","Hdr" => "tree fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6\nparent 4b8c76d051e32cfd5c0f423504742148ed9e07a4\nparent a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000014 +0000\n"} 1059s git-debrebase get_differs 81d8596985612b198bef8077a81b9f493a86bd17 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0x2 1059s git-debrebase classify a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 $t=fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 @p 81d8596985612b198bef8077a81b9f493a86bd17/0x2 1059s git-debrebase = Upstream {"Tree" => "fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","CommitId" => "a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7","Hdr" => "tree fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6\nparent 81d8596985612b198bef8077a81b9f493a86bd17\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000014 +0000\n","Parents" => [{"CommitId" => "81d8596985612b198bef8077a81b9f493a86bd17","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 1059s git-debrebase get_differs 9030a2f23038d2f402171d4ce0b637846272eabf 2b5743524074b13f18388c85f0ab3a4675727f25 = 0x2 1059s git-debrebase classify 81d8596985612b198bef8077a81b9f493a86bd17 $t=2b5743524074b13f18388c85f0ab3a4675727f25 @p 9030a2f23038d2f402171d4ce0b637846272eabf/0x2 1059s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "9030a2f23038d2f402171d4ce0b637846272eabf","Ix" => 0}],"Type" => "Upstream","CommitId" => "81d8596985612b198bef8077a81b9f493a86bd17","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","Tree" => "2b5743524074b13f18388c85f0ab3a4675727f25","Hdr" => "tree 2b5743524074b13f18388c85f0ab3a4675727f25\nparent 9030a2f23038d2f402171d4ce0b637846272eabf\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000014 +0000\n"} 1059s git-debrebase get_differs 90bfe62f6454203b392beea73d3366747a145432 e3680aec0b2b043eb1fc1bb33973bdece72374b5 = 0x2 1059s git-debrebase classify 9030a2f23038d2f402171d4ce0b637846272eabf $t=e3680aec0b2b043eb1fc1bb33973bdece72374b5 @p 90bfe62f6454203b392beea73d3366747a145432/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "90bfe62f6454203b392beea73d3366747a145432","Ix" => 0}],"Hdr" => "tree e3680aec0b2b043eb1fc1bb33973bdece72374b5\nparent 90bfe62f6454203b392beea73d3366747a145432\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000014 +0000\n","CommitId" => "9030a2f23038d2f402171d4ce0b637846272eabf","Tree" => "e3680aec0b2b043eb1fc1bb33973bdece72374b5","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch"} 1059s git-debrebase get_differs 1d3db2255664fa14deafceb28bea050df8f692f5 dd5fa39e05cd2d16628cd518828b599193709422 = 0x2 1059s git-debrebase classify 90bfe62f6454203b392beea73d3366747a145432 $t=dd5fa39e05cd2d16628cd518828b599193709422 @p 1d3db2255664fa14deafceb28bea050df8f692f5/0x2 1059s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "1d3db2255664fa14deafceb28bea050df8f692f5","Ix" => 0}],"Type" => "Upstream","Tree" => "dd5fa39e05cd2d16628cd518828b599193709422","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","CommitId" => "90bfe62f6454203b392beea73d3366747a145432","Hdr" => "tree dd5fa39e05cd2d16628cd518828b599193709422\nparent 1d3db2255664fa14deafceb28bea050df8f692f5\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000014 +0000\n"} 1059s git-debrebase get_differs 5dd6a6e50a46e433773f5d68475b27acda36bd78 64dbf9bd449b82949cb964daf820d7d9c12ddc1b = 0x2 1059s git-debrebase classify 1d3db2255664fa14deafceb28bea050df8f692f5 $t=64dbf9bd449b82949cb964daf820d7d9c12ddc1b @p 5dd6a6e50a46e433773f5d68475b27acda36bd78/0x2 1059s git-debrebase = Upstream {"Tree" => "64dbf9bd449b82949cb964daf820d7d9c12ddc1b","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "1d3db2255664fa14deafceb28bea050df8f692f5","Hdr" => "tree 64dbf9bd449b82949cb964daf820d7d9c12ddc1b\nparent 5dd6a6e50a46e433773f5d68475b27acda36bd78\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000014 +0000\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5dd6a6e50a46e433773f5d68475b27acda36bd78"}],"Type" => "Upstream"} 1059s git-debrebase get_differs 439d330e0a4b3e4941acdbce4cda9605ea1c993e 50ecbd6a17951348a127992f7a6688a3f830177b = 0x2 1059s git-debrebase classify 5dd6a6e50a46e433773f5d68475b27acda36bd78 $t=50ecbd6a17951348a127992f7a6688a3f830177b @p 439d330e0a4b3e4941acdbce4cda9605ea1c993e/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "439d330e0a4b3e4941acdbce4cda9605ea1c993e","Ix" => 0}],"Hdr" => "tree 50ecbd6a17951348a127992f7a6688a3f830177b\nparent 439d330e0a4b3e4941acdbce4cda9605ea1c993e\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000014 +0000\n","CommitId" => "5dd6a6e50a46e433773f5d68475b27acda36bd78","Tree" => "50ecbd6a17951348a127992f7a6688a3f830177b","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1059s git-debrebase get_differs 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce 1532541e2f6366582d6b27d965181748e3f8904a = 0x2 1059s git-debrebase classify 439d330e0a4b3e4941acdbce4cda9605ea1c993e $t=1532541e2f6366582d6b27d965181748e3f8904a @p 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "3840466cb74b8a6a4ed3ec06a72e03175d74a9ce","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 1532541e2f6366582d6b27d965181748e3f8904a\nparent 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "1532541e2f6366582d6b27d965181748e3f8904a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "439d330e0a4b3e4941acdbce4cda9605ea1c993e"} 1059s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 648a3758d9b667d29500784c4b37ed8354be0810 = 0x34 1059s git-debrebase get_differs d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81 648a3758d9b667d29500784c4b37ed8354be0810 = 0x36 1059s git-debrebase classify 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce $t=648a3758d9b667d29500784c4b37ed8354be0810 @p 8c5d0e0174b5de39e69e18884925db0015d27527/0x34 d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81/0x36 1059s git-debrebase = DgitImportUnpatched {"Parents" => [{"IsOrigin" => 1,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527","Differs" => 52,"Ix" => 0,"IsDgitImport" => "orig"},{"IsOrigin" => 1,"IsDgitImport" => "tarball","Ix" => 1,"CommitId" => "d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81","Differs" => 54}],"CommitId" => "3840466cb74b8a6a4ed3ec06a72e03175d74a9ce","Tree" => "648a3758d9b667d29500784c4b37ed8354be0810","Type" => "DgitImportUnpatched","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","Hdr" => "tree 648a3758d9b667d29500784c4b37ed8354be0810\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nparent d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000014 +0000\n","OrigParents" => [$VAR1->{"Parents"}[0]],"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"} 1059s git-debrebase get_differs 64bcb7d55956b0e3ebe624bf9040a976b183e414 3646aeb322533be919f218f7670519af795187ec = 0x4 1059s git-debrebase classify 4b8c76d051e32cfd5c0f423504742148ed9e07a4 $t=3646aeb322533be919f218f7670519af795187ec @p 64bcb7d55956b0e3ebe624bf9040a976b183e414/0x4 1059s git-debrebase = AddPatches {"Tree" => "3646aeb322533be919f218f7670519af795187ec","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "4b8c76d051e32cfd5c0f423504742148ed9e07a4","Hdr" => "tree 3646aeb322533be919f218f7670519af795187ec\nparent 64bcb7d55956b0e3ebe624bf9040a976b183e414\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Differs" => 4}],"Type" => "AddPatches"} 1059s git-debrebase get_differs 95f78a1ec281f58eba538b9baef816d74e131c60 588d548f5ba959c551704087c40f106f9f6369af = 0x10 1059s git-debrebase classify 64bcb7d55956b0e3ebe624bf9040a976b183e414 $t=588d548f5ba959c551704087c40f106f9f6369af @p 95f78a1ec281f58eba538b9baef816d74e131c60/0x10 1059s git-debrebase = Changelog {"Parents" => [{"CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Tree" => "588d548f5ba959c551704087c40f106f9f6369af","Msg" => "dch -r -D unstable\n","CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Hdr" => "tree 588d548f5ba959c551704087c40f106f9f6369af\nparent 95f78a1ec281f58eba538b9baef816d74e131c60\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 1059s git-debrebase get_differs a0e76af573321d5714d63cd5c464d783da6b72b4 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f = 0x10 1059s git-debrebase classify 95f78a1ec281f58eba538b9baef816d74e131c60 $t=7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f @p a0e76af573321d5714d63cd5c464d783da6b72b4/0x10 1059s git-debrebase = Changelog {"Msg" => "dch -v 2.0-3 -m incorporate nmu\n","Tree" => "7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f","CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Hdr" => "tree 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f\nparent a0e76af573321d5714d63cd5c464d783da6b72b4\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4"}],"Type" => "Changelog"} 1059s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0 1059s git-debrebase get_differs 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x8 1059s git-debrebase classify a0e76af573321d5714d63cd5c464d783da6b72b4 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5/0 1c8e3b534eac1867c8911d4e5f923d5f7bcee275/0x8 1059s git-debrebase = Pseudomerge {"Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5\nparent 1c8e3b534eac1867c8911d4e5f923d5f7bcee275\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Overwritten" => [{"Differs" => 8,"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","Ix" => 1}],"Type" => "Pseudomerge","Contributor" => {"Ix" => 0,"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Differs" => 0},"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 1059s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 1059s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 1059s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Ix" => 0}],"Type" => "Upstream","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 1059s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 1059s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 1059s 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","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Ix" => 0}]} 1059s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 1059s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 1059s git-debrebase = Upstream {"Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Differs" => 2}]} 1059s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 1059s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 1059s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830"}],"Type" => "Upstream"} 1059s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 1059s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 1059s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Differs" => 2}],"Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830"} 1059s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 1059s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 1059s git-debrebase = Packaging {"Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","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","Type" => "Packaging","Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Differs" => 48,"Ix" => 0}]} 1059s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1059s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 1059s 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","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Parents" => [{"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Differs" => 16,"Ix" => 0}]} 1059s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1059s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1059s git-debrebase = Changelog {"Type" => "Changelog","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","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1059s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1059s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1059s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1059s 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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 1059s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 14 proc 25 pm 1 1059s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1059s ' 1059s + local ocid otype oinfo 1059s + read ocid otype oinfo 1059s + case "$otype" in 1059s + test xContributor=84ac322ff033ab96c026918c20e3a958c6d24146 '!=' xContributor=a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 1059s ++ printf %s '84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44' 1059s ++ wc -w 1059s + local cnparents=2 1059s + test 2 = 2 1059s ++ for f in $parents 1059s ++ echo 84ac322ff033ab96c026918c20e3a958c6d24146 1059s ++ for f in $parents 1059s ++ echo cfab37c19bff9fd6c55919a11af887e45eb3af44 1059s ++ t-sort -u 1059s ++ LC_COLLATE=C 1059s ++ sort -u 1059s ++ wc -w 1059s + local cndparents=2 1059s + test 2 = 2 1059s + case "$parents" in 1059s + case "$ctype" in 1059s + read cid ctype info 1059s + : ===== 84ac322ff033ab96c026918c20e3a958c6d24146 Upstream ===== 1059s + test 84ac322ff033ab96c026918c20e3a958c6d24146 = 84ac322ff033ab96c026918c20e3a958c6d24146 1059s + local cetype=Upstream 1059s + '[' xUpstream = xUpstream ']' 1059s + cetype=SAME 1059s ++ git log -n1 --pretty=format:%P 84ac322ff033ab96c026918c20e3a958c6d24146 1059s + local parents=28033291551e80f8f5e16a90271754ad87575e3f 1059s + expect=28033291551e80f8f5e16a90271754ad87575e3f 1059s + enparents=1 1059s + : Upstream/SAME 28033291551e80f8f5e16a90271754ad87575e3f 1059s + case "$ctype/$cetype" in 1059s + case "$ctype/$etypes" in 1059s + case "$cetype" in 1059s + case "$ctype" in 1059s ++ printf %s 28033291551e80f8f5e16a90271754ad87575e3f 1059s ++ wc -w 1059s + local cnparents=1 1059s + test 1 = 1 1059s ++ t-sort -u 1059s ++ LC_COLLATE=C 1059s ++ sort -u 1059s ++ wc -w 1059s ++ for f in $parents 1059s ++ echo 28033291551e80f8f5e16a90271754ad87575e3f 1059s + local cndparents=1 1059s + test 1 = 1 1059s + case "$parents" in 1059s + case "$ctype" in 1059s + read cid ctype info 1059s + : ===== 28033291551e80f8f5e16a90271754ad87575e3f Upstream ===== 1059s + test 28033291551e80f8f5e16a90271754ad87575e3f = 28033291551e80f8f5e16a90271754ad87575e3f 1059s + local cetype=Upstream 1059s + '[' xUpstream = xUpstream ']' 1059s + cetype=SAME 1059s ++ git log -n1 --pretty=format:%P 28033291551e80f8f5e16a90271754ad87575e3f 1059s + local parents=8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1059s + expect=8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1059s + enparents=1 1059s + : Upstream/SAME 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1059s + case "$ctype/$cetype" in 1059s + case "$ctype/$etypes" in 1059s + case "$cetype" in 1059s + case "$ctype" in 1059s ++ printf %s 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1059s ++ wc -w 1059s + local cnparents=1 1059s + test 1 = 1 1059s ++ for f in $parents 1059s ++ echo 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1059s ++ wc -w 1059s ++ t-sort -u 1059s ++ LC_COLLATE=C 1059s ++ sort -u 1059s + local cndparents=1 1059s + test 1 = 1 1059s + case "$parents" in 1059s + case "$ctype" in 1059s + read cid ctype info 1059s + : ===== 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 Upstream ===== 1059s + test 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 = 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1059s + local cetype=Upstream 1059s + '[' xUpstream = xUpstream ']' 1059s + cetype=SAME 1059s ++ git log -n1 --pretty=format:%P 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 1059s + local parents=efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1059s + expect=efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1059s + enparents=1 1059s + : Upstream/SAME efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1059s + case "$ctype/$cetype" in 1059s + case "$ctype/$etypes" in 1059s + case "$cetype" in 1059s + case "$ctype" in 1059s ++ printf %s efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1059s ++ wc -w 1059s + local cnparents=1 1059s + test 1 = 1 1059s ++ t-sort -u 1059s ++ LC_COLLATE=C 1059s ++ sort -u 1059s ++ wc -w 1059s ++ for f in $parents 1059s ++ echo efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1059s + local cndparents=1 1059s + test 1 = 1 1059s + case "$parents" in 1059s + case "$ctype" in 1059s + read cid ctype info 1059s + : ===== efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a Upstream ===== 1059s + test efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a = efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1059s + local cetype=Upstream 1059s + '[' xUpstream = xUpstream ']' 1059s + cetype=SAME 1059s ++ git log -n1 --pretty=format:%P efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 1059s + local parents=1ca66fb225fad62360bdceb664ba6d30edd5a9db 1059s + expect=1ca66fb225fad62360bdceb664ba6d30edd5a9db 1059s + enparents=1 1059s + : Upstream/SAME 1ca66fb225fad62360bdceb664ba6d30edd5a9db 1059s + case "$ctype/$cetype" in 1059s + case "$ctype/$etypes" in 1059s + case "$cetype" in 1059s + case "$ctype" in 1059s ++ wc -w 1059s ++ printf %s 1ca66fb225fad62360bdceb664ba6d30edd5a9db 1059s + local cnparents=1 1059s + test 1 = 1 1059s ++ t-sort -u 1059s ++ LC_COLLATE=C 1059s ++ sort -u 1059s ++ wc -w 1059s ++ for f in $parents 1059s ++ echo 1ca66fb225fad62360bdceb664ba6d30edd5a9db 1059s + local cndparents=1 1059s + test 1 = 1 1059s + case "$parents" in 1059s + case "$ctype" in 1059s + read cid ctype info 1059s + : ===== 1ca66fb225fad62360bdceb664ba6d30edd5a9db Upstream ===== 1059s + test 1ca66fb225fad62360bdceb664ba6d30edd5a9db = 1ca66fb225fad62360bdceb664ba6d30edd5a9db 1059s + local cetype=Upstream 1059s + '[' xUpstream = xUpstream ']' 1059s + cetype=SAME 1059s ++ git log -n1 --pretty=format:%P 1ca66fb225fad62360bdceb664ba6d30edd5a9db 1059s + local parents=a7dcce470e3e188e596a71a3b6a7046b999571ca 1059s + expect=a7dcce470e3e188e596a71a3b6a7046b999571ca 1059s + enparents=1 1059s + : Upstream/SAME a7dcce470e3e188e596a71a3b6a7046b999571ca 1059s + case "$ctype/$cetype" in 1059s + case "$ctype/$etypes" in 1059s + case "$cetype" in 1059s + case "$ctype" in 1059s ++ printf %s a7dcce470e3e188e596a71a3b6a7046b999571ca 1059s ++ wc -w 1059s + local cnparents=1 1059s + test 1 = 1 1059s ++ t-sort -u 1059s ++ LC_COLLATE=C 1059s ++ sort -u 1059s ++ wc -w 1059s ++ for f in $parents 1059s ++ echo a7dcce470e3e188e596a71a3b6a7046b999571ca 1059s + local cndparents=1 1059s + test 1 = 1 1059s + case "$parents" in 1059s + case "$ctype" in 1059s + read cid ctype info 1059s + : ===== a7dcce470e3e188e596a71a3b6a7046b999571ca Upstream ===== 1059s + test a7dcce470e3e188e596a71a3b6a7046b999571ca = a7dcce470e3e188e596a71a3b6a7046b999571ca 1059s + local cetype=Upstream 1059s + '[' xUpstream = xUpstream ']' 1059s + cetype=SAME 1059s ++ git log -n1 --pretty=format:%P a7dcce470e3e188e596a71a3b6a7046b999571ca 1059s + local parents=1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1059s + expect=1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1059s + enparents=1 1059s + : Upstream/SAME 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1059s + case "$ctype/$cetype" in 1059s + case "$ctype/$etypes" in 1059s + case "$cetype" in 1059s + case "$ctype" in 1059s ++ printf %s 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1059s ++ wc -w 1059s + local cnparents=1 1059s + test 1 = 1 1059s ++ for f in $parents 1059s ++ echo 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1059s ++ t-sort -u 1059s ++ LC_COLLATE=C 1059s ++ sort -u 1059s ++ wc -w 1059s + local cndparents=1 1059s + test 1 = 1 1059s + case "$parents" in 1059s + case "$ctype" in 1059s + read cid ctype info 1059s + : ===== 1bda1595899985b5bc1d1b75fbf6dbb6645490dc Upstream ===== 1059s + test 1bda1595899985b5bc1d1b75fbf6dbb6645490dc = 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1059s + local cetype=Upstream 1059s + '[' xUpstream = xUpstream ']' 1059s + cetype=SAME 1059s ++ git log -n1 --pretty=format:%P 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 1059s + local parents=f730b85f299afe1020b13e03243511c5bd8a6cbe 1059s + expect=f730b85f299afe1020b13e03243511c5bd8a6cbe 1059s + enparents=1 1059s + : Upstream/SAME f730b85f299afe1020b13e03243511c5bd8a6cbe 1059s + case "$ctype/$cetype" in 1059s + case "$ctype/$etypes" in 1059s + case "$cetype" in 1059s + case "$ctype" in 1059s ++ printf %s f730b85f299afe1020b13e03243511c5bd8a6cbe 1059s ++ wc -w 1059s + local cnparents=1 1059s + test 1 = 1 1059s ++ for f in $parents 1059s ++ echo f730b85f299afe1020b13e03243511c5bd8a6cbe 1059s ++ wc -w 1059s ++ t-sort -u 1059s ++ LC_COLLATE=C 1059s ++ sort -u 1059s + local cndparents=1 1059s + test 1 = 1 1059s + case "$parents" in 1059s + case "$ctype" in 1059s + read cid ctype info 1059s + : ===== f730b85f299afe1020b13e03243511c5bd8a6cbe Packaging ===== 1059s + test f730b85f299afe1020b13e03243511c5bd8a6cbe = f730b85f299afe1020b13e03243511c5bd8a6cbe 1059s + local cetype=Upstream 1059s + '[' xPackaging = xUpstream ']' 1059s ++ git log -n1 --pretty=format:%P f730b85f299afe1020b13e03243511c5bd8a6cbe 1059s + local parents=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1059s + expect=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1059s + enparents=1 1059s + : Packaging/Upstream 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1059s + case "$ctype/$cetype" in 1059s + case "$ctype/$etypes" in 1059s + '[' x '!=' x ']' 1059s + case "$cetype" in 1059s + case "$ctype" in 1059s + git diff --quiet 90368bf36b087c93f0dfbdb6534beaf38a8f44b6..f730b85f299afe1020b13e03243511c5bd8a6cbe -- :. ':!debian' 1059s + git diff --quiet 90368bf36b087c93f0dfbdb6534beaf38a8f44b6..f730b85f299afe1020b13e03243511c5bd8a6cbe -- :debian/patches 1059s + etypes=Packaging 1059s ++ printf %s 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1059s ++ wc -w 1059s + local cnparents=1 1059s + test 1 = 1 1059s ++ for f in $parents 1059s ++ echo 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1059s ++ wc -w 1059s ++ t-sort -u 1059s ++ LC_COLLATE=C 1059s ++ sort -u 1059s + local cndparents=1 1059s + test 1 = 1 1059s + case "$parents" in 1059s + case "$ctype" in 1059s + read cid ctype info 1059s + : ===== 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 Anchor ===== 1059s + test 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 = 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1059s + local cetype=Packaging 1059s + '[' xAnchor = xPackaging ']' 1059s ++ git log -n1 --pretty=format:%P 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 1059s + local 'parents=a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 1059s + expect='a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 1059s + enparents=1 1059s + : Anchor/Packaging 'a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 1059s + case "$ctype/$cetype" in 1059s + case "$ctype/$etypes" in 1059s + case "$cetype" in 1059s + case "$ctype" in 1059s + break 1059s + t-ok 1059s + : ======================================== 1059s + t-check-only-bpd 1059s + '[' .. = .. ']' 1059s + return 1059s + t-fscks 1059s + shopt -s nullglob 1059s + for d in $tmp/*/.git $tmp/git/*.git 1059s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1059s + t-git-fsck 1059s ++ git rev-parse --git-dir 1059s + local fsckerrs=.git/dgit-test-fsck.errs 1059s + set +e 1059s + LC_MESSAGES=C 1059s + git fsck --no-dangling --strict 1059s + tee .git/dgit-test-fsck.errs 1059s + ps='0 0' 1059s + set -e 1059s + local pats 1059s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1059s + test '0 0' = '0 0' 1059s + pats+=(-e 'notice: HEAD points to an unborn branch') 1059s + pats+=(-e 'notice: No default references') 1059s + set +e 1059s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1059s + rc=1 1059s + set -e 1059s + case $rc in 1059s + for d in $tmp/*/.git $tmp/git/*.git 1059s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1059s + t-git-fsck 1059s ++ git rev-parse --git-dir 1059s + local fsckerrs=./dgit-test-fsck.errs 1059s + set +e 1059s + tee ./dgit-test-fsck.errs 1059s + LC_MESSAGES=C 1059s + git fsck --no-dangling --strict 1059s notice: HEAD points to an unborn branch (master) 1059s + ps='0 0' 1059s + set -e 1059s + local pats 1059s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1059s + test '0 0' = '0 0' 1059s + pats+=(-e 'notice: HEAD points to an unborn branch') 1059s + pats+=(-e 'notice: No default references') 1059s + set +e 1059s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1059s + rc=1 1059s + set -e 1059s + case $rc in 1059s + t-save-artifacts 1059s + artifacts=/tmp/autopkgtest.XK8uun/gdr-import-dgit-artifacts 1059s + '[' x/tmp/autopkgtest.XK8uun/gdr-import-dgit-artifacts = x ']' 1059s + '[' xtmp = x ']' 1059s + GZIP=-1v 1059s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-import-dgit-artifacts/gdr-import-dgit.tar.gz '--exclude=*.tar' . 1059s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1059s 80.1% 1059s + echo ok. 1059s ok. 1059s + rc=0 1059s + set +x 1059s + set +e 1059s + pwd 1059s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1059s + '[' x '!=' x ']' 1059s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1059s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1059s + set -e 1059s + test 0 = 0 1059s /tmp/autopkgtest.XK8uun/wrapper.sh: Killing leaked background processes: 17505 1059s PID TTY STAT TIME COMMAND 1059s 17505 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.XK8uun/build.980/src/tests/http-static-server /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1060s autopkgtest [23:04:50]: test gdr-import-dgit: -----------------------] 1060s autopkgtest [23:04:50]: test gdr-import-dgit: - - - - - - - - - - results - - - - - - - - - - 1060s gdr-import-dgit PASS 1061s autopkgtest [23:04:51]: test gdr-merge-conflicts: preparing testbed 1122s autopkgtest [23:05:52]: testbed dpkg architecture: ppc64el 1122s autopkgtest [23:05:52]: testbed apt version: 2.4.13 1122s autopkgtest [23:05:52]: @@@@@@@@@@@@@@@@@@@@ test bed setup 1122s autopkgtest [23:05:52]: testbed release detected to be: jammy 1123s autopkgtest [23:05:53]: updating testbed package index (apt update) 1123s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 1123s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 1124s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 1124s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 1124s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.2 kB] 1124s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 1124s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 1124s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el Packages [170 kB] 1124s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el c-n-f Metadata [2476 B] 1124s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el Packages [1704 B] 1124s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el c-n-f Metadata [116 B] 1124s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el Packages [85.0 kB] 1124s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el c-n-f Metadata [2064 B] 1124s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse ppc64el c-n-f Metadata [116 B] 1127s Fetched 715 kB in 1s (703 kB/s) 1127s Reading package lists... 1128s autopkgtest [23:05:58]: upgrading testbed (apt dist-upgrade and autopurge) 1128s Reading package lists... 1128s Building dependency tree... 1128s Reading state information... 1129s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 1129s Starting 2 pkgProblemResolver with broken count: 0 1129s Done 1129s Entering ResolveByKeep 1129s 1129s The following NEW packages will be installed: 1129s linux-headers-5.15.0-136 linux-headers-5.15.0-136-generic 1129s linux-image-5.15.0-136-generic linux-modules-5.15.0-136-generic 1129s linux-modules-extra-5.15.0-136-generic 1129s The following packages will be upgraded: 1129s apt apt-utils libapt-pkg6.0 linux-generic linux-headers-generic 1129s linux-headers-virtual linux-image-generic linux-image-virtual linux-virtual 1129s 9 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. 1129s Need to get 112 MB of archives. 1129s After this operation, 613 MB of additional disk space will be used. 1129s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el libapt-pkg6.0 ppc64el 2.4.14 [1030 kB] 1130s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt ppc64el 2.4.14 [1407 kB] 1130s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt-utils ppc64el 2.4.14 [236 kB] 1130s Get:4 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-5.15.0-136-generic ppc64el 5.15.0-136.147 [22.0 MB] 1131s Get:5 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-5.15.0-136-generic ppc64el 5.15.0-136.147 [11.5 MB] 1131s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-extra-5.15.0-136-generic ppc64el 5.15.0-136.147 [60.3 MB] 1135s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-generic ppc64el 5.15.0.136.134 [1700 B] 1135s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-generic ppc64el 5.15.0.136.134 [2466 B] 1135s Get:9 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-virtual ppc64el 5.15.0.136.134 [1676 B] 1135s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-virtual ppc64el 5.15.0.136.134 [2464 B] 1135s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-virtual ppc64el 5.15.0.136.134 [1634 B] 1135s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136 all 5.15.0-136.147 [12.3 MB] 1136s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136-generic ppc64el 5.15.0-136.147 [3208 kB] 1136s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-generic ppc64el 5.15.0.136.134 [2364 B] 1136s Fetched 112 MB in 7s (16.7 MB/s) 1136s (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 ... 66539 files and directories currently installed.) 1136s Preparing to unpack .../libapt-pkg6.0_2.4.14_ppc64el.deb ... 1136s Unpacking libapt-pkg6.0:ppc64el (2.4.14) over (2.4.13) ... 1137s Setting up libapt-pkg6.0:ppc64el (2.4.14) ... 1137s (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 ... 66539 files and directories currently installed.) 1137s Preparing to unpack .../apt_2.4.14_ppc64el.deb ... 1137s Unpacking apt (2.4.14) over (2.4.13) ... 1137s Setting up apt (2.4.14) ... 1137s (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 ... 66539 files and directories currently installed.) 1137s Preparing to unpack .../00-apt-utils_2.4.14_ppc64el.deb ... 1137s Unpacking apt-utils (2.4.14) over (2.4.13) ... 1137s Selecting previously unselected package linux-modules-5.15.0-136-generic. 1137s Preparing to unpack .../01-linux-modules-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1137s Unpacking linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 1138s Selecting previously unselected package linux-image-5.15.0-136-generic. 1138s Preparing to unpack .../02-linux-image-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1138s Unpacking linux-image-5.15.0-136-generic (5.15.0-136.147) ... 1138s Selecting previously unselected package linux-modules-extra-5.15.0-136-generic. 1138s Preparing to unpack .../03-linux-modules-extra-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1138s Unpacking linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 1140s Preparing to unpack .../04-linux-generic_5.15.0.136.134_ppc64el.deb ... 1140s Unpacking linux-generic (5.15.0.136.134) over (5.15.0.135.133) ... 1140s Preparing to unpack .../05-linux-image-generic_5.15.0.136.134_ppc64el.deb ... 1140s Unpacking linux-image-generic (5.15.0.136.134) over (5.15.0.135.133) ... 1140s Preparing to unpack .../06-linux-virtual_5.15.0.136.134_ppc64el.deb ... 1140s Unpacking linux-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 1140s Preparing to unpack .../07-linux-image-virtual_5.15.0.136.134_ppc64el.deb ... 1140s Unpacking linux-image-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 1140s Preparing to unpack .../08-linux-headers-virtual_5.15.0.136.134_ppc64el.deb ... 1140s Unpacking linux-headers-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 1140s Selecting previously unselected package linux-headers-5.15.0-136. 1140s Preparing to unpack .../09-linux-headers-5.15.0-136_5.15.0-136.147_all.deb ... 1140s Unpacking linux-headers-5.15.0-136 (5.15.0-136.147) ... 1142s Selecting previously unselected package linux-headers-5.15.0-136-generic. 1142s Preparing to unpack .../10-linux-headers-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1142s Unpacking linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 1143s Preparing to unpack .../11-linux-headers-generic_5.15.0.136.134_ppc64el.deb ... 1143s Unpacking linux-headers-generic (5.15.0.136.134) over (5.15.0.135.133) ... 1143s Setting up apt-utils (2.4.14) ... 1143s Setting up linux-headers-5.15.0-136 (5.15.0-136.147) ... 1143s Setting up linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 1143s Setting up linux-headers-generic (5.15.0.136.134) ... 1143s Setting up linux-headers-virtual (5.15.0.136.134) ... 1143s Setting up linux-image-5.15.0-136-generic (5.15.0-136.147) ... 1144s I: /boot/vmlinux is now a symlink to vmlinux-5.15.0-136-generic 1144s I: /boot/initrd.img is now a symlink to initrd.img-5.15.0-136-generic 1144s Setting up linux-image-virtual (5.15.0.136.134) ... 1144s Setting up linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 1145s Setting up linux-virtual (5.15.0.136.134) ... 1145s Setting up linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 1146s Setting up linux-image-generic (5.15.0.136.134) ... 1146s Setting up linux-generic (5.15.0.136.134) ... 1146s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 1146s Processing triggers for man-db (2.10.2-1) ... 1147s Processing triggers for linux-image-5.15.0-136-generic (5.15.0-136.147) ... 1147s /etc/kernel/postinst.d/initramfs-tools: 1147s update-initramfs: Generating /boot/initrd.img-5.15.0-136-generic 1147s No lz4 in /usr/bin:/sbin:/bin, using gzip 1168s /etc/kernel/postinst.d/zz-update-grub: 1168s Sourcing file `/etc/default/grub' 1169s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 1169s Sourcing file `/etc/default/grub.d/init-select.cfg' 1169s Generating grub configuration file ... 1169s Found linux image: /boot/vmlinux-5.15.0-136-generic 1169s Found initrd image: /boot/initrd.img-5.15.0-136-generic 1169s Found linux image: /boot/vmlinux-5.15.0-135-generic 1169s Found initrd image: /boot/initrd.img-5.15.0-135-generic 1169s Warning: os-prober will not be executed to detect other bootable partitions. 1169s Systems on them will not be added to the GRUB boot configuration. 1169s Check GRUB_DISABLE_OS_PROBER documentation entry. 1169s done 1170s Reading package lists... 1171s Building dependency tree... 1171s Reading state information... 1171s Starting pkgProblemResolver with broken count: 0 1171s Starting 2 pkgProblemResolver with broken count: 0 1171s Done 1171s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1171s autopkgtest [23:06:41]: rebooting testbed after setup commands that affected boot 1205s Reading package lists... 1205s Building dependency tree... 1205s Reading state information... 1206s Starting pkgProblemResolver with broken count: 0 1206s Starting 2 pkgProblemResolver with broken count: 0 1206s Done 1206s The following NEW packages will be installed: 1206s chiark-utils-bin devscripts diffstat fakeroot faketime gettext git 1206s git-buildpackage git-debrebase git-man libb-hooks-op-check-perl 1206s libclass-method-modifiers-perl libclass-xsaccessor-perl 1206s libdevel-callchecker-perl libdynaloader-functions-perl libencode-locale-perl 1206s liberror-perl libfakeroot libfaketime libfile-dirlist-perl 1206s libfile-fnmatch-perl libfile-homedir-perl libfile-listing-perl 1206s libfile-touch-perl libfile-which-perl libgomp1 libhtml-parser-perl 1206s libhtml-tagset-perl libhtml-tree-perl libhttp-cookies-perl libhttp-date-perl 1206s libhttp-message-perl libhttp-negotiate-perl libimport-into-perl 1206s libio-html-perl libio-pty-perl libio-socket-ssl-perl libipc-run-perl 1206s liblwp-mediatypes-perl liblwp-protocol-https-perl libmodule-runtime-perl 1206s libmoo-perl libnet-http-perl libnet-ssleay-perl libparams-classify-perl 1206s librole-tiny-perl libsub-quote-perl libtimedate-perl libtry-tiny-perl 1206s liburi-perl libwww-perl libwww-robotrules-perl patchutils 1206s perl-openssl-defaults python3-dateutil quilt wdiff 1206s 0 upgraded, 57 newly installed, 0 to remove and 0 not upgraded. 1206s Need to get 10.7 MB of archives. 1206s After this operation, 49.5 MB of additional disk space will be used. 1206s Get:1 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfakeroot ppc64el 1.28-1ubuntu1 [33.8 kB] 1206s Get:2 http://ftpmaster.internal/ubuntu jammy/main ppc64el fakeroot ppc64el 1.28-1ubuntu1 [62.8 kB] 1206s Get:3 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-dirlist-perl all 0.05-2 [7100 B] 1206s Get:4 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-which-perl all 1.23-1 [13.8 kB] 1206s Get:5 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-homedir-perl all 1.006-1 [38.3 kB] 1206s Get:6 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-touch-perl all 0.12-1 [9024 B] 1206s Get:7 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-pty-perl ppc64el 1:1.15-2build2 [35.3 kB] 1206s Get:8 http://ftpmaster.internal/ubuntu jammy/main ppc64el libipc-run-perl all 20200505.0-1 [89.8 kB] 1206s Get:9 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 1206s Get:10 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-xsaccessor-perl ppc64el 1.19-3build9 [36.6 kB] 1206s Get:11 http://ftpmaster.internal/ubuntu jammy/main ppc64el libb-hooks-op-check-perl ppc64el 0.22-1build5 [10.4 kB] 1206s Get:12 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 1206s Get:13 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdevel-callchecker-perl ppc64el 0.008-1ubuntu4 [14.7 kB] 1206s Get:14 http://ftpmaster.internal/ubuntu jammy/main ppc64el libparams-classify-perl ppc64el 0.015-1build5 [23.9 kB] 1206s Get:15 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmodule-runtime-perl all 0.016-1 [16.2 kB] 1206s Get:16 http://ftpmaster.internal/ubuntu jammy/main ppc64el libimport-into-perl all 1.002005-1 [11.0 kB] 1206s Get:17 http://ftpmaster.internal/ubuntu jammy/main ppc64el librole-tiny-perl all 2.002004-1 [16.3 kB] 1206s Get:18 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-quote-perl all 2.006006-1 [19.5 kB] 1206s Get:19 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmoo-perl all 2.005004-3 [48.0 kB] 1206s Get:20 http://ftpmaster.internal/ubuntu jammy/main ppc64el libencode-locale-perl all 1.05-1.1 [11.8 kB] 1206s Get:21 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtimedate-perl all 2.3300-2 [34.0 kB] 1206s Get:22 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-date-perl all 6.05-1 [9920 B] 1206s Get:23 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-listing-perl all 6.14-1 [11.2 kB] 1206s Get:24 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tagset-perl all 3.20-4 [12.5 kB] 1206s Get:25 http://ftpmaster.internal/ubuntu jammy/main ppc64el liburi-perl all 5.10-1 [78.8 kB] 1206s Get:26 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-parser-perl ppc64el 3.76-1build2 [93.6 kB] 1207s Get:27 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tree-perl all 5.07-2 [200 kB] 1207s Get:28 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-html-perl all 1.004-2 [15.4 kB] 1207s Get:29 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 1207s Get:30 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-message-perl all 6.36-1 [76.8 kB] 1207s Get:31 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-cookies-perl all 6.10-1 [18.4 kB] 1207s Get:32 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-negotiate-perl all 6.01-1 [12.5 kB] 1207s Get:33 http://ftpmaster.internal/ubuntu jammy/main ppc64el perl-openssl-defaults ppc64el 5build2 [7540 B] 1207s Get:34 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-ssleay-perl ppc64el 1.92-1build2 [332 kB] 1207s Get:35 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-socket-ssl-perl all 2.074-2 [192 kB] 1207s Get:36 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-http-perl all 6.22-1 [23.2 kB] 1207s Get:37 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 1207s Get:38 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtry-tiny-perl all 0.31-1 [21.8 kB] 1207s Get:39 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-robotrules-perl all 6.02-1 [12.6 kB] 1207s Get:40 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-perl all 6.61-1 [141 kB] 1207s Get:41 http://ftpmaster.internal/ubuntu jammy/main ppc64el patchutils ppc64el 0.4.2-1build2 [86.6 kB] 1207s Get:42 http://ftpmaster.internal/ubuntu jammy/main ppc64el wdiff ppc64el 1.2.2-2build3 [29.5 kB] 1207s Get:43 http://ftpmaster.internal/ubuntu jammy/main ppc64el devscripts ppc64el 2.22.1ubuntu1 [1058 kB] 1207s Get:44 http://ftpmaster.internal/ubuntu jammy/main ppc64el diffstat ppc64el 1.64-1build2 [32.8 kB] 1207s Get:45 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgomp1 ppc64el 12.3.0-1ubuntu1~22.04 [140 kB] 1207s Get:46 http://ftpmaster.internal/ubuntu jammy/main ppc64el gettext ppc64el 0.21-4ubuntu4 [976 kB] 1207s Get:47 http://ftpmaster.internal/ubuntu jammy/main ppc64el liberror-perl all 0.17029-1 [26.5 kB] 1207s Get:48 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 1207s Get:49 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git ppc64el 1:2.34.1-1ubuntu1.12 [4143 kB] 1207s Get:50 http://ftpmaster.internal/ubuntu jammy/main ppc64el python3-dateutil all 2.8.1-6 [78.4 kB] 1207s Get:51 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-buildpackage all 0.9.25 [799 kB] 1207s Get:52 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfile-fnmatch-perl ppc64el 0.02-2build8 [10.5 kB] 1207s Get:53 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-debrebase all 9.15 [67.5 kB] 1207s Get:54 http://ftpmaster.internal/ubuntu jammy/universe ppc64el quilt all 0.66-2.1 [304 kB] 1207s Get:55 http://ftpmaster.internal/ubuntu jammy/universe ppc64el chiark-utils-bin ppc64el 6.1.2+nmu1 [55.7 kB] 1207s Get:56 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfaketime ppc64el 0.9.8-9 [35.9 kB] 1207s Get:57 http://ftpmaster.internal/ubuntu jammy/universe ppc64el faketime ppc64el 0.9.8-9 [10.3 kB] 1208s Fetched 10.7 MB in 1s (7611 kB/s) 1208s Selecting previously unselected package libfakeroot:ppc64el. 1208s (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 ... 101007 files and directories currently installed.) 1208s Preparing to unpack .../00-libfakeroot_1.28-1ubuntu1_ppc64el.deb ... 1208s Unpacking libfakeroot:ppc64el (1.28-1ubuntu1) ... 1208s Selecting previously unselected package fakeroot. 1208s Preparing to unpack .../01-fakeroot_1.28-1ubuntu1_ppc64el.deb ... 1208s Unpacking fakeroot (1.28-1ubuntu1) ... 1208s Selecting previously unselected package libfile-dirlist-perl. 1208s Preparing to unpack .../02-libfile-dirlist-perl_0.05-2_all.deb ... 1208s Unpacking libfile-dirlist-perl (0.05-2) ... 1208s Selecting previously unselected package libfile-which-perl. 1208s Preparing to unpack .../03-libfile-which-perl_1.23-1_all.deb ... 1208s Unpacking libfile-which-perl (1.23-1) ... 1208s Selecting previously unselected package libfile-homedir-perl. 1208s Preparing to unpack .../04-libfile-homedir-perl_1.006-1_all.deb ... 1208s Unpacking libfile-homedir-perl (1.006-1) ... 1208s Selecting previously unselected package libfile-touch-perl. 1208s Preparing to unpack .../05-libfile-touch-perl_0.12-1_all.deb ... 1208s Unpacking libfile-touch-perl (0.12-1) ... 1208s Selecting previously unselected package libio-pty-perl. 1208s Preparing to unpack .../06-libio-pty-perl_1%3a1.15-2build2_ppc64el.deb ... 1208s Unpacking libio-pty-perl (1:1.15-2build2) ... 1208s Selecting previously unselected package libipc-run-perl. 1208s Preparing to unpack .../07-libipc-run-perl_20200505.0-1_all.deb ... 1208s Unpacking libipc-run-perl (20200505.0-1) ... 1208s Selecting previously unselected package libclass-method-modifiers-perl. 1208s Preparing to unpack .../08-libclass-method-modifiers-perl_2.13-1_all.deb ... 1208s Unpacking libclass-method-modifiers-perl (2.13-1) ... 1208s Selecting previously unselected package libclass-xsaccessor-perl. 1208s Preparing to unpack .../09-libclass-xsaccessor-perl_1.19-3build9_ppc64el.deb ... 1208s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 1208s Selecting previously unselected package libb-hooks-op-check-perl. 1208s Preparing to unpack .../10-libb-hooks-op-check-perl_0.22-1build5_ppc64el.deb ... 1208s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 1209s Selecting previously unselected package libdynaloader-functions-perl. 1209s Preparing to unpack .../11-libdynaloader-functions-perl_0.003-1.1_all.deb ... 1209s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 1209s Selecting previously unselected package libdevel-callchecker-perl. 1209s Preparing to unpack .../12-libdevel-callchecker-perl_0.008-1ubuntu4_ppc64el.deb ... 1209s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 1209s Selecting previously unselected package libparams-classify-perl. 1209s Preparing to unpack .../13-libparams-classify-perl_0.015-1build5_ppc64el.deb ... 1209s Unpacking libparams-classify-perl (0.015-1build5) ... 1209s Selecting previously unselected package libmodule-runtime-perl. 1209s Preparing to unpack .../14-libmodule-runtime-perl_0.016-1_all.deb ... 1209s Unpacking libmodule-runtime-perl (0.016-1) ... 1209s Selecting previously unselected package libimport-into-perl. 1209s Preparing to unpack .../15-libimport-into-perl_1.002005-1_all.deb ... 1209s Unpacking libimport-into-perl (1.002005-1) ... 1209s Selecting previously unselected package librole-tiny-perl. 1209s Preparing to unpack .../16-librole-tiny-perl_2.002004-1_all.deb ... 1209s Unpacking librole-tiny-perl (2.002004-1) ... 1209s Selecting previously unselected package libsub-quote-perl. 1209s Preparing to unpack .../17-libsub-quote-perl_2.006006-1_all.deb ... 1209s Unpacking libsub-quote-perl (2.006006-1) ... 1209s Selecting previously unselected package libmoo-perl. 1209s Preparing to unpack .../18-libmoo-perl_2.005004-3_all.deb ... 1209s Unpacking libmoo-perl (2.005004-3) ... 1209s Selecting previously unselected package libencode-locale-perl. 1209s Preparing to unpack .../19-libencode-locale-perl_1.05-1.1_all.deb ... 1209s Unpacking libencode-locale-perl (1.05-1.1) ... 1209s Selecting previously unselected package libtimedate-perl. 1209s Preparing to unpack .../20-libtimedate-perl_2.3300-2_all.deb ... 1209s Unpacking libtimedate-perl (2.3300-2) ... 1209s Selecting previously unselected package libhttp-date-perl. 1209s Preparing to unpack .../21-libhttp-date-perl_6.05-1_all.deb ... 1209s Unpacking libhttp-date-perl (6.05-1) ... 1209s Selecting previously unselected package libfile-listing-perl. 1209s Preparing to unpack .../22-libfile-listing-perl_6.14-1_all.deb ... 1209s Unpacking libfile-listing-perl (6.14-1) ... 1209s Selecting previously unselected package libhtml-tagset-perl. 1209s Preparing to unpack .../23-libhtml-tagset-perl_3.20-4_all.deb ... 1209s Unpacking libhtml-tagset-perl (3.20-4) ... 1209s Selecting previously unselected package liburi-perl. 1209s Preparing to unpack .../24-liburi-perl_5.10-1_all.deb ... 1209s Unpacking liburi-perl (5.10-1) ... 1209s Selecting previously unselected package libhtml-parser-perl:ppc64el. 1209s Preparing to unpack .../25-libhtml-parser-perl_3.76-1build2_ppc64el.deb ... 1209s Unpacking libhtml-parser-perl:ppc64el (3.76-1build2) ... 1209s Selecting previously unselected package libhtml-tree-perl. 1209s Preparing to unpack .../26-libhtml-tree-perl_5.07-2_all.deb ... 1209s Unpacking libhtml-tree-perl (5.07-2) ... 1209s Selecting previously unselected package libio-html-perl. 1209s Preparing to unpack .../27-libio-html-perl_1.004-2_all.deb ... 1209s Unpacking libio-html-perl (1.004-2) ... 1209s Selecting previously unselected package liblwp-mediatypes-perl. 1209s Preparing to unpack .../28-liblwp-mediatypes-perl_6.04-1_all.deb ... 1209s Unpacking liblwp-mediatypes-perl (6.04-1) ... 1209s Selecting previously unselected package libhttp-message-perl. 1209s Preparing to unpack .../29-libhttp-message-perl_6.36-1_all.deb ... 1209s Unpacking libhttp-message-perl (6.36-1) ... 1209s Selecting previously unselected package libhttp-cookies-perl. 1209s Preparing to unpack .../30-libhttp-cookies-perl_6.10-1_all.deb ... 1209s Unpacking libhttp-cookies-perl (6.10-1) ... 1209s Selecting previously unselected package libhttp-negotiate-perl. 1209s Preparing to unpack .../31-libhttp-negotiate-perl_6.01-1_all.deb ... 1209s Unpacking libhttp-negotiate-perl (6.01-1) ... 1209s Selecting previously unselected package perl-openssl-defaults:ppc64el. 1209s Preparing to unpack .../32-perl-openssl-defaults_5build2_ppc64el.deb ... 1209s Unpacking perl-openssl-defaults:ppc64el (5build2) ... 1209s Selecting previously unselected package libnet-ssleay-perl:ppc64el. 1209s Preparing to unpack .../33-libnet-ssleay-perl_1.92-1build2_ppc64el.deb ... 1209s Unpacking libnet-ssleay-perl:ppc64el (1.92-1build2) ... 1209s Selecting previously unselected package libio-socket-ssl-perl. 1209s Preparing to unpack .../34-libio-socket-ssl-perl_2.074-2_all.deb ... 1209s Unpacking libio-socket-ssl-perl (2.074-2) ... 1209s Selecting previously unselected package libnet-http-perl. 1209s Preparing to unpack .../35-libnet-http-perl_6.22-1_all.deb ... 1209s Unpacking libnet-http-perl (6.22-1) ... 1209s Selecting previously unselected package liblwp-protocol-https-perl. 1209s Preparing to unpack .../36-liblwp-protocol-https-perl_6.10-1_all.deb ... 1209s Unpacking liblwp-protocol-https-perl (6.10-1) ... 1209s Selecting previously unselected package libtry-tiny-perl. 1209s Preparing to unpack .../37-libtry-tiny-perl_0.31-1_all.deb ... 1209s Unpacking libtry-tiny-perl (0.31-1) ... 1209s Selecting previously unselected package libwww-robotrules-perl. 1209s Preparing to unpack .../38-libwww-robotrules-perl_6.02-1_all.deb ... 1209s Unpacking libwww-robotrules-perl (6.02-1) ... 1209s Selecting previously unselected package libwww-perl. 1209s Preparing to unpack .../39-libwww-perl_6.61-1_all.deb ... 1209s Unpacking libwww-perl (6.61-1) ... 1209s Selecting previously unselected package patchutils. 1209s Preparing to unpack .../40-patchutils_0.4.2-1build2_ppc64el.deb ... 1209s Unpacking patchutils (0.4.2-1build2) ... 1209s Selecting previously unselected package wdiff. 1209s Preparing to unpack .../41-wdiff_1.2.2-2build3_ppc64el.deb ... 1209s Unpacking wdiff (1.2.2-2build3) ... 1209s Selecting previously unselected package devscripts. 1209s Preparing to unpack .../42-devscripts_2.22.1ubuntu1_ppc64el.deb ... 1209s Unpacking devscripts (2.22.1ubuntu1) ... 1209s Selecting previously unselected package diffstat. 1209s Preparing to unpack .../43-diffstat_1.64-1build2_ppc64el.deb ... 1209s Unpacking diffstat (1.64-1build2) ... 1209s Selecting previously unselected package libgomp1:ppc64el. 1209s Preparing to unpack .../44-libgomp1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1209s Unpacking libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1209s Selecting previously unselected package gettext. 1209s Preparing to unpack .../45-gettext_0.21-4ubuntu4_ppc64el.deb ... 1209s Unpacking gettext (0.21-4ubuntu4) ... 1209s Selecting previously unselected package liberror-perl. 1209s Preparing to unpack .../46-liberror-perl_0.17029-1_all.deb ... 1209s Unpacking liberror-perl (0.17029-1) ... 1209s Selecting previously unselected package git-man. 1209s Preparing to unpack .../47-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 1209s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 1209s Selecting previously unselected package git. 1209s Preparing to unpack .../48-git_1%3a2.34.1-1ubuntu1.12_ppc64el.deb ... 1209s Unpacking git (1:2.34.1-1ubuntu1.12) ... 1209s Selecting previously unselected package python3-dateutil. 1209s Preparing to unpack .../49-python3-dateutil_2.8.1-6_all.deb ... 1209s Unpacking python3-dateutil (2.8.1-6) ... 1209s Selecting previously unselected package git-buildpackage. 1209s Preparing to unpack .../50-git-buildpackage_0.9.25_all.deb ... 1209s Unpacking git-buildpackage (0.9.25) ... 1210s Selecting previously unselected package libfile-fnmatch-perl. 1210s Preparing to unpack .../51-libfile-fnmatch-perl_0.02-2build8_ppc64el.deb ... 1210s Unpacking libfile-fnmatch-perl (0.02-2build8) ... 1210s Selecting previously unselected package git-debrebase. 1210s Preparing to unpack .../52-git-debrebase_9.15_all.deb ... 1210s Unpacking git-debrebase (9.15) ... 1210s Selecting previously unselected package quilt. 1210s Preparing to unpack .../53-quilt_0.66-2.1_all.deb ... 1210s Unpacking quilt (0.66-2.1) ... 1210s Selecting previously unselected package chiark-utils-bin. 1210s Preparing to unpack .../54-chiark-utils-bin_6.1.2+nmu1_ppc64el.deb ... 1210s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 1210s Selecting previously unselected package libfaketime:ppc64el. 1210s Preparing to unpack .../55-libfaketime_0.9.8-9_ppc64el.deb ... 1210s Unpacking libfaketime:ppc64el (0.9.8-9) ... 1210s Selecting previously unselected package faketime. 1210s Preparing to unpack .../56-faketime_0.9.8-9_ppc64el.deb ... 1210s Unpacking faketime (0.9.8-9) ... 1210s Setting up wdiff (1.2.2-2build3) ... 1210s Setting up libfile-which-perl (1.23-1) ... 1210s Setting up libdynaloader-functions-perl (0.003-1.1) ... 1210s Setting up libclass-method-modifiers-perl (2.13-1) ... 1210s Setting up libio-pty-perl (1:1.15-2build2) ... 1210s Setting up libhtml-tagset-perl (3.20-4) ... 1210s Setting up liblwp-mediatypes-perl (6.04-1) ... 1210s Setting up libtry-tiny-perl (0.31-1) ... 1210s Setting up perl-openssl-defaults:ppc64el (5build2) ... 1210s Setting up libencode-locale-perl (1.05-1.1) ... 1210s Setting up libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1210s Setting up libfakeroot:ppc64el (1.28-1ubuntu1) ... 1210s Setting up chiark-utils-bin (6.1.2+nmu1) ... 1210s Setting up fakeroot (1.28-1ubuntu1) ... 1210s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 1210s Setting up liberror-perl (0.17029-1) ... 1210s Setting up patchutils (0.4.2-1build2) ... 1210s Setting up diffstat (1.64-1build2) ... 1210s Setting up libio-html-perl (1.004-2) ... 1210s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 1210s Setting up libipc-run-perl (20200505.0-1) ... 1210s Setting up libfile-fnmatch-perl (0.02-2build8) ... 1210s Setting up libtimedate-perl (2.3300-2) ... 1210s Setting up librole-tiny-perl (2.002004-1) ... 1210s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 1210s Setting up python3-dateutil (2.8.1-6) ... 1210s Setting up libsub-quote-perl (2.006006-1) ... 1210s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 1210s Setting up libfile-dirlist-perl (0.05-2) ... 1210s Setting up libfile-homedir-perl (1.006-1) ... 1210s Setting up liburi-perl (5.10-1) ... 1210s Setting up libfile-touch-perl (0.12-1) ... 1210s Setting up libfaketime:ppc64el (0.9.8-9) ... 1210s Setting up libnet-ssleay-perl:ppc64el (1.92-1build2) ... 1210s Setting up faketime (0.9.8-9) ... 1210s Setting up libhttp-date-perl (6.05-1) ... 1210s Setting up gettext (0.21-4ubuntu4) ... 1210s Setting up libfile-listing-perl (6.14-1) ... 1210s Setting up libnet-http-perl (6.22-1) ... 1210s Setting up quilt (0.66-2.1) ... 1210s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 1210s Setting up git (1:2.34.1-1ubuntu1.12) ... 1210s Setting up libwww-robotrules-perl (6.02-1) ... 1210s Setting up libhtml-parser-perl:ppc64el (3.76-1build2) ... 1210s Setting up libio-socket-ssl-perl (2.074-2) ... 1210s Setting up libhttp-message-perl (6.36-1) ... 1210s Setting up libhttp-negotiate-perl (6.01-1) ... 1210s Setting up libhttp-cookies-perl (6.10-1) ... 1210s Setting up libhtml-tree-perl (5.07-2) ... 1210s Setting up libparams-classify-perl (0.015-1build5) ... 1210s Setting up libmodule-runtime-perl (0.016-1) ... 1210s Setting up libimport-into-perl (1.002005-1) ... 1210s Setting up libmoo-perl (2.005004-3) ... 1210s Setting up liblwp-protocol-https-perl (6.10-1) ... 1210s Setting up libwww-perl (6.61-1) ... 1210s Setting up devscripts (2.22.1ubuntu1) ... 1210s Setting up git-buildpackage (0.9.25) ... 1210s Setting up git-debrebase (9.15) ... 1210s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 1210s Processing triggers for man-db (2.10.2-1) ... 1211s Processing triggers for install-info (6.8-4build1) ... 1213s autopkgtest [23:07:23]: test gdr-merge-conflicts: [----------------------- 1213s ++ set -o pipefail 1213s ++ . tests/lib-core 1213s ++ . tests/lib-restricts 1213s ++ trap ' 1213s rc=$? 1213s set +x 1213s test $rc = 0 || echo " 1213s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1213s 1213s Most relevant logs are just before assignment rc=$rc 1213s Will now do cleanup etc. 1213s " 1213s set -x 1213s set +e 1213s pwd 1213s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1213s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1213s set -e 1213s test $rc = 0 || t-report-failure 1213s ' EXIT 1213s ++ t-filter-out-git-hyphen-dir 1213s ++ local pathent 1213s +++ type -p git-rev-parse 1213s +++ : 1213s ++ pathent= 1213s ++ case "$pathent" in 1213s ++ return 1213s ++ t-set-intree 1213s ++ '[' x = x ']' 1213s ++ return 1213s ++ : -D 1213s ++ export DGIT_TEST_DEBUG 1213s ++ : x 1213s ++ export DGIT_TEST_DEBPUSH_DEBUG 1213s ++ : 1213s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1213s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1213s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1213s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1213s ++ export LC_CTYPE=C.UTF-8 1213s ++ LC_CTYPE=C.UTF-8 1213s ++ unset CDPATH 1213s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1213s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1213s +++ pwd 1213s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1213s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1213s ++ testname=gdr-merge-conflicts 1213s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1213s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1213s ++ bpd=.. 1213s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1213s ++ '[' x '!=' x ']' 1213s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s +++ pwd 1213s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ t-set-using-tmp 1213s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1213s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1213s ++ export 'DEBFULLNAME=dgit test git user' 1213s ++ DEBFULLNAME='dgit test git user' 1213s ++ git config --global user.email dgit-test@debian.example.net 1213s ++ git config --global user.name 'dgit test git user' 1213s ++ git config --global protocol.ext.allow always 1213s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1213s ++ env -0 1213s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1213s ++ export DEBCHANGE_VENDOR=dpkg 1213s ++ DEBCHANGE_VENDOR=dpkg 1213s ++ unset VISUAL 1213s ++ unset GIT_EDITOR 1213s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1213s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1213s ++ cat 1213s ++ schroot=build 1213s ++ : aq 1213s ++ : archive/test-dummy 1213s ++ : sid:unstable 1213s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1213s ++ git config --global dgit.default.old-dsc-distro test-dummy 1213s + t-dependencies NO-DGIT GDR quilt 1213s + : 'Hopefully installed: NO-DGIT GDR quilt' 1213s + t-tstunt-parsechangelog 1213s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1213s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + local var=PATH 1213s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + eval ' 1213s case "$PATH" in 1213s "$tstunt:"*) ;; 1213s *":$tstunt:"*) ;; 1213s "") PATH="$tstunt" ;; 1213s *) PATH="$tstunt:$PATH" ;; 1213s esac 1213s export PATH 1213s ' 1213s ++ case "$PATH" in 1213s ++ PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s ++ export PATH 1213s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + local var=PERLLIB 1213s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + eval ' 1213s case "$PERLLIB" in 1213s "$tstunt:"*) ;; 1213s *":$tstunt:"*) ;; 1213s "") PERLLIB="$tstunt" ;; 1213s *) PERLLIB="$tstunt:$PERLLIB" ;; 1213s esac 1213s export PERLLIB 1213s ' 1213s ++ case "$PERLLIB" in 1213s ++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ export PERLLIB 1213s + local f 1213s + for f in "$@" 1213s + t-tstunt--save-real dpkg-parsechangelog 1213s + local f=dpkg-parsechangelog 1213s + case "$f" in 1213s + local rc 1213s + local real 1213s + set +e 1213s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1213s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1213s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s ++ type -p dpkg-parsechangelog 1213s + real=/usr/bin/dpkg-parsechangelog 1213s + rc=0 1213s + set -e 1213s + case $rc in 1213s + local varname=dpkg_parsechangelog 1213s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1213s + eval ' 1213s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1213s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1213s ' 1213s ++ : /usr/bin/dpkg-parsechangelog 1213s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1213s + f=./dpkg-parsechangelog 1213s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1213s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1213s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1213s + for f in "$@" 1213s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 1213s + local f=Dpkg/Changelog/Parse.pm 1213s + case "$f" in 1213s + return 1213s + f=./Dpkg/Changelog/Parse.pm 1213s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1213s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1213s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1213s + t-tstunt debchange 1213s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + local var=PATH 1213s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + eval ' 1213s case "$PATH" in 1213s "$tstunt:"*) ;; 1213s *":$tstunt:"*) ;; 1213s "") PATH="$tstunt" ;; 1213s *) PATH="$tstunt:$PATH" ;; 1213s esac 1213s export PATH 1213s ' 1213s ++ case "$PATH" in 1213s ++ export PATH 1213s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + local var=PERLLIB 1213s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + eval ' 1213s case "$PERLLIB" in 1213s "$tstunt:"*) ;; 1213s *":$tstunt:"*) ;; 1213s "") PERLLIB="$tstunt" ;; 1213s *) PERLLIB="$tstunt:$PERLLIB" ;; 1213s esac 1213s export PERLLIB 1213s ' 1213s ++ case "$PERLLIB" in 1213s ++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ export PERLLIB 1213s + local f 1213s + for f in "$@" 1213s + t-tstunt--save-real debchange 1213s + local f=debchange 1213s + case "$f" in 1213s + local rc 1213s + local real 1213s + set +e 1213s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1213s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1213s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s ++ type -p debchange 1213s + real=/usr/bin/debchange 1213s + rc=0 1213s + set -e 1213s + case $rc in 1213s + local varname=debchange 1213s + varname=DGIT_TEST_REAL_DEBCHANGE 1213s + eval ' 1213s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1213s export DGIT_TEST_REAL_DEBCHANGE 1213s ' 1213s ++ : /usr/bin/debchange 1213s ++ export DGIT_TEST_REAL_DEBCHANGE 1213s + f=./debchange 1213s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1213s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1213s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1213s + t-setup-import gdr-convert-gbp-noarchive 1213s + local setupname=gdr-convert-gbp-noarchive 1213s + local setupsrc 1213s + local lock 1213s + '[' x = x ']' 1213s + setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s + lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1213s + local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1213s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 1213s + with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1213s cd "$1"; shift 1213s setupname="$1"; shift 1213s simport="$1"; shift 1213s if [ -e "$simport" ]; then exit 0; fi 1213s env - "$@" \ 1213s "tests/setup/$setupname" 1213s ' x /tmp/autopkgtest.XK8uun/build.980/src gdr-convert-gbp-noarchive /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1213s + cd /tmp/autopkgtest.XK8uun/build.980/src 1213s + shift 1213s + setupname=gdr-convert-gbp-noarchive 1213s + shift 1213s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1213s + shift 1213s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 1213s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-merge-conflicts-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-merge-conflicts-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-merge-conflicts-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-merge-conflicts -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-merge-conflicts' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-merge-conflicts-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gdr-convert-gbp-noarchive 1213s ++ set -o pipefail 1213s ++ . tests/lib-core 1213s ++ . tests/lib-restricts 1213s ++ trap ' 1213s rc=$? 1213s set +x 1213s test $rc = 0 || echo " 1213s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1213s 1213s Most relevant logs are just before assignment rc=$rc 1213s Will now do cleanup etc. 1213s " 1213s set -x 1213s set +e 1213s pwd 1213s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1213s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1213s set -e 1213s test $rc = 0 || t-report-failure 1213s ' EXIT 1213s ++ t-filter-out-git-hyphen-dir 1213s ++ local pathent 1213s +++ type -p git-rev-parse 1213s +++ : 1213s ++ pathent= 1213s ++ case "$pathent" in 1213s ++ return 1213s ++ t-set-intree 1213s ++ '[' x = x ']' 1213s ++ return 1213s ++ : -D 1213s ++ export DGIT_TEST_DEBUG 1213s ++ : x 1213s ++ export DGIT_TEST_DEBPUSH_DEBUG 1213s ++ : 1213s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1213s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1213s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1213s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1213s ++ export LC_CTYPE=C.UTF-8 1213s ++ LC_CTYPE=C.UTF-8 1213s ++ unset CDPATH 1213s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1213s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1213s +++ pwd 1213s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1213s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1213s ++ testname=gdr-convert-gbp-noarchive 1213s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1213s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1213s ++ bpd=.. 1213s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1213s ++ '[' x '!=' x ']' 1213s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s +++ pwd 1213s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ t-set-using-tmp 1213s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1213s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1213s ++ export 'DEBFULLNAME=dgit test git user' 1213s ++ DEBFULLNAME='dgit test git user' 1213s ++ git config --global user.email dgit-test@debian.example.net 1213s ++ git config --global user.name 'dgit test git user' 1213s ++ git config --global protocol.ext.allow always 1213s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1213s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1213s ++ export DEBCHANGE_VENDOR=dpkg 1213s ++ DEBCHANGE_VENDOR=dpkg 1213s ++ unset VISUAL 1213s ++ unset GIT_EDITOR 1213s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1213s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1213s ++ cat 1213s ++ schroot=build 1213s ++ : aq 1213s ++ : archive/test-dummy 1213s ++ : sid:unstable 1213s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1213s ++ git config --global dgit.default.old-dsc-distro test-dummy 1213s + . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1213s ++ : -D 1213s ++ export GDR_TEST_DEBUG 1213s ++ t-tstunt debchange 1213s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ local var=PATH 1213s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ eval ' 1213s case "$PATH" in 1213s "$tstunt:"*) ;; 1213s *":$tstunt:"*) ;; 1213s "") PATH="$tstunt" ;; 1213s *) PATH="$tstunt:$PATH" ;; 1213s esac 1213s export PATH 1213s ' 1213s +++ case "$PATH" in 1213s +++ PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s +++ export PATH 1213s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ local var=PERLLIB 1213s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ eval ' 1213s case "$PERLLIB" in 1213s "$tstunt:"*) ;; 1213s *":$tstunt:"*) ;; 1213s "") PERLLIB="$tstunt" ;; 1213s *) PERLLIB="$tstunt:$PERLLIB" ;; 1213s esac 1213s export PERLLIB 1213s ' 1213s +++ case "$PERLLIB" in 1213s +++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s +++ export PERLLIB 1213s ++ local f 1213s ++ for f in "$@" 1213s ++ t-tstunt--save-real debchange 1213s ++ local f=debchange 1213s ++ case "$f" in 1213s ++ local rc 1213s ++ local real 1213s ++ set +e 1213s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1213s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1213s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s +++ type -p debchange 1213s ++ real=/usr/bin/debchange 1213s ++ rc=0 1213s ++ set -e 1213s ++ case $rc in 1213s ++ local varname=debchange 1213s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1213s ++ eval ' 1213s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1213s export DGIT_TEST_REAL_DEBCHANGE 1213s ' 1213s +++ : /usr/bin/debchange 1213s +++ export DGIT_TEST_REAL_DEBCHANGE 1213s ++ f=./debchange 1213s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1213s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1213s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1213s + t-dependencies GDR 1213s + : 'Hopefully installed: GDR' 1213s + export ifarchive=: 1213s + ifarchive=: 1213s + t-chain-test gdr-convert-gbp 1213s + t-chain-test-somehow 1213s + export DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 1213s + DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 1213s + export DGIT_TEST_TMPBASE= 1213s + DGIT_TEST_TMPBASE= 1213s + export ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s + ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s + local ct=gdr-convert-gbp 1213s + local d=tests/setup 1213s + cd /tmp/autopkgtest.XK8uun/build.980/src 1213s + exec tests/setup/gdr-convert-gbp 1213s ++ set -o pipefail 1213s ++ . tests/lib-core 1213s ++ . tests/lib-restricts 1213s ++ trap ' 1213s rc=$? 1213s set +x 1213s test $rc = 0 || echo " 1213s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1213s 1213s Most relevant logs are just before assignment rc=$rc 1213s Will now do cleanup etc. 1213s " 1213s set -x 1213s set +e 1213s pwd 1213s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1213s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1213s set -e 1213s test $rc = 0 || t-report-failure 1213s ' EXIT 1213s ++ t-filter-out-git-hyphen-dir 1213s ++ local pathent 1213s +++ type -p git-rev-parse 1213s +++ : 1213s ++ pathent= 1213s ++ case "$pathent" in 1213s ++ return 1213s ++ t-set-intree 1213s ++ '[' x = x ']' 1213s ++ return 1213s ++ : -D 1213s ++ export DGIT_TEST_DEBUG 1213s ++ : x 1213s ++ export DGIT_TEST_DEBPUSH_DEBUG 1213s ++ : 1213s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1213s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1213s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1213s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1213s ++ export LC_CTYPE=C.UTF-8 1213s ++ LC_CTYPE=C.UTF-8 1213s ++ unset CDPATH 1213s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1213s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1213s +++ pwd 1213s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1213s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1213s ++ testname=gdr-convert-gbp-noarchive 1213s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1213s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1213s ++ bpd=.. 1213s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1213s ++ '[' x '!=' x ']' 1213s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s +++ pwd 1213s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ t-set-using-tmp 1213s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1213s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1213s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1213s ++ export 'DEBFULLNAME=dgit test git user' 1213s ++ DEBFULLNAME='dgit test git user' 1213s ++ git config --global user.email dgit-test@debian.example.net 1213s ++ git config --global user.name 'dgit test git user' 1213s ++ git config --global protocol.ext.allow always 1213s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1213s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1213s ++ export DEBCHANGE_VENDOR=dpkg 1213s ++ DEBCHANGE_VENDOR=dpkg 1213s ++ unset VISUAL 1213s ++ unset GIT_EDITOR 1213s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1213s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1213s ++ cat 1213s ++ schroot=build 1213s ++ : aq 1213s ++ : archive/test-dummy 1213s ++ : sid:unstable 1213s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1213s ++ git config --global dgit.default.old-dsc-distro test-dummy 1213s + . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1213s ++ : -D 1213s ++ export GDR_TEST_DEBUG 1213s ++ t-tstunt debchange 1213s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ local var=PATH 1213s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ eval ' 1213s case "$PATH" in 1213s "$tstunt:"*) ;; 1213s *":$tstunt:"*) ;; 1213s "") PATH="$tstunt" ;; 1213s *) PATH="$tstunt:$PATH" ;; 1213s esac 1213s export PATH 1213s ' 1213s +++ case "$PATH" in 1213s +++ export PATH 1213s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ local var=PERLLIB 1213s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s ++ eval ' 1213s case "$PERLLIB" in 1213s "$tstunt:"*) ;; 1213s *":$tstunt:"*) ;; 1213s "") PERLLIB="$tstunt" ;; 1213s *) PERLLIB="$tstunt:$PERLLIB" ;; 1213s esac 1213s export PERLLIB 1213s ' 1213s +++ case "$PERLLIB" in 1213s +++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s +++ export PERLLIB 1213s ++ local f 1213s ++ for f in "$@" 1213s ++ t-tstunt--save-real debchange 1213s ++ local f=debchange 1213s ++ case "$f" in 1213s ++ local rc 1213s ++ local real 1213s ++ set +e 1213s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1213s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1213s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s +++ type -p debchange 1213s ++ real=/usr/bin/debchange 1213s ++ rc=0 1213s ++ set -e 1213s ++ case $rc in 1213s ++ local varname=debchange 1213s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1213s ++ eval ' 1213s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1213s export DGIT_TEST_REAL_DEBCHANGE 1213s ' 1213s +++ : /usr/bin/debchange 1213s +++ export DGIT_TEST_REAL_DEBCHANGE 1213s ++ f=./debchange 1213s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1213s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1213s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1213s + : t-setup-import gnupg 1213s + t-dependencies GDR 1213s + : 'Hopefully installed: GDR' 1213s + t-tstunt-parsechangelog 1213s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1213s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + local var=PATH 1213s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + eval ' 1213s case "$PATH" in 1213s "$tstunt:"*) ;; 1213s *":$tstunt:"*) ;; 1213s "") PATH="$tstunt" ;; 1213s *) PATH="$tstunt:$PATH" ;; 1213s esac 1213s export PATH 1213s ' 1213s ++ case "$PATH" in 1213s ++ export PATH 1213s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + local var=PERLLIB 1213s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1213s + eval ' 1213s case "$PERLLIB" in 1213s "$tstunt:"*) ;; 1213s *":$tstunt:"*) ;; 1213s "") PERLLIB="$tstunt" ;; 1213s *) PERLLIB="$tstunt:$PERLLIB" ;; 1213s esac 1213s export PERLLIB 1213s ' 1213s ++ case "$PERLLIB" in 1213s ++ export PERLLIB 1213s + local f 1213s + for f in "$@" 1213s + t-tstunt--save-real dpkg-parsechangelog 1213s + local f=dpkg-parsechangelog 1213s + case "$f" in 1213s + local rc 1213s + local real 1213s + set +e 1213s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1213s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1213s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1213s ++ type -p dpkg-parsechangelog 1213s + real=/usr/bin/dpkg-parsechangelog 1213s + rc=0 1213s + set -e 1213s + case $rc in 1213s + local varname=dpkg_parsechangelog 1213s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1213s + eval ' 1213s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1213s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1213s ' 1213s ++ : /usr/bin/dpkg-parsechangelog 1213s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1213s + f=./dpkg-parsechangelog 1213s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1213s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1213s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1213s + for f in "$@" 1213s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 1213s + local f=Dpkg/Changelog/Parse.pm 1213s + case "$f" in 1213s + return 1213s + f=./Dpkg/Changelog/Parse.pm 1213s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1213s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1213s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1213s + t-gdr-gbp-import-core-with-queue 1213s + t-gdr-gbp-import-core 1213s + p=example 1213s + t-worktree 1.1 1213s + rm -rf example 1213s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1 1213s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 1213s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 1213s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 1213s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 1213s + cd example 1213s + : 'fake up some kind of upstream' 1213s + git checkout -b upstream quilt-tip 1213s Switched to a new branch 'upstream' 1213s + rm -rf debian 1213s + mkdir debian 1213s + echo junk 1213s + git add debian 1213s + git commit -m 'an upstream retcon (/tmp/autopkgtest.XK8uun/build.980/src/tests/setup/gdr-convert-gbp)' 1213s [upstream 101731a] an upstream retcon (/tmp/autopkgtest.XK8uun/build.980/src/tests/setup/gdr-convert-gbp) 1213s 6 files changed, 1 insertion(+), 36 deletions(-) 1213s delete mode 100644 debian/changelog 1213s delete mode 100644 debian/compat 1213s delete mode 100644 debian/control 1213s delete mode 100644 debian/example.install 1213s mode change 100755 => 100644 debian/rules 1213s delete mode 100644 debian/source/format 1213s + git tag v1.0 1213s + : 'fake up that our quilt-tip was descended from upstream' 1213s + git checkout quilt-tip 1213s Switched to branch 'quilt-tip' 1213s + git merge --no-edit -s ours upstream 1213s Merge made by the 'ours' strategy. 1213s + : 'fake up that our quilt-tip had the patch queue in it' 1213s + git checkout patch-queue/quilt-tip 1213s Switched to branch 'patch-queue/quilt-tip' 1213s + gbp pq export 1214s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1214s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1214s + git add debian/patches 1214s + git commit -m 'patch queue update (/tmp/autopkgtest.XK8uun/build.980/src/tests/setup/gdr-convert-gbp)' 1214s [quilt-tip d3d7160] patch queue update (/tmp/autopkgtest.XK8uun/build.980/src/tests/setup/gdr-convert-gbp) 1214s 4 files changed, 50 insertions(+) 1214s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1214s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1214s create mode 100644 debian/patches/series 1214s create mode 100644 debian/patches/subdir/addnewups 1214s + : 'make branch names more conventional' 1214s + git branch -D master 1214s Deleted branch master (was 17d67db). 1214s + git branch -m quilt-tip master 1214s + not-gdr-processable origin 1214s + git branch gdr-unprocessable/origin 1214s + t-git-debrebase analyse 1214s + local gdr=git-debrebase 1214s + : ' 1214s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1214s + grep 'Unknown Unprocessable' 1214s + git-debrebase --dgit=dgit -D analyse 1214s git-debrebase *** WALK d3d716010fa7116099e2ff3d6afbeca9de2ffffe 1 *main::STDOUT 1214s git-debrebase get_differs 0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1214s git-debrebase classify d3d716010fa7116099e2ff3d6afbeca9de2ffffe $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e/0x4 1214s git-debrebase = AddPatches {"CommitId" => "d3d716010fa7116099e2ff3d6afbeca9de2ffffe","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"Ix" => 0,"CommitId" => "0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e","Differs" => 4}],"Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "patch queue update (/tmp/autopkgtest.XK8uun/build.980/src/tests/setup/gdr-convert-gbp)\n","Type" => "AddPatches"} 1214s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1214s git-debrebase get_differs 101731a4c108d62fe75ded3bf72c0dd6359ca8f9 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1214s git-debrebase classify 0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 101731a4c108d62fe75ded3bf72c0dd6359ca8f9/0x30 1214s git-debrebase = Pseudomerge {"Msg" => "Merge branch 'upstream' into quilt-tip\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","CommitId" => "0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e","Type" => "Pseudomerge","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent 101731a4c108d62fe75ded3bf72c0dd6359ca8f9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Overwritten" => [{"Differs" => 48,"CommitId" => "101731a4c108d62fe75ded3bf72c0dd6359ca8f9","Ix" => 1}],"Parents" => [{"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0,"Differs" => 0},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0]} 1214s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1214s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1214s git-debrebase = Upstream {"Msg" => "Add *.o to .gitignore\n","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0}]} 1214s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1214s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1214s git-debrebase = Mixed {"Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Ix" => 0,"Differs" => 50}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Type" => "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"} 1214s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1214s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1214s git-debrebase = Packaging {"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Parents" => [{"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0}],"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Msg" => "echo EXAMPLE RULES TARGET\n","Type" => "Packaging"} 1214s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1214s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1214s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Parents" => [{"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Ix" => 0}],"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"} 1214s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1214s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1214s git-debrebase = Packaging {"Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0,"Differs" => 32}],"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Type" => "Packaging","Msg" => "WIP\n","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n"} 1214s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1214s git-debrebase ** Unknown 1214s git-debrebase *** WALK BOMB unrecognised 1214s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1214s ' 1214s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1214s + : 'fake up an upstream 2.0' 1214s + git branch make-upstream upstream 1214s + t-make-new-upstream-tarball 2.0 1214s + local uv=2.0 1214s + git checkout make-upstream 1214s Switched to branch 'make-upstream' 1214s + echo 'upstream 2.0' 1214s + git commit -a -m 'upstream 2.0 tarball' 1214s [make-upstream e7e08e1] upstream 2.0 tarball 1214s 1 file changed, 1 insertion(+) 1214s + t-make-orig example 2.0 make-upstream 1214s + local p=example 1214s + local v=2.0 1214s + local tag=make-upstream 1214s + ust=example_2.0.orig.tar.gz 1214s + GZIP=-1 1214s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1214s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1214s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1214s + git branch -D quilt-tip-2 1214s Deleted branch quilt-tip-2 (was 99fcab4). 1214s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1214s + git branch -D gitish-only 1214s Deleted branch gitish-only (was 2b2ddc8). 1214s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1214s + git branch -D quilt-tip-1.1 1214s Deleted branch quilt-tip-1.1 (was 7fc34be). 1214s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1214s + git branch -D patch-queue/quilt-tip 1214s Deleted branch patch-queue/quilt-tip (was d843a68). 1214s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1214s + git branch -D indep-arch 1214s Deleted branch indep-arch (was e215729). 1214s + : 'see what gbp import-orig does' 1214s + git checkout master 1214s Switched to branch 'master' 1214s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1214s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1214s gbp:info: Source package is example 1214s gbp:info: Upstream version is 2.0 1214s gbp:info: Replacing upstream source on 'master' 1214s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1214s + not-gdr-processable merge 1214s + git branch gdr-unprocessable/merge 1214s + t-git-debrebase analyse 1214s + local gdr=git-debrebase 1214s + : ' 1214s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1214s + git-debrebase --dgit=dgit -D analyse 1214s + grep 'Unknown Unprocessable' 1214s git-debrebase *** WALK 4555cdb5af42b5f82cc064047e98864c40ebc7f1 1 *main::STDOUT 1214s git-debrebase get_differs d3d716010fa7116099e2ff3d6afbeca9de2ffffe 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1214s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1214s git-debrebase classify 4555cdb5af42b5f82cc064047e98864c40ebc7f1 $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p d3d716010fa7116099e2ff3d6afbeca9de2ffffe/0x2 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x34 1214s git-debrebase ** Unknown 1214s git-debrebase *** WALK BOMB unrecognised 1214s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1214s ' 1214s 4555cdb5af42b5f82cc064047e98864c40ebc7f1 Unknown Unprocessable (general two-parent merge) 1214s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1214s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1214s + DEBEMAIL=dgit-tests@example.org 1214s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1214s + 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) 1214s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1214s [master 56357ce] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1214s 1 file changed, 6 insertions(+) 1214s + t-dch-commit-r 1214s + t-dch-r-rune t-dch-commit 1214s + local cmd=t-dch-commit 1214s + shift 1214s + local suite=unstable 1214s + t-dch-commit -r -D unstable '' 1214s + t-debchange -r -D unstable '' 1214s + DEBEMAIL=dgit-tests@example.org 1214s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1214s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1214s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1214s libdistro-info-perl is not installed, Debian release names are not known. 1214s libdistro-info-perl is not installed, Ubuntu release names are not known. 1214s + git commit -m 'dch -r -D unstable ' debian/changelog 1214s [master 837f4d5] dch -r -D unstable 1214s 1 file changed, 3 insertions(+), 2 deletions(-) 1214s + echo garbage 1214s + git add debian/patches/garbage 1214s + git commit -m 'add garbage' debian/patches/garbage 1214s [master 26e401e] add garbage 1214s 1 file changed, 1 insertion(+) 1214s create mode 100644 debian/patches/garbage 1214s + : t-archive-none example 1214s + : t-git-none 1214s + : t-dgit -wgf --gbp push-source --new 1214s + t-salsa-add-remote 1214s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1214s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1214s + set -e 1214s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1214s + git init --bare 1214s hint: Using 'master' as the name for the initial branch. This default branch name 1214s hint: is subject to change. To configure the initial branch name to use in all 1214s hint: of your new repositories, which will suppress this warning, call: 1214s hint: 1214s hint: git config --global init.defaultBranch 1214s hint: 1214s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1214s hint: 'development'. The just-created branch can be renamed via this command: 1214s hint: 1214s hint: git branch -m 1214s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example/ 1214s + git remote add origin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1214s + git push --set-upstream origin master 1214s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1214s * [new branch] master -> master 1214s Branch 'master' set up to track remote branch 'master' from 'origin'. 1214s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1214s + local 'mpat=E:identical in upstream files' 1214s + shift 1214s + set +o pipefail 1214s + LC_MESSAGES=C 1214s + LANGUAGE=C 1214s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1214s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1214s + local gdr=git-debrebase 1214s + : ' 1214s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1214s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1214s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1214s git-debrebase get_differs 101731a4c108d62fe75ded3bf72c0dd6359ca8f9 26e401e95afe770893348b725b7408b793ce2867 = 0x36 1214s docs/README | 1 + 1214s 1 file changed, 1 insertion(+) 1214s 1214s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1214s git-debrebase: identical in upstream files. See diffstat above, or run 1214s git-debrebase: git diff 101731a4c108d62fe75ded3bf72c0dd6359ca8f9 HEAD -- :!/debian :/ 1214s + local 'ps=255 0' 1214s + set -o pipefail 1214s + case $ps in 1214s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1214s + local 'mpat=E:identical in upstream files' 1214s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1214s + local grepper=fgrep 1214s + case "$mpat" in 1214s + case "$mpat" in 1214s + grepper=egrep 1214s + mpat='identical in upstream files' 1214s + egrep -e 'identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1214s git-debrebase: identical in upstream files. See diffstat above, or run 1214s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1214s + local 'mpat=E:Unused patch file garbage will be discarded' 1214s + shift 1214s + set +o pipefail 1214s + LC_MESSAGES=C 1214s + LANGUAGE=C 1214s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1214s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1214s + local gdr=git-debrebase 1214s + : ' 1214s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1214s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1214s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1214s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 26e401e95afe770893348b725b7408b793ce2867 = 0x34 1214s git-debrebase: snag ignored (-fupstream-has-debian): upstream (c503a3d8e91a8fe38919c1795f29cacc3a671c3e) contains debian/ directory 1214s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1215s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1215s $VAR2 = bless( do{\(my $o = { 1215s 'keep_duplicate' => 0, 1215s 'name' => 'debian/changelog, entry no.1', 1215s 'in_order' => [ 1215s 'Source', 1215s 'Version', 1215s 'Distribution', 1215s 'Urgency', 1215s 'Maintainer', 1215s 'Timestamp', 1215s 'Date', 1215s 'Changes' 1215s ], 1215s 'allow_duplicate' => 0, 1215s 'fields' => { 1215s 'Source' => 'example', 1215s 'Version' => '2.0-1', 1215s 'Distribution' => 'unstable', 1215s 'Urgency' => 'medium', 1215s 'Maintainer' => 'dgit test git user ', 1215s 'Timestamp' => '1530000000', 1215s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1215s 'Changes' => ' 1215s example (2.0-1) unstable; urgency=medium 1215s 1215s [ Ian Jackson ] 1215s * new upstream (did gbp import-orig)' 1215s }, 1215s 'out_order' => [], 1215s 'allow_pgp' => 1, 1215s 'drop_empty' => 0, 1215s 'is_pgp_signed' => 0 1215s })}, 'Dpkg::Control::Hash' ); 1215s last finished-looking changelog entry: (2.0-1) unstable 1215s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 1215s Failed to stitch in dgit view (see messages above). 1215s dgit --overwrite will be needed on the first dgit push after conversion. 1215s git-debrebase: snags: 1 overriden by individual -f options 1215s 1215s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1215s + local 'ps=255 0' 1215s + set -o pipefail 1215s + case $ps in 1215s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1215s + local 'mpat=E:Unused patch file garbage will be discarded' 1215s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1215s + local grepper=fgrep 1215s + case "$mpat" in 1215s + case "$mpat" in 1215s + grepper=egrep 1215s + mpat='Unused patch file garbage will be discarded' 1215s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1215s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1215s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1215s + local gdr=git-debrebase 1215s + : ' 1215s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1215s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1215s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1215s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 26e401e95afe770893348b725b7408b793ce2867 = 0x34 1215s git-debrebase: snag ignored (-fupstream-has-debian): upstream (c503a3d8e91a8fe38919c1795f29cacc3a671c3e) contains debian/ directory 1215s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1215s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1215s $VAR2 = bless( do{\(my $o = { 1215s 'in_order' => [ 1215s 'Source', 1215s 'Version', 1215s 'Distribution', 1215s 'Urgency', 1215s 'Maintainer', 1215s 'Timestamp', 1215s 'Date', 1215s 'Changes' 1215s ], 1215s 'is_pgp_signed' => 0, 1215s 'keep_duplicate' => 0, 1215s 'allow_duplicate' => 0, 1215s 'out_order' => [], 1215s 'fields' => { 1215s 'Source' => 'example', 1215s 'Version' => '2.0-1', 1215s 'Distribution' => 'unstable', 1215s 'Urgency' => 'medium', 1215s 'Maintainer' => 'dgit test git user ', 1215s 'Timestamp' => '1530000000', 1215s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1215s 'Changes' => ' 1215s example (2.0-1) unstable; urgency=medium 1215s 1215s [ Ian Jackson ] 1215s * new upstream (did gbp import-orig)' 1215s }, 1215s 'name' => 'debian/changelog, entry no.1', 1215s 'drop_empty' => 0, 1215s 'allow_pgp' => 1 1215s })}, 'Dpkg::Control::Hash' ); 1215s last finished-looking changelog entry: (2.0-1) unstable 1215s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 1215s Failed to stitch in dgit view (see messages above). 1215s dgit --overwrite will be needed on the first dgit push after conversion. 1215s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1215s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1215s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1215s gbp:info: Trying to apply patches at '26e401e95afe770893348b725b7408b793ce2867' 1215s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1215s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1215s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1215s git-debrebase ffq check_specs * 1215s git-debrebase ffq merge master 1215s git-debrebase ffq check_remote origin remote fetch/merge branch 1215s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1215s OK, you are ahead of refs/remotes/origin/master 1215s git-debrebase ffq check_remote undef remote push branch 1215s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1215s git-debrebase: snags: 2 overriden by individual -f options 1215s git-debrebase >= update refs/debrebase-last/heads/master 666ace228974ec35effb8cb4bd8ac8db3883a287 0000000000000000000000000000000000000000 1215s git-debrebase >= update HEAD 666ace228974ec35effb8cb4bd8ac8db3883a287 26e401e95afe770893348b725b7408b793ce2867 1215s git-debrebase >$ 1215s HEAD is now at 666ace2 Add another new upstream file 1215s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1215s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1215s ' 1215s + git branch converted-from-gbp 1215s + v=2.0-2 1215s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1215s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1215s + DEBEMAIL=dgit-tests@example.org 1215s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1215s + 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 1215s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1215s [master e5a9e04] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1215s 1 file changed, 6 insertions(+) 1215s + t-dch-commit-r 1215s + t-dch-r-rune t-dch-commit 1215s + local cmd=t-dch-commit 1215s + shift 1215s + local suite=unstable 1215s + t-dch-commit -r -D unstable '' 1215s + t-debchange -r -D unstable '' 1215s + DEBEMAIL=dgit-tests@example.org 1215s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1215s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1215s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1215s libdistro-info-perl is not installed, Debian release names are not known. 1215s libdistro-info-perl is not installed, Ubuntu release names are not known. 1215s + git commit -m 'dch -r -D unstable ' debian/changelog 1215s [master e87c421] dch -r -D unstable 1215s 1 file changed, 1 insertion(+), 1 deletion(-) 1215s + : t-dgit -wgf push-source --new 1215s + git push 1215s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1215s 26e401e..e87c421 master -> master 1215s + cd .. 1215s + : t-archive-process-incoming sid 1215s ++ echo example example_2.0.orig.tar.gz 1215s ++ : echo git mirror aq 1215s + t-setup-done '' 'example example_2.0.orig.tar.gz salsa ' ' 1215s . $troot/lib-gdr 1215s t-tstunt-parsechangelog 1215s p=example 1215s t-git-next-date 1215s ' 1215s + local savevars= 1215s + local 'savedirs=example example_2.0.orig.tar.gz salsa ' 1215s + local 'importeval= 1215s . $troot/lib-gdr 1215s t-tstunt-parsechangelog 1215s p=example 1215s t-git-next-date 1215s ' 1215s + local import=IMPORT.gdr-convert-gbp-noarchive 1215s + exec 1215s + local vn 1215s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1215s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1215s print STDERR "saving-exporting $vn\n"; 1215s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1215s or die $!; 1215s } 1215s ' 1215s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1215s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1215s + set -e 1215s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1215s + tar cf IMPORT.gdr-convert-gbp-noarchive.tar example example_2.0.orig.tar.gz salsa 1215s + printf '\n%s\n' ' 1215s . $troot/lib-gdr 1215s t-tstunt-parsechangelog 1215s p=example 1215s t-git-next-date 1215s ' 1215s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1215s + rc=0 1215s + set +x 1215s + set +e 1215s + pwd 1215s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1215s + '[' x '!=' x ']' 1215s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1215s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1215s + set -e 1215s + test 0 = 0 1215s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1215s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1215s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1215s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1215s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1215s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1215s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1215s ++ . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1215s +++ : -D 1215s +++ export GDR_TEST_DEBUG 1215s +++ t-tstunt debchange 1215s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1215s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1215s +++ local var=PATH 1215s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1215s +++ eval ' 1215s case "$PATH" in 1215s "$tstunt:"*) ;; 1215s *":$tstunt:"*) ;; 1215s "") PATH="$tstunt" ;; 1215s *) PATH="$tstunt:$PATH" ;; 1215s esac 1215s export PATH 1215s ' 1215s ++++ case "$PATH" in 1215s ++++ export PATH 1215s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1215s +++ local var=PERLLIB 1215s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1215s +++ eval ' 1215s case "$PERLLIB" in 1215s "$tstunt:"*) ;; 1215s *":$tstunt:"*) ;; 1215s "") PERLLIB="$tstunt" ;; 1215s *) PERLLIB="$tstunt:$PERLLIB" ;; 1215s esac 1215s export PERLLIB 1215s ' 1215s ++++ case "$PERLLIB" in 1215s ++++ export PERLLIB 1215s +++ local f 1215s +++ for f in "$@" 1215s +++ t-tstunt--save-real debchange 1215s +++ local f=debchange 1215s +++ case "$f" in 1215s +++ local rc 1215s +++ local real 1215s +++ set +e 1215s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1215s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1215s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1215s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1215s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1215s ++++ type -p debchange 1215s +++ real=/usr/bin/debchange 1215s +++ rc=0 1215s +++ set -e 1215s +++ case $rc in 1215s +++ local varname=debchange 1215s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1215s +++ eval ' 1215s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1215s export DGIT_TEST_REAL_DEBCHANGE 1215s ' 1215s ++++ : /usr/bin/debchange 1215s ++++ export DGIT_TEST_REAL_DEBCHANGE 1215s +++ f=./debchange 1215s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1215s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1215s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1215s ++ t-tstunt-parsechangelog 1215s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1215s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1215s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1215s ++ local var=PATH 1215s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1215s ++ eval ' 1215s case "$PATH" in 1215s "$tstunt:"*) ;; 1215s *":$tstunt:"*) ;; 1215s "") PATH="$tstunt" ;; 1215s *) PATH="$tstunt:$PATH" ;; 1215s esac 1215s export PATH 1215s ' 1215s +++ case "$PATH" in 1215s +++ export PATH 1215s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1215s ++ local var=PERLLIB 1215s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1215s ++ eval ' 1215s case "$PERLLIB" in 1215s "$tstunt:"*) ;; 1215s *":$tstunt:"*) ;; 1215s "") PERLLIB="$tstunt" ;; 1215s *) PERLLIB="$tstunt:$PERLLIB" ;; 1215s esac 1215s export PERLLIB 1215s ' 1215s +++ case "$PERLLIB" in 1215s +++ export PERLLIB 1215s ++ local f 1215s ++ for f in "$@" 1215s ++ t-tstunt--save-real dpkg-parsechangelog 1215s ++ local f=dpkg-parsechangelog 1215s ++ case "$f" in 1215s ++ local rc 1215s ++ local real 1215s ++ set +e 1215s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1215s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1215s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1215s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1215s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1215s +++ type -p dpkg-parsechangelog 1215s ++ real=/usr/bin/dpkg-parsechangelog 1215s ++ rc=0 1215s ++ set -e 1215s ++ case $rc in 1215s ++ local varname=dpkg_parsechangelog 1215s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1215s ++ eval ' 1215s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1215s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1215s ' 1215s +++ : /usr/bin/dpkg-parsechangelog 1215s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1215s ++ f=./dpkg-parsechangelog 1215s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1215s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1215s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1215s ++ for f in "$@" 1215s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1215s ++ local f=Dpkg/Changelog/Parse.pm 1215s ++ case "$f" in 1215s ++ return 1215s ++ f=./Dpkg/Changelog/Parse.pm 1215s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1215s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1215s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1215s ++ p=example 1215s ++ t-git-next-date 1215s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1215s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1215s + t_gdr_xopts+=' --experimental-merge-resolution' 1215s + : ----- prepare the baseline ----- 1215s + cd example 1215s + t-gdr-prep-new-upstream 2.1 1215s + uv=2.1 1215s + t-git-next-date 1215s + GIT_COMMITTER_DATE='1530000002 +0100' 1215s + GIT_AUTHOR_DATE='1530000002 +0100' 1215s + git checkout make-upstream 1215s Switched to branch 'make-upstream' 1215s + git reset --hard upstream 1215s HEAD is now at c503a3d New upstream version 2.0 1215s + t-make-new-upstream-tarball 2.1 1215s + local uv=2.1 1215s + git checkout make-upstream 1215s Already on 'make-upstream' 1215s + echo 'upstream 2.1' 1215s + git commit -a -m 'upstream 2.1 tarball' 1215s [make-upstream 38ee937] upstream 2.1 tarball 1215s 1 file changed, 1 insertion(+) 1215s + t-make-orig example 2.1 make-upstream 1215s + local p=example 1215s + local v=2.1 1215s + local tag=make-upstream 1215s + ust=example_2.1.orig.tar.gz 1215s + GZIP=-1 1215s + git archive -o ../example_2.1.orig.tar.gz --prefix=example-2.1/ make-upstream 1215s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1215s + git push . make-upstream:upstream 1215s To . 1215s c503a3d..38ee937 make-upstream -> upstream 1215s + git checkout master 1215s Switched to branch 'master' 1215s Your branch is up to date with 'origin/master'. 1215s + t-git-next-date 1215s + GIT_COMMITTER_DATE='1530000003 +0100' 1215s + GIT_AUTHOR_DATE='1530000003 +0100' 1215s + git tag v2.1 upstream 1215s + t-some-changes before 1215s + local token=before 1215s + local which=dum 1215s + local fsuffix= 1215s + t-git-next-date 1215s + GIT_COMMITTER_DATE='1530000004 +0100' 1215s + GIT_AUTHOR_DATE='1530000004 +0100' 1215s + case "$which" in 1215s + echo '// debian before' 1215s + git add debian/zorkmid 1215s + git commit -m 'DEBIAN add zorkmid (before)' 1215s [master b262858] DEBIAN add zorkmid (before) 1215s 1 file changed, 1 insertion(+) 1215s create mode 100644 debian/zorkmid 1215s + case "$which" in 1215s + echo '// upstream before' 1215s + git add src.c 1215s + git commit -m 'UPSTREAM edit src.c (before)' 1215s [master b1e7ebc] UPSTREAM edit src.c (before) 1215s 1 file changed, 1 insertion(+) 1215s + case "$which" in 1215s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1215s + echo '// both! before' 1215s + git add debian/zorkmid 1215s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1215s + echo '// both! before' 1215s + git add src.c 1215s + git commit -m 'MIXED add both() (before)' 1215s [master b377a99] MIXED add both() (before) 1215s 2 files changed, 2 insertions(+) 1215s + t-git-next-date 1215s + GIT_COMMITTER_DATE='1530000005 +0100' 1215s + GIT_AUTHOR_DATE='1530000005 +0100' 1215s + t-git-debrebase quick 1215s + local gdr=git-debrebase 1215s + : ' 1215s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1215s + git-debrebase --dgit=dgit -D --experimental-merge-resolution quick 1215s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1215s git-debrebase ffq check_specs * 1215s git-debrebase ffq merge master 1215s git-debrebase ffq check_remote origin remote fetch/merge branch 1215s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1216s OK, you are ahead of refs/remotes/origin/master 1216s git-debrebase ffq check_remote undef remote push branch 1216s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1216s git-debrebase *** WALK b377a9960f3a99f617597d2203ab69805f4af3d1 0 - 1216s git-debrebase get_differs b1e7ebc736259434df63791de6511273538f36be af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x22 1216s git-debrebase classify b377a9960f3a99f617597d2203ab69805f4af3d1 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p b1e7ebc736259434df63791de6511273538f36be/0x22 1216s git-debrebase = Mixed {"Parents" => [{"Differs" => 34,"CommitId" => "b1e7ebc736259434df63791de6511273538f36be","Ix" => 0}],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent b1e7ebc736259434df63791de6511273538f36be\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","CommitId" => "b377a9960f3a99f617597d2203ab69805f4af3d1","Type" => "Mixed","Msg" => "MIXED add both() (before)\n"} 1216s git-debrebase get_differs b262858209fbcc06f0839029d6925c2a5cce27c1 ccd4a7c462d0e0b559590a43d0b920471105a2a6 = 0x2 1216s git-debrebase classify b1e7ebc736259434df63791de6511273538f36be $t=ccd4a7c462d0e0b559590a43d0b920471105a2a6 @p b262858209fbcc06f0839029d6925c2a5cce27c1/0x2 1216s git-debrebase = Upstream {"Hdr" => "tree ccd4a7c462d0e0b559590a43d0b920471105a2a6\nparent b262858209fbcc06f0839029d6925c2a5cce27c1\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","Tree" => "ccd4a7c462d0e0b559590a43d0b920471105a2a6","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b262858209fbcc06f0839029d6925c2a5cce27c1"}],"Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream","CommitId" => "b1e7ebc736259434df63791de6511273538f36be"} 1216s git-debrebase get_differs e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a 86d647b7fb482f29d7d648111f8ab4f4953b3233 = 0x20 1216s git-debrebase classify b262858209fbcc06f0839029d6925c2a5cce27c1 $t=86d647b7fb482f29d7d648111f8ab4f4953b3233 @p e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a/0x20 1216s git-debrebase = Packaging {"Tree" => "86d647b7fb482f29d7d648111f8ab4f4953b3233","Hdr" => "tree 86d647b7fb482f29d7d648111f8ab4f4953b3233\nparent e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a","Differs" => 32}],"Msg" => "DEBIAN add zorkmid (before)\n","Type" => "Packaging","CommitId" => "b262858209fbcc06f0839029d6925c2a5cce27c1"} 1216s git-debrebase get_differs e5a9e04273c87243d22ae8b19e14e071329ffb18 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1216s git-debrebase classify e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p e5a9e04273c87243d22ae8b19e14e071329ffb18/0x10 1216s git-debrebase = Changelog {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent e5a9e04273c87243d22ae8b19e14e071329ffb18\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "e5a9e04273c87243d22ae8b19e14e071329ffb18"}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n","CommitId" => "e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a"} 1216s git-debrebase get_differs 666ace228974ec35effb8cb4bd8ac8db3883a287 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1216s git-debrebase classify e5a9e04273c87243d22ae8b19e14e071329ffb18 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 666ace228974ec35effb8cb4bd8ac8db3883a287/0x10 1216s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "e5a9e04273c87243d22ae8b19e14e071329ffb18","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 666ace228974ec35effb8cb4bd8ac8db3883a287\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Parents" => [{"Differs" => 16,"CommitId" => "666ace228974ec35effb8cb4bd8ac8db3883a287","Ix" => 0}]} 1216s git-debrebase get_differs 720a44ed6b94c15cec25cfbd027a838da0906bf1 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1216s git-debrebase classify 666ace228974ec35effb8cb4bd8ac8db3883a287 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 720a44ed6b94c15cec25cfbd027a838da0906bf1/0x2 1216s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "666ace228974ec35effb8cb4bd8ac8db3883a287","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 720a44ed6b94c15cec25cfbd027a838da0906bf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "720a44ed6b94c15cec25cfbd027a838da0906bf1","Ix" => 0}]} 1216s git-debrebase get_differs cb925ecbd2cd9c4bf653109bbb7e48407fc1145d dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1216s git-debrebase classify 720a44ed6b94c15cec25cfbd027a838da0906bf1 $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p cb925ecbd2cd9c4bf653109bbb7e48407fc1145d/0x2 1216s git-debrebase = Upstream {"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent cb925ecbd2cd9c4bf653109bbb7e48407fc1145d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "cb925ecbd2cd9c4bf653109bbb7e48407fc1145d","Differs" => 2,"Ix" => 0}],"CommitId" => "720a44ed6b94c15cec25cfbd027a838da0906bf1","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1216s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1216s git-debrebase classify cb925ecbd2cd9c4bf653109bbb7e48407fc1145d $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x2 1216s git-debrebase = Upstream {"CommitId" => "cb925ecbd2cd9c4bf653109bbb7e48407fc1145d","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 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}]} 1216s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1216s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1216s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1216s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48,"Ix" => 1}],"Parents" => [{"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1216s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 4 upp 4 proc 9 pm -1 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1216s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 10 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1216s git-debrebase WALK BUILD e5a9e04273c87243d22ae8b19e14e071329ffb18 Debian (rewriting=0) 1216s git-debrebase WALK REWRITING NOW cl=HASH(0x533306be1c8) procd=HASH(0x5333073fe68) 1216s git-debrebase WALK BUILD e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a Debian (rewriting=1) 1216s git-debrebase WALK BUILD b262858209fbcc06f0839029d6925c2a5cce27c1 Debian (rewriting=1) 1216s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1216s git-debrebase WALK BUILD b377a9960f3a99f617597d2203ab69805f4af3d1 Debian (rewriting=1) 1216s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1216s git-debrebase WALK BUILD cb925ecbd2cd9c4bf653109bbb7e48407fc1145d Upstream (rewriting=1) 1216s git-debrebase WALK BUILD 720a44ed6b94c15cec25cfbd027a838da0906bf1 Upstream (rewriting=1) 1216s git-debrebase WALK BUILD 666ace228974ec35effb8cb4bd8ac8db3883a287 Upstream (rewriting=1) 1216s git-debrebase WALK BUILD b1e7ebc736259434df63791de6511273538f36be Upstream (rewriting=1) 1216s git-debrebase WALK BUILD b377a9960f3a99f617597d2203ab69805f4af3d1 Upstream (rewriting=1) 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1216s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 b377a9960f3a99f617597d2203ab69805f4af3d1 = 0 1216s git-debrebase *** WALK RETURN 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 48c55fcd6aad3671faeeedd232289eea48db8cce 1216s git-debrebase: laundered (head was b377a9960f3a99f617597d2203ab69805f4af3d1) 1216s git-debrebase >= update refs/ffq-prev/heads/master b377a9960f3a99f617597d2203ab69805f4af3d1 0000000000000000000000000000000000000000 1216s git-debrebase >= delete refs/debrebase-last/heads/master 1216s git-debrebase >= update HEAD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 b377a9960f3a99f617597d2203ab69805f4af3d1 1216s git-debrebase >$ 1216s Recorded previous head for preservation 1216s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1216s git-debrebase get_differs 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 1216s git-debrebase classify 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a/0x2 1216s git-debrebase = Upstream {"Parents" => [{"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Differs" => 2,"Ix" => 0}],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Type" => "Upstream","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5"} 1216s git-debrebase get_differs 61838f71874d7ddb712bb3c25e0a0c91734bab47 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 1216s git-debrebase classify 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 61838f71874d7ddb712bb3c25e0a0c91734bab47/0x2 1216s git-debrebase = Upstream {"Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 61838f71874d7ddb712bb3c25e0a0c91734bab47\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Parents" => [{"Ix" => 0,"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Differs" => 2}],"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (before)\n"} 1216s git-debrebase get_differs cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 1216s git-debrebase classify 61838f71874d7ddb712bb3c25e0a0c91734bab47 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p cfa06dbc0f977f48e1449a0f11ee4106d8bf1269/0x2 1216s git-debrebase = Upstream {"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent cfa06dbc0f977f48e1449a0f11ee4106d8bf1269\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Ix" => 0}]} 1216s git-debrebase get_differs 31cc003deb18794414e5604fc32fdd9819189100 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 1216s git-debrebase classify cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p 31cc003deb18794414e5604fc32fdd9819189100/0x2 1216s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent 31cc003deb18794414e5604fc32fdd9819189100\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","Parents" => [{"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Differs" => 2,"Ix" => 0}]} 1216s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 1216s git-debrebase classify 31cc003deb18794414e5604fc32fdd9819189100 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 1216s git-debrebase = Upstream {"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 2}],"Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666"} 1216s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1216s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1216s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Parents" => [{"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32,"Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"} 1216s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1216s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1216s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Parents" => [{"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1216s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1216s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1216s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Msg" => "dch -r -D unstable\n","Type" => "Changelog"} 1216s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1216s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1216s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Differs" => 16}]} 1216s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1216s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1216s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1216s git-debrebase = Anchor {"Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0,"Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"} 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1216s git-debrebase >= delete refs/ffq-prev/heads/master b377a9960f3a99f617597d2203ab69805f4af3d1 1216s git-debrebase >= update refs/debrebase-last/heads/master ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 0000000000000000000000000000000000000000 1216s git-debrebase >= update HEAD ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 1216s git-debrebase >$ 1216s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1216s ' 1216s + : ===== early failure in walk ===== 1216s + : ----- prepare other ----- 1216s + git checkout -b other 1216s Switched to a new branch 'other' 1216s + t-some-changes other '' -other 1216s + local token=other 1216s + local which=dum 1216s + local fsuffix=-other 1216s + t-git-next-date 1216s + GIT_COMMITTER_DATE='1530000006 +0100' 1216s + GIT_AUTHOR_DATE='1530000006 +0100' 1216s + case "$which" in 1216s + echo '// debian other' 1216s + git add debian/zorkmid-other 1216s + git commit -m 'DEBIAN add zorkmid-other (other)' 1216s [other 93fb9b8] DEBIAN add zorkmid-other (other) 1216s 1 file changed, 1 insertion(+) 1216s create mode 100644 debian/zorkmid-other 1216s + case "$which" in 1216s + echo '// upstream other' 1216s + git add src-other.c 1216s + git commit -m 'UPSTREAM edit src-other.c (other)' 1216s [other c49d2b2] UPSTREAM edit src-other.c (other) 1216s 1 file changed, 1 insertion(+) 1216s create mode 100644 src-other.c 1216s + case "$which" in 1216s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1216s + echo '// both! other' 1216s + git add debian/zorkmid-other 1216s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1216s + echo '// both! other' 1216s + git add src-other.c 1216s + git commit -m 'MIXED add both(-other) (other)' 1216s [other 6ee89e4] MIXED add both(-other) (other) 1216s 2 files changed, 2 insertions(+) 1216s + t-git-next-date 1216s + GIT_COMMITTER_DATE='1530000007 +0100' 1216s + GIT_AUTHOR_DATE='1530000007 +0100' 1216s + git branch other-before-new-upstream 1216s + t-git-debrebase new-upstream 2.1 1216s + local gdr=git-debrebase 1216s + : ' 1216s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1216s + git-debrebase --dgit=dgit -D --experimental-merge-resolution new-upstream 2.1 1216s git-debrebase ffq_prev_branchinfo branch current refs/heads/other 1216s git-debrebase ffq check_specs * 1216s git-debrebase *** WALK 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca 0 - 1216s git-debrebase get_differs c49d2b2a9ad96cef20289702368179fbf9451928 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x22 1216s git-debrebase classify 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p c49d2b2a9ad96cef20289702368179fbf9451928/0x22 1216s git-debrebase = Mixed {"Msg" => "MIXED add both(-other) (other)\n","CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent c49d2b2a9ad96cef20289702368179fbf9451928\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "c49d2b2a9ad96cef20289702368179fbf9451928"}],"Type" => "Mixed"} 1216s git-debrebase get_differs 93fb9b858aa57847959deb395e6e7f54a29d8459 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 = 0x2 1216s git-debrebase classify c49d2b2a9ad96cef20289702368179fbf9451928 $t=6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 @p 93fb9b858aa57847959deb395e6e7f54a29d8459/0x2 1216s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "93fb9b858aa57847959deb395e6e7f54a29d8459","Ix" => 0}],"Tree" => "6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3","Msg" => "UPSTREAM edit src-other.c (other)\n","Hdr" => "tree 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3\nparent 93fb9b858aa57847959deb395e6e7f54a29d8459\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","CommitId" => "c49d2b2a9ad96cef20289702368179fbf9451928"} 1216s git-debrebase get_differs ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 0b23db5d4cdb928c7302154a99ab0e961fcb877a = 0x20 1216s git-debrebase classify 93fb9b858aa57847959deb395e6e7f54a29d8459 $t=0b23db5d4cdb928c7302154a99ab0e961fcb877a @p ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6/0x20 1216s git-debrebase = Packaging {"Tree" => "0b23db5d4cdb928c7302154a99ab0e961fcb877a","CommitId" => "93fb9b858aa57847959deb395e6e7f54a29d8459","Hdr" => "tree 0b23db5d4cdb928c7302154a99ab0e961fcb877a\nparent ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Ix" => 0}]} 1216s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1216s git-debrebase get_differs b377a9960f3a99f617597d2203ab69805f4af3d1 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1216s git-debrebase classify ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5/0 b377a9960f3a99f617597d2203ab69805f4af3d1/0 1216s git-debrebase = Pseudomerge {"Contributor" => {"CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Differs" => 0,"Ix" => 0},"Parents" => [$VAR1->{"Contributor"},{"Differs" => 0,"CommitId" => "b377a9960f3a99f617597d2203ab69805f4af3d1","Ix" => 1}],"Type" => "Pseudomerge","SubType" => "Ambiguous","CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5\nparent b377a9960f3a99f617597d2203ab69805f4af3d1\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Overwritten" => [$VAR1->{"Parents"}[1]],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe"} 1216s git-debrebase get_differs 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 1216s git-debrebase classify 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a/0x2 1216s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Differs" => 2,"Ix" => 0}],"Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a\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"} 1216s git-debrebase get_differs 61838f71874d7ddb712bb3c25e0a0c91734bab47 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 1216s git-debrebase classify 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 61838f71874d7ddb712bb3c25e0a0c91734bab47/0x2 1216s git-debrebase = Upstream {"Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 61838f71874d7ddb712bb3c25e0a0c91734bab47\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,"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Ix" => 0}]} 1216s git-debrebase get_differs cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 1216s git-debrebase classify 61838f71874d7ddb712bb3c25e0a0c91734bab47 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p cfa06dbc0f977f48e1449a0f11ee4106d8bf1269/0x2 1216s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269"}],"Type" => "Upstream","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent cfa06dbc0f977f48e1449a0f11ee4106d8bf1269\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3"} 1216s git-debrebase get_differs 31cc003deb18794414e5604fc32fdd9819189100 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 1216s git-debrebase classify cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p 31cc003deb18794414e5604fc32fdd9819189100/0x2 1216s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100"}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent 31cc003deb18794414e5604fc32fdd9819189100\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c"} 1216s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 1216s git-debrebase classify 31cc003deb18794414e5604fc32fdd9819189100 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 1216s git-debrebase = Upstream {"Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0}]} 1216s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1216s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1216s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"}],"Type" => "Packaging"} 1216s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1216s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1216s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0}]} 1216s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1216s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1216s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16}],"Type" => "Changelog"} 1216s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1216s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1216s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1216s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1216s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1216s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1216s git-debrebase = Anchor {"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\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" => [{"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48,"Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 1216s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 6 upp 7 proc 15 pm 0 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1216s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 16 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1216s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1216s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1216s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1216s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1216s git-debrebase WALK BUILD 93fb9b858aa57847959deb395e6e7f54a29d8459 Debian (rewriting=0) 1216s git-debrebase WALK REWRITING NOW cl=HASH(0xae69f62fc20) procd=HASH(0xae69f6bd0f8) 1216s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1216s git-debrebase WALK BUILD 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca Debian (rewriting=1) 1216s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1216s git-debrebase WALK BUILD 31cc003deb18794414e5604fc32fdd9819189100 Upstream (rewriting=1) 1216s git-debrebase WALK BUILD cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 Upstream (rewriting=1) 1216s git-debrebase WALK BUILD 61838f71874d7ddb712bb3c25e0a0c91734bab47 Upstream (rewriting=1) 1216s git-debrebase WALK BUILD 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a Upstream (rewriting=1) 1216s git-debrebase WALK BUILD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 Upstream (rewriting=1) 1216s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1216s git-debrebase WALK BUILD c49d2b2a9ad96cef20289702368179fbf9451928 Upstream (rewriting=1) 1216s git-debrebase WALK BUILD 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca Upstream (rewriting=1) 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1216s git-debrebase get_differs 3f29984b655349283a56dbb2f539689cdb8ba9e0 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca = 0 1216s git-debrebase *** WALK RETURN 3f29984b655349283a56dbb2f539689cdb8ba9e0 e13f36f87e6898b57c7a47fe7cd64bd151f8d26c 48c55fcd6aad3671faeeedd232289eea48db8cce 1216s git-debrebase get_differs 744b303fe1097b47ec1c0b73c19393ecdb8e4c76 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1216s git-debrebase classify e13f36f87e6898b57c7a47fe7cd64bd151f8d26c $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 744b303fe1097b47ec1c0b73c19393ecdb8e4c76/0x20 1216s git-debrebase = Packaging {"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "e13f36f87e6898b57c7a47fe7cd64bd151f8d26c","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 744b303fe1097b47ec1c0b73c19393ecdb8e4c76\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000007 +0100\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "744b303fe1097b47ec1c0b73c19393ecdb8e4c76","Differs" => 32}]} 1216s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1216s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1216s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1216s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16"},{"Ix" => 1,"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"Type" => "Anchor","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 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1216s git-debrebase %pieces = {"" => {"New" => "38ee93726fb48a60962f8d01d367986becb682da","Name" => "","NewIx" => 0,"Old" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Desc" => "upstream (main piece","OldIx" => 0}} 1216s git-debrebase @newpieces = [{"New" => "38ee93726fb48a60962f8d01d367986becb682da","Name" => "","NewIx" => 0,"Old" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Desc" => "upstream (main piece","OldIx" => 0}] 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1216s + 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. 1216s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1216s git-debrebase: laundered (head was 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca) 1216s git-debrebase >= update refs/ffq-prev/heads/other 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca 0000000000000000000000000000000000000000 1216s git-debrebase >= delete refs/debrebase-last/heads/other 1216s git-debrebase >= update HEAD 3f29984b655349283a56dbb2f539689cdb8ba9e0 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca 1216s git-debrebase >$ 1216s Recorded previous head for preservation 1216s 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. 1216s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1216s ' 1216s + t-git-next-date 1216s + GIT_COMMITTER_DATE='1530000008 +0100' 1216s + GIT_AUTHOR_DATE='1530000008 +0100' 1216s + : ----- prepare master ----- 1216s + git checkout master 1216s Switched to branch 'master' 1216s Your branch is ahead of 'origin/master' by 13 commits. 1216s (use "git push" to publish your local commits) 1216s + t-git-debrebase new-upstream 2.1 1216s + local gdr=git-debrebase 1216s + : ' 1216s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1216s + git-debrebase --dgit=dgit -D --experimental-merge-resolution new-upstream 2.1 1216s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1216s git-debrebase ffq check_specs * 1216s git-debrebase ffq merge master 1216s git-debrebase ffq check_remote origin remote fetch/merge branch 1216s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1216s OK, you are ahead of refs/remotes/origin/master 1216s git-debrebase ffq check_remote undef remote push branch 1216s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1216s git-debrebase *** WALK ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 0 - 1216s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1216s git-debrebase get_differs b377a9960f3a99f617597d2203ab69805f4af3d1 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1216s git-debrebase classify ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5/0 b377a9960f3a99f617597d2203ab69805f4af3d1/0 1216s git-debrebase = Pseudomerge {"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5\nparent b377a9960f3a99f617597d2203ab69805f4af3d1\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Overwritten" => [{"Differs" => 0,"CommitId" => "b377a9960f3a99f617597d2203ab69805f4af3d1","Ix" => 1}],"Parents" => [{"CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Differs" => 0,"Ix" => 0},$VAR1->{"Overwritten"}[0]],"SubType" => "Ambiguous","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge"} 1216s git-debrebase get_differs 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 1216s git-debrebase classify 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a/0x2 1216s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Differs" => 2}]} 1216s git-debrebase get_differs 61838f71874d7ddb712bb3c25e0a0c91734bab47 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 1216s git-debrebase classify 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 61838f71874d7ddb712bb3c25e0a0c91734bab47/0x2 1216s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Differs" => 2}],"Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 61838f71874d7ddb712bb3c25e0a0c91734bab47\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Type" => "Upstream"} 1216s git-debrebase get_differs cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 1216s git-debrebase classify 61838f71874d7ddb712bb3c25e0a0c91734bab47 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p cfa06dbc0f977f48e1449a0f11ee4106d8bf1269/0x2 1216s git-debrebase = Upstream {"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent cfa06dbc0f977f48e1449a0f11ee4106d8bf1269\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Type" => "Upstream"} 1216s git-debrebase get_differs 31cc003deb18794414e5604fc32fdd9819189100 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 1216s git-debrebase classify cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p 31cc003deb18794414e5604fc32fdd9819189100/0x2 1216s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent 31cc003deb18794414e5604fc32fdd9819189100\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269"} 1217s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 1217s git-debrebase classify 31cc003deb18794414e5604fc32fdd9819189100 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 1217s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0}]} 1217s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1217s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1217s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Parents" => [{"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32,"Ix" => 0}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 1217s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1217s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1217s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Type" => "Packaging","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 1217s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1217s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1217s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16,"Ix" => 0}],"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Msg" => "dch -r -D unstable\n"} 1217s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1217s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1217s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog"} 1217s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1217s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1217s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1217s 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","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0,"Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"} 1217s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 3 upp 5 proc 11 pm 0 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1217s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 12 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1217s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1217s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1217s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1217s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1217s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1217s git-debrebase WALK BUILD 31cc003deb18794414e5604fc32fdd9819189100 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD 61838f71874d7ddb712bb3c25e0a0c91734bab47 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a Upstream (rewriting=0) 1217s git-debrebase WALK BUILD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1217s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 = 0 1217s git-debrebase *** WALK RETURN 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 48c55fcd6aad3671faeeedd232289eea48db8cce 1217s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1217s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1217s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"} 1217s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1217s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1217s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1217s 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" => [{"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48}],"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16"},$VAR1->{"OrigParents"}[0]]} 1217s git-debrebase %pieces = {"" => {"Old" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","NewIx" => 0,"New" => "38ee93726fb48a60962f8d01d367986becb682da","OldIx" => 0,"Desc" => "upstream (main piece","Name" => ""}} 1217s git-debrebase @newpieces = [{"Old" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","NewIx" => 0,"New" => "38ee93726fb48a60962f8d01d367986becb682da","OldIx" => 0,"Desc" => "upstream (main piece","Name" => ""}] 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1217s + 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. 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1217s git-debrebase: laundered (head was ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6) 1217s git-debrebase >= update refs/ffq-prev/heads/master ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 0000000000000000000000000000000000000000 1217s git-debrebase >= delete refs/debrebase-last/heads/master 1217s git-debrebase >= update HEAD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 1217s git-debrebase >$ 1217s Recorded previous head for preservation 1217s Rebasing (1/5) Rebasing (2/5) Rebasing (3/5) Rebasing (4/5) Rebasing (5/5) Successfully rebased and updated refs/heads/master. 1217s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1217s ' 1217s + t-git-next-date 1217s + GIT_COMMITTER_DATE='1530000009 +0100' 1217s + GIT_AUTHOR_DATE='1530000009 +0100' 1217s + git branch master-before-merge 1217s + : ----- make the merge ----- 1217s + git merge --no-edit -s ours other 1217s Merge made by the 'ours' strategy. 1217s + t-git-next-date 1217s + GIT_COMMITTER_DATE='1530000010 +0100' 1217s + GIT_AUTHOR_DATE='1530000010 +0100' 1217s + t-debchange -a 'Merge, only conflict was in debian/changelog' 1217s + DEBEMAIL=dgit-tests@example.org 1217s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -a 'Merge, only conflict was in debian/changelog' 1217s + 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 1217s + t-dch-r-rune t-debchange 1217s + local cmd=t-debchange 1217s + shift 1217s + local suite=unstable 1217s + t-debchange -r -D unstable '' 1217s + DEBEMAIL=dgit-tests@example.org 1217s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1217s + exec env TZ=UTC faketime -f 2018-06-26 08:00:10 env -u TZ /usr/bin/debchange -r -D unstable 1217s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1217s libdistro-info-perl is not installed, Debian release names are not known. 1217s libdistro-info-perl is not installed, Ubuntu release names are not known. 1217s + git commit -a --amend --no-edit 1217s [master 6194097] Merge branch 'other' 1217s Date: Tue Jun 26 09:00:09 2018 +0100 1217s + wreckage-before 1217s + junkref=refs/debrebase/wreckage/junk 1217s + git update-ref refs/debrebase/wreckage/junk v2.1 1217s + t-expect-fail 'F:divergent anchors' t-git-debrebase 1217s + local 'mpat=F:divergent anchors' 1217s + shift 1217s + set +o pipefail 1217s + LC_MESSAGES=C 1217s + LANGUAGE=C 1217s + t-git-debrebase 1217s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1217s + local gdr=git-debrebase 1217s + : ' 1217s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1217s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 1217s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1217s git-debrebase *** WALK 61940977161de483ed57077e9c1a7c3c9758b794 0 - 1217s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d e3d7677ff411238e7a42355a1a7ad9f00d9f1444 = 0x10 1217s git-debrebase get_differs 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 e3d7677ff411238e7a42355a1a7ad9f00d9f1444 = 0x32 1217s git-debrebase classify 61940977161de483ed57077e9c1a7c3c9758b794 $t=e3d7677ff411238e7a42355a1a7ad9f00d9f1444 @p b37fe95bb0b1442d16764feed887f45f0f7e234d/0x10 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95/0x32 1217s git-debrebase = VanillaMerge {"Parents" => [{"Ix" => 0,"CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","Differs" => 16,"IsOrigin" => "","IsDgitImport" => undef},{"IsOrigin" => "","IsDgitImport" => undef,"CommitId" => "1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95","Differs" => 50,"Ix" => 1}],"Hdr" => "tree e3d7677ff411238e7a42355a1a7ad9f00d9f1444\nparent b37fe95bb0b1442d16764feed887f45f0f7e234d\nparent 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Merge branch 'other'\n","Tree" => "e3d7677ff411238e7a42355a1a7ad9f00d9f1444","CommitId" => "61940977161de483ed57077e9c1a7c3c9758b794","Type" => "VanillaMerge"} 1217s git-debrebase *** MERGE 1217s git-debrebase mwrecknote vanilla-merge 61940977161de483ed57077e9c1a7c3c9758b794 1217s git-debrebase *** WALK b37fe95bb0b1442d16764feed887f45f0f7e234d 0 - 1217s git-debrebase get_differs f56efc03310335c2ac5ce92426d06b9285521dc5 b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 = 0x2 1217s git-debrebase classify b37fe95bb0b1442d16764feed887f45f0f7e234d $t=b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 @p f56efc03310335c2ac5ce92426d06b9285521dc5/0x2 1217s git-debrebase = Upstream {"Hdr" => "tree b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9\nparent f56efc03310335c2ac5ce92426d06b9285521dc5\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "f56efc03310335c2ac5ce92426d06b9285521dc5","Ix" => 0}]} 1217s git-debrebase get_differs df6bd9a4a00482c1b1ff20f46460c55f82040227 b572e0b33b388437b34057c7e203744c52d82138 = 0x2 1217s git-debrebase classify f56efc03310335c2ac5ce92426d06b9285521dc5 $t=b572e0b33b388437b34057c7e203744c52d82138 @p df6bd9a4a00482c1b1ff20f46460c55f82040227/0x2 1217s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "df6bd9a4a00482c1b1ff20f46460c55f82040227","Ix" => 0}],"Type" => "Upstream","CommitId" => "f56efc03310335c2ac5ce92426d06b9285521dc5","Tree" => "b572e0b33b388437b34057c7e203744c52d82138","Msg" => "UPSTREAM edit src.c (before)\n","Hdr" => "tree b572e0b33b388437b34057c7e203744c52d82138\nparent df6bd9a4a00482c1b1ff20f46460c55f82040227\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1217s git-debrebase get_differs 7ecce5149f80ae53a4fdab476b04947659f39765 c26f8635f5a3d239ca949aa666feee09ab57e882 = 0x2 1217s git-debrebase classify df6bd9a4a00482c1b1ff20f46460c55f82040227 $t=c26f8635f5a3d239ca949aa666feee09ab57e882 @p 7ecce5149f80ae53a4fdab476b04947659f39765/0x2 1217s git-debrebase = Upstream {"Hdr" => "tree c26f8635f5a3d239ca949aa666feee09ab57e882\nparent 7ecce5149f80ae53a4fdab476b04947659f39765\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "c26f8635f5a3d239ca949aa666feee09ab57e882","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "df6bd9a4a00482c1b1ff20f46460c55f82040227","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "7ecce5149f80ae53a4fdab476b04947659f39765","Differs" => 2}]} 1217s git-debrebase get_differs 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 = 0x2 1217s git-debrebase classify 7ecce5149f80ae53a4fdab476b04947659f39765 $t=2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 @p 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450/0x2 1217s git-debrebase = Upstream {"CommitId" => "7ecce5149f80ae53a4fdab476b04947659f39765","Type" => "Upstream","Hdr" => "tree 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6\nparent 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450","Ix" => 0}]} 1217s git-debrebase get_differs 9d77794ea8eca3fa78b8ee406128836771c7195f ced8034e4d13234deefc682b3523b0a9657f4e2a = 0x2 1217s git-debrebase classify 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 $t=ced8034e4d13234deefc682b3523b0a9657f4e2a @p 9d77794ea8eca3fa78b8ee406128836771c7195f/0x2 1217s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450","Tree" => "ced8034e4d13234deefc682b3523b0a9657f4e2a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree ced8034e4d13234deefc682b3523b0a9657f4e2a\nparent 9d77794ea8eca3fa78b8ee406128836771c7195f\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Differs" => 2}]} 1217s git-debrebase get_differs a7a1ce7990fecc564e8a5fa13896686b4a962d1c 9d383022823105715207a03601780dbceeb8ee4d = 0x10 1217s git-debrebase classify 9d77794ea8eca3fa78b8ee406128836771c7195f $t=9d383022823105715207a03601780dbceeb8ee4d @p a7a1ce7990fecc564e8a5fa13896686b4a962d1c/0x10 1217s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent a7a1ce7990fecc564e8a5fa13896686b4a962d1c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c"}]} 1217s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 1217s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 1217s git-debrebase classify a7a1ce7990fecc564e8a5fa13896686b4a962d1c $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1217s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 2,"Ix" => 0},{"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Differs" => 48,"Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c"} 1217s git-debrebase *** WALK prep done cur=a7a1ce7990fecc564e8a5fa13896686b4a962d1c brw 0 upp 4 proc 6 pm -1 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1217s git-debrebase WALK REBUILD a7a1ce7990fecc564e8a5fa13896686b4a962d1c 7 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1217s git-debrebase WALK BUILD 9d77794ea8eca3fa78b8ee406128836771c7195f Debian (rewriting=0) 1217s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1217s git-debrebase WALK BUILD 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD 7ecce5149f80ae53a4fdab476b04947659f39765 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD df6bd9a4a00482c1b1ff20f46460c55f82040227 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD f56efc03310335c2ac5ce92426d06b9285521dc5 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD b37fe95bb0b1442d16764feed887f45f0f7e234d Upstream (rewriting=0) 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1217s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d b37fe95bb0b1442d16764feed887f45f0f7e234d = 0 1217s git-debrebase *** WALK RETURN b37fe95bb0b1442d16764feed887f45f0f7e234d 9d77794ea8eca3fa78b8ee406128836771c7195f a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1217s git-debrebase mwrecknote left-input b37fe95bb0b1442d16764feed887f45f0f7e234d 1217s git-debrebase mwrecknote left-laundered b37fe95bb0b1442d16764feed887f45f0f7e234d 1217s git-debrebase mwrecknote left-breakwater 9d77794ea8eca3fa78b8ee406128836771c7195f 1217s git-debrebase mwrecknote left-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1217s git-debrebase MERGE BA best=a7a1ce7990fecc564e8a5fa13896686b4a962d1c p=a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1217s git-debrebase *** WALK 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 0 - 1217s git-debrebase get_differs 56e4ef781b7b953790f90cf2bccb1a982b69a419 95a2c5ea49e78a04f515012e1c38d8edfaf2acc7 = 0x2 1217s git-debrebase classify 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 $t=95a2c5ea49e78a04f515012e1c38d8edfaf2acc7 @p 56e4ef781b7b953790f90cf2bccb1a982b69a419/0x2 1217s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "56e4ef781b7b953790f90cf2bccb1a982b69a419"}],"CommitId" => "1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95","Type" => "Upstream","Hdr" => "tree 95a2c5ea49e78a04f515012e1c38d8edfaf2acc7\nparent 56e4ef781b7b953790f90cf2bccb1a982b69a419\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000007 +0100\n","Tree" => "95a2c5ea49e78a04f515012e1c38d8edfaf2acc7","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1217s git-debrebase get_differs 1f0cec65cf776f0df1e962c06d5c452d7104e079 d9f07db37512afdd980697af61b0e4f454bc466c = 0x2 1217s git-debrebase classify 56e4ef781b7b953790f90cf2bccb1a982b69a419 $t=d9f07db37512afdd980697af61b0e4f454bc466c @p 1f0cec65cf776f0df1e962c06d5c452d7104e079/0x2 1217s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "56e4ef781b7b953790f90cf2bccb1a982b69a419","Msg" => "UPSTREAM edit src-other.c (other)\n","Tree" => "d9f07db37512afdd980697af61b0e4f454bc466c","Hdr" => "tree d9f07db37512afdd980697af61b0e4f454bc466c\nparent 1f0cec65cf776f0df1e962c06d5c452d7104e079\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000007 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1f0cec65cf776f0df1e962c06d5c452d7104e079"}]} 1217s git-debrebase get_differs 62faff455800380306716b2f81d2d81bd5209028 fb0d48b7be876925f9f3a5c53cca6c53d8f161fd = 0x2 1217s git-debrebase classify 1f0cec65cf776f0df1e962c06d5c452d7104e079 $t=fb0d48b7be876925f9f3a5c53cca6c53d8f161fd @p 62faff455800380306716b2f81d2d81bd5209028/0x2 1217s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "1f0cec65cf776f0df1e962c06d5c452d7104e079","Tree" => "fb0d48b7be876925f9f3a5c53cca6c53d8f161fd","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree fb0d48b7be876925f9f3a5c53cca6c53d8f161fd\nparent 62faff455800380306716b2f81d2d81bd5209028\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000007 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "62faff455800380306716b2f81d2d81bd5209028","Ix" => 0}]} 1217s git-debrebase get_differs e08abf31881e74ac0a67c0ee90a0f7475367414e 62e2a8fcc9572dc72790d67be9c753469f57babe = 0x2 1217s git-debrebase classify 62faff455800380306716b2f81d2d81bd5209028 $t=62e2a8fcc9572dc72790d67be9c753469f57babe @p e08abf31881e74ac0a67c0ee90a0f7475367414e/0x2 1217s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "e08abf31881e74ac0a67c0ee90a0f7475367414e","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "62e2a8fcc9572dc72790d67be9c753469f57babe","Hdr" => "tree 62e2a8fcc9572dc72790d67be9c753469f57babe\nparent e08abf31881e74ac0a67c0ee90a0f7475367414e\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000007 +0100\n","Type" => "Upstream","CommitId" => "62faff455800380306716b2f81d2d81bd5209028"} 1217s git-debrebase get_differs b74ddd85a2342a18a0f96ee18ef2f0d535c17358 5f989474269c5f9f85e50eb863557e4acc9931f6 = 0x2 1217s git-debrebase classify e08abf31881e74ac0a67c0ee90a0f7475367414e $t=5f989474269c5f9f85e50eb863557e4acc9931f6 @p b74ddd85a2342a18a0f96ee18ef2f0d535c17358/0x2 1217s git-debrebase = Upstream {"CommitId" => "e08abf31881e74ac0a67c0ee90a0f7475367414e","Type" => "Upstream","Hdr" => "tree 5f989474269c5f9f85e50eb863557e4acc9931f6\nparent b74ddd85a2342a18a0f96ee18ef2f0d535c17358\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000007 +0100\n","Tree" => "5f989474269c5f9f85e50eb863557e4acc9931f6","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"CommitId" => "b74ddd85a2342a18a0f96ee18ef2f0d535c17358","Ix" => 0}]} 1217s git-debrebase get_differs 05befb8748c8e9a4f5d508bb9ce677d63c5ca8a8 b386504eb760ec772dfb42e6c16ccaa06a934c8a = 0x2 1217s git-debrebase classify b74ddd85a2342a18a0f96ee18ef2f0d535c17358 $t=b386504eb760ec772dfb42e6c16ccaa06a934c8a @p 05befb8748c8e9a4f5d508bb9ce677d63c5ca8a8/0x2 1217s git-debrebase = Upstream {"CommitId" => "b74ddd85a2342a18a0f96ee18ef2f0d535c17358","Type" => "Upstream","Hdr" => "tree b386504eb760ec772dfb42e6c16ccaa06a934c8a\nparent 05befb8748c8e9a4f5d508bb9ce677d63c5ca8a8\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000007 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "b386504eb760ec772dfb42e6c16ccaa06a934c8a","Parents" => [{"Differs" => 2,"CommitId" => "05befb8748c8e9a4f5d508bb9ce677d63c5ca8a8","Ix" => 0}]} 1217s git-debrebase get_differs 493d39b810763cd01dc910eb870ae5bffd360657 9fa84e41ba2d36ad31b92535699efbaf230d6473 = 0x2 1217s git-debrebase classify 05befb8748c8e9a4f5d508bb9ce677d63c5ca8a8 $t=9fa84e41ba2d36ad31b92535699efbaf230d6473 @p 493d39b810763cd01dc910eb870ae5bffd360657/0x2 1217s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "493d39b810763cd01dc910eb870ae5bffd360657","Ix" => 0}],"CommitId" => "05befb8748c8e9a4f5d508bb9ce677d63c5ca8a8","Type" => "Upstream","Hdr" => "tree 9fa84e41ba2d36ad31b92535699efbaf230d6473\nparent 493d39b810763cd01dc910eb870ae5bffd360657\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000007 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "9fa84e41ba2d36ad31b92535699efbaf230d6473"} 1217s git-debrebase get_differs ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2 aaadb3ecf5045ef6aba52a0fa4dfaad403c070b7 = 0x10 1217s git-debrebase classify 493d39b810763cd01dc910eb870ae5bffd360657 $t=aaadb3ecf5045ef6aba52a0fa4dfaad403c070b7 @p ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2/0x10 1217s git-debrebase = Changelog {"Hdr" => "tree aaadb3ecf5045ef6aba52a0fa4dfaad403c070b7\nparent ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000007 +0100\n","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Tree" => "aaadb3ecf5045ef6aba52a0fa4dfaad403c070b7","CommitId" => "493d39b810763cd01dc910eb870ae5bffd360657","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2","Differs" => 16}]} 1217s git-debrebase get_differs e13f36f87e6898b57c7a47fe7cd64bd151f8d26c 16ac2b48a5dfedd4cb3f6474f5b1431ae61aa9a2 = 0x2 1217s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 16ac2b48a5dfedd4cb3f6474f5b1431ae61aa9a2 = 0x30 1217s git-debrebase classify ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2 $t=16ac2b48a5dfedd4cb3f6474f5b1431ae61aa9a2 @p e13f36f87e6898b57c7a47fe7cd64bd151f8d26c/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1217s git-debrebase = Anchor {"CommitId" => "ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2","OrigParents" => [{"Differs" => 48,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Ix" => 1}],"Type" => "Anchor","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "16ac2b48a5dfedd4cb3f6474f5b1431ae61aa9a2","Hdr" => "tree 16ac2b48a5dfedd4cb3f6474f5b1431ae61aa9a2\nparent e13f36f87e6898b57c7a47fe7cd64bd151f8d26c\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000007 +0100\n","Parents" => [{"CommitId" => "e13f36f87e6898b57c7a47fe7cd64bd151f8d26c","Differs" => 2,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1217s git-debrebase *** WALK prep done cur=ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2 brw 0 upp 6 proc 8 pm -1 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1217s git-debrebase WALK REBUILD ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2 9 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1217s git-debrebase WALK BUILD 493d39b810763cd01dc910eb870ae5bffd360657 Debian (rewriting=0) 1217s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1217s git-debrebase WALK BUILD 05befb8748c8e9a4f5d508bb9ce677d63c5ca8a8 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD b74ddd85a2342a18a0f96ee18ef2f0d535c17358 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD e08abf31881e74ac0a67c0ee90a0f7475367414e Upstream (rewriting=0) 1217s git-debrebase WALK BUILD 62faff455800380306716b2f81d2d81bd5209028 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD 1f0cec65cf776f0df1e962c06d5c452d7104e079 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD 56e4ef781b7b953790f90cf2bccb1a982b69a419 Upstream (rewriting=0) 1217s git-debrebase WALK BUILD 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 Upstream (rewriting=0) 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1217s git-debrebase get_differs 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 = 0 1217s git-debrebase *** WALK RETURN 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 493d39b810763cd01dc910eb870ae5bffd360657 ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2 1217s git-debrebase mwrecknote right-input 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 1217s git-debrebase mwrecknote right-laundered 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 1217s git-debrebase mwrecknote right-breakwater 493d39b810763cd01dc910eb870ae5bffd360657 1217s git-debrebase mwrecknote right-anchor ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2 1217s git-debrebase MERGE BA best=a7a1ce7990fecc564e8a5fa13896686b4a962d1c p=ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2 1217s git-debrebase mwrecknote result-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1217s git-debrebase |> 38ee93726fb48a60962f8d01d367986becb682da commit refs/debrebase/wreckage/junk 1217s git-debrebase >= delete refs/debrebase/wreckage/junk 1217s git-debrebase >$ 1217s git-debrebase >= create refs/debrebase/wreckage/left-input b37fe95bb0b1442d16764feed887f45f0f7e234d 1217s git-debrebase >= create refs/debrebase/wreckage/right-input 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 1217s git-debrebase >= create refs/debrebase/wreckage/left-breakwater 9d77794ea8eca3fa78b8ee406128836771c7195f 1217s git-debrebase >= create refs/debrebase/wreckage/left-laundered b37fe95bb0b1442d16764feed887f45f0f7e234d 1217s git-debrebase >= create refs/debrebase/wreckage/result-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1217s git-debrebase >= create refs/debrebase/wreckage/vanilla-merge 61940977161de483ed57077e9c1a7c3c9758b794 1217s git-debrebase >= create refs/debrebase/wreckage/right-laundered 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 1217s git-debrebase >= create refs/debrebase/wreckage/right-breakwater 493d39b810763cd01dc910eb870ae5bffd360657 1217s git-debrebase >= create refs/debrebase/wreckage/right-anchor ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2 1217s git-debrebase >= create refs/debrebase/wreckage/left-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1217s git-debrebase >$ 1217s 1217s git-debrebase: Merge resolution failed: divergent anchors 1217s git-debrebase: Wreckage left in refs/debrebase/wreckage/*. 1217s git-debrebase: See git-debrebase(1) section FAILED MERGES for suggestions. 1217s + local 'ps=15 0' 1217s + set -o pipefail 1217s + case $ps in 1217s + t-grep-mpat 'F:divergent anchors' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1217s + local 'mpat=F:divergent anchors' 1217s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1217s + local grepper=fgrep 1217s + case "$mpat" in 1217s + case "$mpat" in 1217s + grepper=fgrep 1217s + mpat='divergent anchors' 1217s + fgrep -e 'divergent anchors' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1217s git-debrebase: Merge resolution failed: divergent anchors 1217s + wreckage-after 1217s ++ t-git-get-ref-exact refs/debrebase/wreckage/junk 1217s ++ local ref=refs/debrebase/wreckage/junk 1217s ++ case "$ref" in 1217s ++ git for-each-ref '--format=%(objectname)' '[r]efs/debrebase/wreckage/junk' 1217s + test '' = '' 1217s + git for-each-ref refs/debrebase/wreckage 1217s + egrep . 1217s a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/left-anchor 1217s 9d77794ea8eca3fa78b8ee406128836771c7195f commit refs/debrebase/wreckage/left-breakwater 1217s b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-input 1217s b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-laundered 1217s a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/result-anchor 1217s ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2 commit refs/debrebase/wreckage/right-anchor 1217s 493d39b810763cd01dc910eb870ae5bffd360657 commit refs/debrebase/wreckage/right-breakwater 1217s 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 commit refs/debrebase/wreckage/right-input 1217s 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 commit refs/debrebase/wreckage/right-laundered 1217s 61940977161de483ed57077e9c1a7c3c9758b794 commit refs/debrebase/wreckage/vanilla-merge 1217s + : ===== late failure in apply ===== 1217s + git checkout other 1217s Switched to branch 'other' 1217s + git reset --hard other-before-new-upstream 1217s HEAD is now at 6ee89e4 MIXED add both(-other) (other) 1217s + echo other-upstream-confict 1217s + git commit -m other-upstream-conflict docs/README 1217s [other 70583c5] other-upstream-conflict 1217s 1 file changed, 1 insertion(+) 1217s + t-git-debrebase quick 1217s + local gdr=git-debrebase 1217s + : ' 1217s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1217s + git-debrebase --dgit=dgit -D --experimental-merge-resolution quick 1217s git-debrebase ffq_prev_branchinfo branch current refs/heads/other 1217s git-debrebase *** WALK 70583c556972d26ac1e0781b50507609e0ddf5d0 0 - 1217s git-debrebase get_differs 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 1217s git-debrebase classify 70583c556972d26ac1e0781b50507609e0ddf5d0 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca/0x2 1217s git-debrebase = Upstream {"Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","CommitId" => "70583c556972d26ac1e0781b50507609e0ddf5d0","Msg" => "other-upstream-conflict\n","Type" => "Upstream","Parents" => [{"CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca","Ix" => 0,"Differs" => 2}]} 1217s git-debrebase get_differs c49d2b2a9ad96cef20289702368179fbf9451928 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x22 1217s git-debrebase classify 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p c49d2b2a9ad96cef20289702368179fbf9451928/0x22 1217s git-debrebase = Mixed {"Parents" => [{"CommitId" => "c49d2b2a9ad96cef20289702368179fbf9451928","Differs" => 34,"Ix" => 0}],"Type" => "Mixed","Msg" => "MIXED add both(-other) (other)\n","CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent c49d2b2a9ad96cef20289702368179fbf9451928\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n"} 1217s git-debrebase get_differs 93fb9b858aa57847959deb395e6e7f54a29d8459 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 = 0x2 1217s git-debrebase classify c49d2b2a9ad96cef20289702368179fbf9451928 $t=6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 @p 93fb9b858aa57847959deb395e6e7f54a29d8459/0x2 1217s git-debrebase = Upstream {"Tree" => "6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3","CommitId" => "c49d2b2a9ad96cef20289702368179fbf9451928","Msg" => "UPSTREAM edit src-other.c (other)\n","Hdr" => "tree 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3\nparent 93fb9b858aa57847959deb395e6e7f54a29d8459\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "93fb9b858aa57847959deb395e6e7f54a29d8459","Differs" => 2,"Ix" => 0}]} 1217s git-debrebase get_differs ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 0b23db5d4cdb928c7302154a99ab0e961fcb877a = 0x20 1217s git-debrebase classify 93fb9b858aa57847959deb395e6e7f54a29d8459 $t=0b23db5d4cdb928c7302154a99ab0e961fcb877a @p ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6/0x20 1217s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6"}],"Hdr" => "tree 0b23db5d4cdb928c7302154a99ab0e961fcb877a\nparent ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Tree" => "0b23db5d4cdb928c7302154a99ab0e961fcb877a","CommitId" => "93fb9b858aa57847959deb395e6e7f54a29d8459","Msg" => "DEBIAN add zorkmid-other (other)\n"} 1217s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1217s git-debrebase get_differs b377a9960f3a99f617597d2203ab69805f4af3d1 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1217s git-debrebase classify ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5/0 b377a9960f3a99f617597d2203ab69805f4af3d1/0 1217s git-debrebase = Pseudomerge {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5"},{"Ix" => 1,"Differs" => 0,"CommitId" => "b377a9960f3a99f617597d2203ab69805f4af3d1"}],"SubType" => "Ambiguous","CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5\nparent b377a9960f3a99f617597d2203ab69805f4af3d1\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1217s git-debrebase get_differs 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 1217s git-debrebase classify 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a/0x2 1217s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a"}],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1217s git-debrebase get_differs 61838f71874d7ddb712bb3c25e0a0c91734bab47 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 1217s git-debrebase classify 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 61838f71874d7ddb712bb3c25e0a0c91734bab47/0x2 1217s git-debrebase = Upstream {"Parents" => [{"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 61838f71874d7ddb712bb3c25e0a0c91734bab47\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd"} 1217s git-debrebase get_differs cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 1217s git-debrebase classify 61838f71874d7ddb712bb3c25e0a0c91734bab47 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p cfa06dbc0f977f48e1449a0f11ee4106d8bf1269/0x2 1217s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269"}],"Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent cfa06dbc0f977f48e1449a0f11ee4106d8bf1269\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1217s git-debrebase get_differs 31cc003deb18794414e5604fc32fdd9819189100 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 1217s git-debrebase classify cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p 31cc003deb18794414e5604fc32fdd9819189100/0x2 1217s git-debrebase = Upstream {"Parents" => [{"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent 31cc003deb18794414e5604fc32fdd9819189100\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","CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c"} 1217s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 1217s git-debrebase classify 31cc003deb18794414e5604fc32fdd9819189100 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 1217s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 2,"Ix" => 0}],"Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1217s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1217s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1217s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"}],"Type" => "Packaging","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1217s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1217s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1217s git-debrebase = Packaging {"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Msg" => "DEBIAN add zorkmid (before)\n","Type" => "Packaging","Parents" => [{"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32,"Ix" => 0}]} 1217s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1217s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1217s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Ix" => 0,"Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Msg" => "dch -r -D unstable\n"} 1217s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1217s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1217s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}]} 1217s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1217s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1217s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1217s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0,"Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\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" => [$VAR1->{"Parents"}[1]]} 1217s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 6 upp 8 proc 16 pm 0 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1217s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 17 1217s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1217s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1217s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1217s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1217s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1217s git-debrebase WALK BUILD 93fb9b858aa57847959deb395e6e7f54a29d8459 Debian (rewriting=0) 1217s git-debrebase WALK REWRITING NOW cl=HASH(0x4b2b97dca0) procd=HASH(0x4b2bb1cba0) 1217s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1217s git-debrebase WALK BUILD 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca Debian (rewriting=1) 1217s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1217s git-debrebase WALK BUILD 31cc003deb18794414e5604fc32fdd9819189100 Upstream (rewriting=1) 1217s git-debrebase WALK BUILD cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 Upstream (rewriting=1) 1218s git-debrebase WALK BUILD 61838f71874d7ddb712bb3c25e0a0c91734bab47 Upstream (rewriting=1) 1218s git-debrebase WALK BUILD 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a Upstream (rewriting=1) 1218s git-debrebase WALK BUILD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 Upstream (rewriting=1) 1218s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1218s git-debrebase WALK BUILD c49d2b2a9ad96cef20289702368179fbf9451928 Upstream (rewriting=1) 1218s git-debrebase WALK BUILD 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca Upstream (rewriting=1) 1218s git-debrebase WALK BUILD 70583c556972d26ac1e0781b50507609e0ddf5d0 Upstream (rewriting=1) 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase get_differs a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 70583c556972d26ac1e0781b50507609e0ddf5d0 = 0 1218s git-debrebase *** WALK RETURN a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 247d69e2c498e57547983f4ac47559530666b403 48c55fcd6aad3671faeeedd232289eea48db8cce 1218s git-debrebase: laundered (head was 70583c556972d26ac1e0781b50507609e0ddf5d0) 1218s git-debrebase |> a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/left-anchor 1218s git-debrebase |> 9d77794ea8eca3fa78b8ee406128836771c7195f commit refs/debrebase/wreckage/left-breakwater 1218s git-debrebase |> b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-input 1218s git-debrebase |> b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-laundered 1218s git-debrebase |> a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/result-anchor 1218s git-debrebase |> ee19c9cc5da73b9c06097495d8277dbcd3f6d0c2 commit refs/debrebase/wreckage/right-anchor 1218s git-debrebase |> 493d39b810763cd01dc910eb870ae5bffd360657 commit refs/debrebase/wreckage/right-breakwater 1218s git-debrebase |> 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 commit refs/debrebase/wreckage/right-input 1218s git-debrebase |> 1476eca5d5ce8ff70892aa599b0d2fb32e4bfa95 commit refs/debrebase/wreckage/right-laundered 1218s git-debrebase |> 61940977161de483ed57077e9c1a7c3c9758b794 commit refs/debrebase/wreckage/vanilla-merge 1218s git-debrebase >= update HEAD a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 70583c556972d26ac1e0781b50507609e0ddf5d0 1218s git-debrebase >= delete refs/debrebase/wreckage/left-anchor 1218s git-debrebase >= delete refs/debrebase/wreckage/left-breakwater 1218s git-debrebase >= delete refs/debrebase/wreckage/left-input 1218s git-debrebase >= delete refs/debrebase/wreckage/left-laundered 1218s git-debrebase >= delete refs/debrebase/wreckage/result-anchor 1218s git-debrebase >= delete refs/debrebase/wreckage/right-anchor 1218s git-debrebase >= delete refs/debrebase/wreckage/right-breakwater 1218s git-debrebase >= delete refs/debrebase/wreckage/right-input 1218s git-debrebase >= delete refs/debrebase/wreckage/right-laundered 1218s git-debrebase >= delete refs/debrebase/wreckage/vanilla-merge 1218s git-debrebase >$ 1218s git-debrebase ffq_prev_branchinfo branch current refs/heads/other 1218s git-debrebase get_differs 06587090e7b2aa88e0fe178071070bbcf9bee291 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 1218s git-debrebase classify a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 06587090e7b2aa88e0fe178071070bbcf9bee291/0x2 1218s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "06587090e7b2aa88e0fe178071070bbcf9bee291","Differs" => 2,"Ix" => 0}],"Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 06587090e7b2aa88e0fe178071070bbcf9bee291\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","CommitId" => "a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e","Msg" => "other-upstream-conflict\n"} 1218s git-debrebase get_differs 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x2 1218s git-debrebase classify 06587090e7b2aa88e0fe178071070bbcf9bee291 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p 722aeaa8fd6da2d6bc6212577cf13ed31bee9721/0x2 1218s git-debrebase = Upstream {"Parents" => [{"CommitId" => "722aeaa8fd6da2d6bc6212577cf13ed31bee9721","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "06587090e7b2aa88e0fe178071070bbcf9bee291","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent 722aeaa8fd6da2d6bc6212577cf13ed31bee9721\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1218s git-debrebase get_differs 2b64ed03b736658302f8c07540cf5031956d5d1c 42e8d18d3457ca5a51861bc7222aeb912c254975 = 0x2 1218s git-debrebase classify 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 $t=42e8d18d3457ca5a51861bc7222aeb912c254975 @p 2b64ed03b736658302f8c07540cf5031956d5d1c/0x2 1218s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-other.c (other)\n","CommitId" => "722aeaa8fd6da2d6bc6212577cf13ed31bee9721","Tree" => "42e8d18d3457ca5a51861bc7222aeb912c254975","Hdr" => "tree 42e8d18d3457ca5a51861bc7222aeb912c254975\nparent 2b64ed03b736658302f8c07540cf5031956d5d1c\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "2b64ed03b736658302f8c07540cf5031956d5d1c"}],"Type" => "Upstream"} 1218s git-debrebase get_differs ab2b08ad554cddf9381bd5ad427c1086b496110e 303c71503c03080bda903ee6582757788559a305 = 0x2 1218s git-debrebase classify 2b64ed03b736658302f8c07540cf5031956d5d1c $t=303c71503c03080bda903ee6582757788559a305 @p ab2b08ad554cddf9381bd5ad427c1086b496110e/0x2 1218s git-debrebase = Upstream {"CommitId" => "2b64ed03b736658302f8c07540cf5031956d5d1c","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "303c71503c03080bda903ee6582757788559a305","Hdr" => "tree 303c71503c03080bda903ee6582757788559a305\nparent ab2b08ad554cddf9381bd5ad427c1086b496110e\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ab2b08ad554cddf9381bd5ad427c1086b496110e"}],"Type" => "Upstream"} 1218s git-debrebase get_differs cb272cd86f177289fa60b63dbaa569cf4722c90c af1d4b6b4512b3d286fe984aa34588e889c1ab24 = 0x2 1218s git-debrebase classify ab2b08ad554cddf9381bd5ad427c1086b496110e $t=af1d4b6b4512b3d286fe984aa34588e889c1ab24 @p cb272cd86f177289fa60b63dbaa569cf4722c90c/0x2 1218s git-debrebase = Upstream {"Tree" => "af1d4b6b4512b3d286fe984aa34588e889c1ab24","CommitId" => "ab2b08ad554cddf9381bd5ad427c1086b496110e","Msg" => "UPSTREAM edit src.c (before)\n","Hdr" => "tree af1d4b6b4512b3d286fe984aa34588e889c1ab24\nparent cb272cd86f177289fa60b63dbaa569cf4722c90c\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cb272cd86f177289fa60b63dbaa569cf4722c90c"}]} 1218s git-debrebase get_differs d5061809fd55315a08ab262231259720230ddc0b ab36d5c8cc32b63c9defc9547dd01c490ca95683 = 0x2 1218s git-debrebase classify cb272cd86f177289fa60b63dbaa569cf4722c90c $t=ab36d5c8cc32b63c9defc9547dd01c490ca95683 @p d5061809fd55315a08ab262231259720230ddc0b/0x2 1218s git-debrebase = Upstream {"Tree" => "ab36d5c8cc32b63c9defc9547dd01c490ca95683","CommitId" => "cb272cd86f177289fa60b63dbaa569cf4722c90c","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree ab36d5c8cc32b63c9defc9547dd01c490ca95683\nparent d5061809fd55315a08ab262231259720230ddc0b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "d5061809fd55315a08ab262231259720230ddc0b","Ix" => 0,"Differs" => 2}]} 1218s git-debrebase get_differs da5983ce3ff475b408b17b89e1975df4de601fad 464d5b09357dd0b145bbecc8ee74810993c6b39e = 0x2 1218s git-debrebase classify d5061809fd55315a08ab262231259720230ddc0b $t=464d5b09357dd0b145bbecc8ee74810993c6b39e @p da5983ce3ff475b408b17b89e1975df4de601fad/0x2 1218s git-debrebase = Upstream {"Hdr" => "tree 464d5b09357dd0b145bbecc8ee74810993c6b39e\nparent da5983ce3ff475b408b17b89e1975df4de601fad\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" => "d5061809fd55315a08ab262231259720230ddc0b","Tree" => "464d5b09357dd0b145bbecc8ee74810993c6b39e","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "da5983ce3ff475b408b17b89e1975df4de601fad"}],"Type" => "Upstream"} 1218s git-debrebase get_differs 247d69e2c498e57547983f4ac47559530666b403 8a6447a3fd229137f4a5385df6b80b9f96829b0b = 0x2 1218s git-debrebase classify da5983ce3ff475b408b17b89e1975df4de601fad $t=8a6447a3fd229137f4a5385df6b80b9f96829b0b @p 247d69e2c498e57547983f4ac47559530666b403/0x2 1218s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "247d69e2c498e57547983f4ac47559530666b403"}],"Tree" => "8a6447a3fd229137f4a5385df6b80b9f96829b0b","CommitId" => "da5983ce3ff475b408b17b89e1975df4de601fad","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 8a6447a3fd229137f4a5385df6b80b9f96829b0b\nparent 247d69e2c498e57547983f4ac47559530666b403\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n"} 1218s git-debrebase get_differs d2df4dc1f9d085dc7c84da339a37150425eedea7 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1218s git-debrebase classify 247d69e2c498e57547983f4ac47559530666b403 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p d2df4dc1f9d085dc7c84da339a37150425eedea7/0x20 1218s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Ix" => 0,"Differs" => 32}],"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent d2df4dc1f9d085dc7c84da339a37150425eedea7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1218s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1218s git-debrebase classify d2df4dc1f9d085dc7c84da339a37150425eedea7 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1218s git-debrebase = Packaging {"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Msg" => "DEBIAN add zorkmid-other (other)\n","CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Type" => "Packaging","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0,"Differs" => 32}]} 1218s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1218s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1218s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1218s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1218s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1218s git-debrebase = Packaging {"Parents" => [{"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Msg" => "DEBIAN add zorkmid (before)\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1218s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1218s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1218s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Ix" => 0,"Differs" => 16}],"Type" => "Changelog"} 1218s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1218s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1218s git-debrebase = Changelog {"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"Type" => "Changelog"} 1218s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1218s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1218s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1218s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0,"Differs" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\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" => [$VAR1->{"Parents"}[1]]} 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase >= delete refs/ffq-prev/heads/other 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca 1218s git-debrebase >= update refs/debrebase-last/heads/other 135f7e96337316f3887d7d4af0f44d83a3d08b8e 0000000000000000000000000000000000000000 1218s git-debrebase >= update HEAD 135f7e96337316f3887d7d4af0f44d83a3d08b8e a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 1218s git-debrebase >$ 1218s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1218s ' 1218s + no-wreckage 1218s + git for-each-ref refs/debrebase/wreckage 1218s + egrep . 1218s + : ----- make the merge ----- 1218s + git checkout master 1218s Switched to branch 'master' 1218s Your branch and 'origin/master' have diverged, 1218s and have 24 and 5 different commits each, respectively. 1218s (use "git pull" to merge the remote branch into yours) 1218s + git reset --hard master-before-merge 1218s HEAD is now at b37fe95 MIXED add both() (before) 1218s + t-merge-conflicted-stripping-conflict-markers other docs/README 1218s + local otherbranch=other 1218s + local file=docs/README 1218s + t-expect-fail 'F:Merge conflict in docs/README' git merge other 1218s + local 'mpat=F:Merge conflict in docs/README' 1218s + shift 1218s + set +o pipefail 1218s + LC_MESSAGES=C 1218s + LANGUAGE=C 1218s + git merge other 1218s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1218s Auto-merging docs/README 1218s CONFLICT (content): Merge conflict in docs/README 1218s Automatic merge failed; fix conflicts and then commit the result. 1218s + local 'ps=1 0' 1218s + set -o pipefail 1218s + case $ps in 1218s + t-grep-mpat 'F:Merge conflict in docs/README' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1218s + local 'mpat=F:Merge conflict in docs/README' 1218s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1218s + local grepper=fgrep 1218s + case "$mpat" in 1218s + case "$mpat" in 1218s + grepper=fgrep 1218s + mpat='Merge conflict in docs/README' 1218s + fgrep -e 'Merge conflict in docs/README' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1218s CONFLICT (content): Merge conflict in docs/README 1218s + perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' docs/README 1218s + git add docs/README 1218s + git commit --no-edit 1218s [master fa45d1a] Merge branch 'other' 1218s + t-git-debrebase stitch 1218s + local gdr=git-debrebase 1218s + : ' 1218s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1218s + git-debrebase --dgit=dgit -D --experimental-merge-resolution stitch 1218s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1218s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x22 1218s git-debrebase get_differs 135f7e96337316f3887d7d4af0f44d83a3d08b8e a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x12 1218s git-debrebase classify fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p b37fe95bb0b1442d16764feed887f45f0f7e234d/0x22 135f7e96337316f3887d7d4af0f44d83a3d08b8e/0x12 1218s git-debrebase = VanillaMerge {"Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","Parents" => [{"IsDgitImport" => undef,"Ix" => 0,"IsOrigin" => "","Differs" => 34,"CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d"},{"IsDgitImport" => undef,"Ix" => 1,"IsOrigin" => "","CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","Differs" => 18}],"Type" => "VanillaMerge","CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent b37fe95bb0b1442d16764feed887f45f0f7e234d\nparent 135f7e96337316f3887d7d4af0f44d83a3d08b8e\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345"} 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase >= delete refs/ffq-prev/heads/master ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 1218s git-debrebase >= update refs/debrebase-last/heads/master 64f3a6f001f9d164d170f660f8927b3e92ace3df 0000000000000000000000000000000000000000 1218s git-debrebase >= update HEAD 64f3a6f001f9d164d170f660f8927b3e92ace3df fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 1218s git-debrebase >$ 1218s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1218s ' 1218s + : ----- expect failure ----- 1218s + wreckage-before 1218s + junkref=refs/debrebase/wreckage/junk 1218s + git update-ref refs/debrebase/wreckage/junk v2.1 1218s + t-expect-fail F:docs/README t-git-debrebase 1218s + local mpat=F:docs/README 1218s + shift 1218s + set +o pipefail 1218s + LC_MESSAGES=C 1218s + LANGUAGE=C 1218s + t-git-debrebase 1218s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1218s + local gdr=git-debrebase 1218s + : ' 1218s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1218s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 1218s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1218s git-debrebase ffq check_specs * 1218s git-debrebase ffq merge master 1218s git-debrebase ffq check_remote origin remote fetch/merge branch 1218s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1218s OK, you are ahead of refs/remotes/origin/master 1218s git-debrebase ffq check_remote undef remote push branch 1218s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1218s git-debrebase *** WALK 64f3a6f001f9d164d170f660f8927b3e92ace3df 0 - 1218s git-debrebase get_differs fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0 1218s git-debrebase get_differs ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x32 1218s git-debrebase classify 64f3a6f001f9d164d170f660f8927b3e92ace3df $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7/0 ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6/0x32 1218s git-debrebase = Pseudomerge {"Overwritten" => [{"Ix" => 1,"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Differs" => 50}],"CommitId" => "64f3a6f001f9d164d170f660f8927b3e92ace3df","Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Parents" => [{"Ix" => 0,"CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7","Differs" => 0},$VAR1->{"Overwritten"}[0]],"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7\nparent ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Contributor" => $VAR1->{"Parents"}[0]} 1218s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x22 1218s git-debrebase get_differs 135f7e96337316f3887d7d4af0f44d83a3d08b8e a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x12 1218s git-debrebase classify fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p b37fe95bb0b1442d16764feed887f45f0f7e234d/0x22 135f7e96337316f3887d7d4af0f44d83a3d08b8e/0x12 1218s git-debrebase = VanillaMerge {"Type" => "VanillaMerge","CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","Parents" => [{"IsDgitImport" => undef,"Ix" => 0,"Differs" => 34,"CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","IsOrigin" => ""},{"Ix" => 1,"IsDgitImport" => undef,"CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","Differs" => 18,"IsOrigin" => ""}],"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent b37fe95bb0b1442d16764feed887f45f0f7e234d\nparent 135f7e96337316f3887d7d4af0f44d83a3d08b8e\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1218s git-debrebase *** MERGE 1218s git-debrebase mwrecknote vanilla-merge fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 1218s git-debrebase *** WALK b37fe95bb0b1442d16764feed887f45f0f7e234d 0 - 1218s git-debrebase get_differs f56efc03310335c2ac5ce92426d06b9285521dc5 b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 = 0x2 1218s git-debrebase classify b37fe95bb0b1442d16764feed887f45f0f7e234d $t=b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 @p f56efc03310335c2ac5ce92426d06b9285521dc5/0x2 1218s git-debrebase = Upstream {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "f56efc03310335c2ac5ce92426d06b9285521dc5","Ix" => 0}],"Tree" => "b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9","Hdr" => "tree b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9\nparent f56efc03310335c2ac5ce92426d06b9285521dc5\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d"} 1218s git-debrebase get_differs df6bd9a4a00482c1b1ff20f46460c55f82040227 b572e0b33b388437b34057c7e203744c52d82138 = 0x2 1218s git-debrebase classify f56efc03310335c2ac5ce92426d06b9285521dc5 $t=b572e0b33b388437b34057c7e203744c52d82138 @p df6bd9a4a00482c1b1ff20f46460c55f82040227/0x2 1218s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n","Parents" => [{"Differs" => 2,"CommitId" => "df6bd9a4a00482c1b1ff20f46460c55f82040227","Ix" => 0}],"Tree" => "b572e0b33b388437b34057c7e203744c52d82138","Hdr" => "tree b572e0b33b388437b34057c7e203744c52d82138\nparent df6bd9a4a00482c1b1ff20f46460c55f82040227\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","CommitId" => "f56efc03310335c2ac5ce92426d06b9285521dc5"} 1218s git-debrebase get_differs 7ecce5149f80ae53a4fdab476b04947659f39765 c26f8635f5a3d239ca949aa666feee09ab57e882 = 0x2 1218s git-debrebase classify df6bd9a4a00482c1b1ff20f46460c55f82040227 $t=c26f8635f5a3d239ca949aa666feee09ab57e882 @p 7ecce5149f80ae53a4fdab476b04947659f39765/0x2 1218s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "7ecce5149f80ae53a4fdab476b04947659f39765"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree c26f8635f5a3d239ca949aa666feee09ab57e882\nparent 7ecce5149f80ae53a4fdab476b04947659f39765\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "c26f8635f5a3d239ca949aa666feee09ab57e882","Type" => "Upstream","CommitId" => "df6bd9a4a00482c1b1ff20f46460c55f82040227"} 1218s git-debrebase get_differs 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 = 0x2 1218s git-debrebase classify 7ecce5149f80ae53a4fdab476b04947659f39765 $t=2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 @p 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450/0x2 1218s git-debrebase = Upstream {"Tree" => "2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6","Hdr" => "tree 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6\nparent 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450\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","Parents" => [{"Differs" => 2,"CommitId" => "7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450","Ix" => 0}],"CommitId" => "7ecce5149f80ae53a4fdab476b04947659f39765","Type" => "Upstream"} 1218s git-debrebase get_differs 9d77794ea8eca3fa78b8ee406128836771c7195f ced8034e4d13234deefc682b3523b0a9657f4e2a = 0x2 1218s git-debrebase classify 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 $t=ced8034e4d13234deefc682b3523b0a9657f4e2a @p 9d77794ea8eca3fa78b8ee406128836771c7195f/0x2 1218s 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" => "9d77794ea8eca3fa78b8ee406128836771c7195f"}],"Tree" => "ced8034e4d13234deefc682b3523b0a9657f4e2a","Hdr" => "tree ced8034e4d13234deefc682b3523b0a9657f4e2a\nparent 9d77794ea8eca3fa78b8ee406128836771c7195f\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","CommitId" => "7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450"} 1218s git-debrebase get_differs a7a1ce7990fecc564e8a5fa13896686b4a962d1c 9d383022823105715207a03601780dbceeb8ee4d = 0x10 1218s git-debrebase classify 9d77794ea8eca3fa78b8ee406128836771c7195f $t=9d383022823105715207a03601780dbceeb8ee4d @p a7a1ce7990fecc564e8a5fa13896686b4a962d1c/0x10 1218s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Differs" => 16,"Ix" => 0}],"Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent a7a1ce7990fecc564e8a5fa13896686b4a962d1c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1218s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 1218s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 1218s git-debrebase classify a7a1ce7990fecc564e8a5fa13896686b4a962d1c $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1218s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"Differs" => 48,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Ix" => 1}],"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Ix" => 0,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 2},$VAR1->{"OrigParents"}[0]],"Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1218s git-debrebase *** WALK prep done cur=a7a1ce7990fecc564e8a5fa13896686b4a962d1c brw 0 upp 4 proc 6 pm -1 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase WALK REBUILD a7a1ce7990fecc564e8a5fa13896686b4a962d1c 7 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1218s git-debrebase WALK BUILD 9d77794ea8eca3fa78b8ee406128836771c7195f Debian (rewriting=0) 1218s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1218s git-debrebase WALK BUILD 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 Upstream (rewriting=0) 1218s git-debrebase WALK BUILD 7ecce5149f80ae53a4fdab476b04947659f39765 Upstream (rewriting=0) 1218s git-debrebase WALK BUILD df6bd9a4a00482c1b1ff20f46460c55f82040227 Upstream (rewriting=0) 1218s git-debrebase WALK BUILD f56efc03310335c2ac5ce92426d06b9285521dc5 Upstream (rewriting=0) 1218s git-debrebase WALK BUILD b37fe95bb0b1442d16764feed887f45f0f7e234d Upstream (rewriting=0) 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d b37fe95bb0b1442d16764feed887f45f0f7e234d = 0 1218s git-debrebase *** WALK RETURN b37fe95bb0b1442d16764feed887f45f0f7e234d 9d77794ea8eca3fa78b8ee406128836771c7195f a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1218s git-debrebase mwrecknote left-input b37fe95bb0b1442d16764feed887f45f0f7e234d 1218s git-debrebase mwrecknote left-laundered b37fe95bb0b1442d16764feed887f45f0f7e234d 1218s git-debrebase mwrecknote left-breakwater 9d77794ea8eca3fa78b8ee406128836771c7195f 1218s git-debrebase mwrecknote left-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1218s git-debrebase MERGE BA best=a7a1ce7990fecc564e8a5fa13896686b4a962d1c p=a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1218s git-debrebase *** WALK 135f7e96337316f3887d7d4af0f44d83a3d08b8e 0 - 1218s git-debrebase get_differs a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0 1218s git-debrebase get_differs 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 1218s git-debrebase classify 135f7e96337316f3887d7d4af0f44d83a3d08b8e $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e/0 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca/0x2 1218s git-debrebase = Pseudomerge {"Parents" => [{"CommitId" => "a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e","Differs" => 0,"Ix" => 0},{"Ix" => 1,"Differs" => 2,"CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca"}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge","Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e\nparent 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Contributor" => $VAR1->{"Parents"}[0]} 1218s git-debrebase get_differs 06587090e7b2aa88e0fe178071070bbcf9bee291 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 1218s git-debrebase classify a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 06587090e7b2aa88e0fe178071070bbcf9bee291/0x2 1218s git-debrebase = Upstream {"CommitId" => "a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e","Type" => "Upstream","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 06587090e7b2aa88e0fe178071070bbcf9bee291\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "other-upstream-conflict\n","Parents" => [{"Differs" => 2,"CommitId" => "06587090e7b2aa88e0fe178071070bbcf9bee291","Ix" => 0}]} 1218s git-debrebase get_differs 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x2 1218s git-debrebase classify 06587090e7b2aa88e0fe178071070bbcf9bee291 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p 722aeaa8fd6da2d6bc6212577cf13ed31bee9721/0x2 1218s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "722aeaa8fd6da2d6bc6212577cf13ed31bee9721","Differs" => 2}],"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent 722aeaa8fd6da2d6bc6212577cf13ed31bee9721\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Type" => "Upstream","CommitId" => "06587090e7b2aa88e0fe178071070bbcf9bee291"} 1218s git-debrebase get_differs 2b64ed03b736658302f8c07540cf5031956d5d1c 42e8d18d3457ca5a51861bc7222aeb912c254975 = 0x2 1218s git-debrebase classify 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 $t=42e8d18d3457ca5a51861bc7222aeb912c254975 @p 2b64ed03b736658302f8c07540cf5031956d5d1c/0x2 1218s git-debrebase = Upstream {"Tree" => "42e8d18d3457ca5a51861bc7222aeb912c254975","Hdr" => "tree 42e8d18d3457ca5a51861bc7222aeb912c254975\nparent 2b64ed03b736658302f8c07540cf5031956d5d1c\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "UPSTREAM edit src-other.c (other)\n","Parents" => [{"Differs" => 2,"CommitId" => "2b64ed03b736658302f8c07540cf5031956d5d1c","Ix" => 0}],"CommitId" => "722aeaa8fd6da2d6bc6212577cf13ed31bee9721","Type" => "Upstream"} 1218s git-debrebase get_differs ab2b08ad554cddf9381bd5ad427c1086b496110e 303c71503c03080bda903ee6582757788559a305 = 0x2 1218s git-debrebase classify 2b64ed03b736658302f8c07540cf5031956d5d1c $t=303c71503c03080bda903ee6582757788559a305 @p ab2b08ad554cddf9381bd5ad427c1086b496110e/0x2 1218s git-debrebase = Upstream {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "ab2b08ad554cddf9381bd5ad427c1086b496110e","Differs" => 2,"Ix" => 0}],"Tree" => "303c71503c03080bda903ee6582757788559a305","Hdr" => "tree 303c71503c03080bda903ee6582757788559a305\nparent ab2b08ad554cddf9381bd5ad427c1086b496110e\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","CommitId" => "2b64ed03b736658302f8c07540cf5031956d5d1c"} 1218s git-debrebase get_differs cb272cd86f177289fa60b63dbaa569cf4722c90c af1d4b6b4512b3d286fe984aa34588e889c1ab24 = 0x2 1218s git-debrebase classify ab2b08ad554cddf9381bd5ad427c1086b496110e $t=af1d4b6b4512b3d286fe984aa34588e889c1ab24 @p cb272cd86f177289fa60b63dbaa569cf4722c90c/0x2 1218s git-debrebase = Upstream {"CommitId" => "ab2b08ad554cddf9381bd5ad427c1086b496110e","Type" => "Upstream","Hdr" => "tree af1d4b6b4512b3d286fe984aa34588e889c1ab24\nparent cb272cd86f177289fa60b63dbaa569cf4722c90c\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "af1d4b6b4512b3d286fe984aa34588e889c1ab24","Parents" => [{"Differs" => 2,"CommitId" => "cb272cd86f177289fa60b63dbaa569cf4722c90c","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (before)\n"} 1218s git-debrebase get_differs d5061809fd55315a08ab262231259720230ddc0b ab36d5c8cc32b63c9defc9547dd01c490ca95683 = 0x2 1218s git-debrebase classify cb272cd86f177289fa60b63dbaa569cf4722c90c $t=ab36d5c8cc32b63c9defc9547dd01c490ca95683 @p d5061809fd55315a08ab262231259720230ddc0b/0x2 1218s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "cb272cd86f177289fa60b63dbaa569cf4722c90c","Parents" => [{"Differs" => 2,"CommitId" => "d5061809fd55315a08ab262231259720230ddc0b","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree ab36d5c8cc32b63c9defc9547dd01c490ca95683\nparent d5061809fd55315a08ab262231259720230ddc0b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "ab36d5c8cc32b63c9defc9547dd01c490ca95683"} 1218s git-debrebase get_differs da5983ce3ff475b408b17b89e1975df4de601fad 464d5b09357dd0b145bbecc8ee74810993c6b39e = 0x2 1218s git-debrebase classify d5061809fd55315a08ab262231259720230ddc0b $t=464d5b09357dd0b145bbecc8ee74810993c6b39e @p da5983ce3ff475b408b17b89e1975df4de601fad/0x2 1218s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "d5061809fd55315a08ab262231259720230ddc0b","Parents" => [{"Ix" => 0,"CommitId" => "da5983ce3ff475b408b17b89e1975df4de601fad","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 464d5b09357dd0b145bbecc8ee74810993c6b39e\nparent da5983ce3ff475b408b17b89e1975df4de601fad\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "464d5b09357dd0b145bbecc8ee74810993c6b39e"} 1218s git-debrebase get_differs 247d69e2c498e57547983f4ac47559530666b403 8a6447a3fd229137f4a5385df6b80b9f96829b0b = 0x2 1218s git-debrebase classify da5983ce3ff475b408b17b89e1975df4de601fad $t=8a6447a3fd229137f4a5385df6b80b9f96829b0b @p 247d69e2c498e57547983f4ac47559530666b403/0x2 1218s git-debrebase = Upstream {"Hdr" => "tree 8a6447a3fd229137f4a5385df6b80b9f96829b0b\nparent 247d69e2c498e57547983f4ac47559530666b403\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "8a6447a3fd229137f4a5385df6b80b9f96829b0b","Parents" => [{"CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Differs" => 2,"Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "da5983ce3ff475b408b17b89e1975df4de601fad","Type" => "Upstream"} 1218s git-debrebase get_differs d2df4dc1f9d085dc7c84da339a37150425eedea7 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1218s git-debrebase classify 247d69e2c498e57547983f4ac47559530666b403 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p d2df4dc1f9d085dc7c84da339a37150425eedea7/0x20 1218s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Ix" => 0}],"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent d2df4dc1f9d085dc7c84da339a37150425eedea7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1218s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1218s git-debrebase classify d2df4dc1f9d085dc7c84da339a37150425eedea7 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1218s git-debrebase = Packaging {"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Type" => "Packaging","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid-other (other)\n"} 1218s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1218s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1218s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Parents" => [{"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 1218s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1218s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1218s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1218s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1218s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1218s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16,"Ix" => 0}],"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Type" => "Changelog"} 1218s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1218s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1218s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\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","Parents" => [{"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Ix" => 0}],"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Type" => "Changelog"} 1218s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1218s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1218s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1218s git-debrebase = Anchor {"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","OrigParents" => [{"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Ix" => 1}],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1218s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 5 upp 8 proc 16 pm 0 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 17 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1218s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1218s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1218s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1218s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1218s git-debrebase WALK BUILD d2df4dc1f9d085dc7c84da339a37150425eedea7 Debian (rewriting=0) 1218s git-debrebase WALK BUILD 247d69e2c498e57547983f4ac47559530666b403 Debian (rewriting=0) 1218s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1218s git-debrebase WALK BUILD da5983ce3ff475b408b17b89e1975df4de601fad Upstream (rewriting=0) 1218s git-debrebase WALK BUILD d5061809fd55315a08ab262231259720230ddc0b Upstream (rewriting=0) 1218s git-debrebase WALK BUILD cb272cd86f177289fa60b63dbaa569cf4722c90c Upstream (rewriting=0) 1218s git-debrebase WALK BUILD ab2b08ad554cddf9381bd5ad427c1086b496110e Upstream (rewriting=0) 1218s git-debrebase WALK BUILD 2b64ed03b736658302f8c07540cf5031956d5d1c Upstream (rewriting=0) 1218s git-debrebase WALK BUILD 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 Upstream (rewriting=0) 1218s git-debrebase WALK BUILD 06587090e7b2aa88e0fe178071070bbcf9bee291 Upstream (rewriting=0) 1218s git-debrebase WALK BUILD a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e Upstream (rewriting=0) 1218s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase get_differs a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 135f7e96337316f3887d7d4af0f44d83a3d08b8e = 0 1218s git-debrebase *** WALK RETURN a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 247d69e2c498e57547983f4ac47559530666b403 48c55fcd6aad3671faeeedd232289eea48db8cce 1218s git-debrebase mwrecknote right-input 135f7e96337316f3887d7d4af0f44d83a3d08b8e 1218s git-debrebase mwrecknote right-laundered a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 1218s git-debrebase mwrecknote right-breakwater 247d69e2c498e57547983f4ac47559530666b403 1218s git-debrebase mwrecknote right-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1218s git-debrebase MERGE BA best=a7a1ce7990fecc564e8a5fa13896686b4a962d1c p=48c55fcd6aad3671faeeedd232289eea48db8cce 1218s git-debrebase mwrecknote result-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1218s git-debrebase mwrecknote interchange-mbcand-ok-0 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1218s git-debrebase *** WALK 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 0 - 1218s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1218s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1218s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"} 1218s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1218s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1218s git-debrebase = Packaging {"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Type" => "Packaging","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0}]} 1218s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1218s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1218s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Parents" => [{"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Ix" => 0}],"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1218s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1218s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1218s git-debrebase = Changelog {"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\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","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}]} 1218s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1218s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1218s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1218s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48}],"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\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" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1218s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 3 upp -1 proc 4 pm -1 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 5 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1218s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1218s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1218s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1218s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1218s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 = 0 1218s git-debrebase *** WALK RETURN 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 48c55fcd6aad3671faeeedd232289eea48db8cce 1218s git-debrebase mwrecknote mergebase-laundered 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1218s git-debrebase mwrecknote mergebase-breakwater 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1218s git-debrebase mwrecknote mergebase-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1218s git-debrebase *** WALK prep done cur=fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 brw 0 upp 1 proc 2 pm 0 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase WALK REBUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 3 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1218s git-debrebase WALK BUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 MergeCreateMergedBreakwaters (rewriting=0) 1218s Found a general merge, will try to tidy it up. 1218s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1218s git-debrebase WALK BUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 MergeMergeSeries (rewriting=1) 1218s git-debrebase >(no reflog) 1218s Running merge resolution for fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7... 1218s git-debrebase mwrecknote new-base 22b123696189139d3f8c13fd184084505d435471 1218s git-debrebase merge_series newbase=22b123696189139d3f8c13fd184084505d435471 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1218s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1218s git-debrebase gbp_pq_export p-base 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1218s git-debrebase merge_series pec d6c9f90711cc4ca0f8fcd3be0e85489a2a84fcc0 pec' 29cd144e0ff448f3434711ecbfd9056d754fc4aa 1218s git-debrebase mwrecknote mergebase-patchqueue 29cd144e0ff448f3434711ecbfd9056d754fc4aa 1218s git-debrebase gbp_pq_export p-1 247d69e2c498e57547983f4ac47559530666b403 a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 1219s git-debrebase merge_series pec dadd8b9ca2bdcc6c98fc63fdc589c75ae0e1d905 pec' 6577a293562429dbf61ac6d02c4a6124e13c8402 1219s git-debrebase mwrecknote right-patchqueue 6577a293562429dbf61ac6d02c4a6124e13c8402 1219s git-debrebase gbp_pq_export p-0 9d77794ea8eca3fa78b8ee406128836771c7195f b37fe95bb0b1442d16764feed887f45f0f7e234d 1219s git-debrebase merge_series pec 93be20878e0234e9dfa59ac95912e0962d0ff2f0 pec' a9738332ccab240ed5754572526f03d01974ec1b 1219s git-debrebase mwrecknote left-patchqueue a9738332ccab240ed5754572526f03d01974ec1b 1219s git-debrebase merge_series merging... 1219s git-debrebase merge_series merge ok, series... 1219s git-debrebase merge_series patch 0001-Add-a-new-upstream-file.patch keep 1219s merge_series patch 0002-Edit-the-.c-file.patch keep 1219s merge_series prereq 0002-Edit-the-.c-file.patch -> 0001-Add-a-new-upstream-file.patch keep 1219s merge_series patch 0004-UPSTREAM-edit-src.c-before.patch keep 1219s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0001-Add-a-new-upstream-file.patch keep 1219s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0002-Edit-the-.c-file.patch keep 1219s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> subdir/addnewups keep 1219s merge_series patch 0005-MIXED-add-both-before.patch keep 1219s merge_series prereq 0005-MIXED-add-both-before.patch -> 0001-Add-a-new-upstream-file.patch keep 1219s merge_series prereq 0005-MIXED-add-both-before.patch -> 0002-Edit-the-.c-file.patch keep 1219s merge_series prereq 0005-MIXED-add-both-before.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1219s merge_series prereq 0005-MIXED-add-both-before.patch -> subdir/addnewups keep 1219s merge_series patch 0006-UPSTREAM-edit-src-other.c-other.patch keep 1219s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0001-Add-a-new-upstream-file.patch keep 1219s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0002-Edit-the-.c-file.patch keep 1219s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1219s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0005-MIXED-add-both-before.patch keep 1219s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> subdir/addnewups keep 1219s merge_series patch 0007-MIXED-add-both-other-other.patch keep 1219s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0001-Add-a-new-upstream-file.patch keep 1219s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0002-Edit-the-.c-file.patch keep 1219s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1219s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0005-MIXED-add-both-before.patch keep 1219s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 1219s merge_series prereq 0007-MIXED-add-both-other-other.patch -> subdir/addnewups keep 1219s merge_series patch 0008-other-upstream-conflict.patch keep 1219s merge_series prereq 0008-other-upstream-conflict.patch -> 0001-Add-a-new-upstream-file.patch keep 1219s merge_series prereq 0008-other-upstream-conflict.patch -> 0002-Edit-the-.c-file.patch keep 1219s merge_series prereq 0008-other-upstream-conflict.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1219s merge_series prereq 0008-other-upstream-conflict.patch -> 0005-MIXED-add-both-before.patch keep 1219s merge_series prereq 0008-other-upstream-conflict.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 1219s merge_series prereq 0008-other-upstream-conflict.patch -> 0007-MIXED-add-both-other-other.patch keep 1219s merge_series prereq 0008-other-upstream-conflict.patch -> subdir/addnewups keep 1219s merge_series patch subdir/addnewups keep 1219s merge_series prereq subdir/addnewups -> 0001-Add-a-new-upstream-file.patch keep 1219s merge_series prereq subdir/addnewups -> 0002-Edit-the-.c-file.patch keep 1219s merge_series series next 0001-Add-a-new-upstream-file.patch 1219s git-debrebase merge_series series next 0002-Edit-the-.c-file.patch 1219s git-debrebase merge_series series next subdir/addnewups 1219s git-debrebase merge_series series next 0004-UPSTREAM-edit-src.c-before.patch 1219s git-debrebase merge_series series next 0005-MIXED-add-both-before.patch 1219s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-other.c-other.patch 1219s git-debrebase merge_series series next 0007-MIXED-add-both-other-other.patch 1219s git-debrebase merge_series series next 0008-other-upstream-conflict.patch 1219s git-debrebase mwrecknote merged-patchqueue b4310a884a38ef6aa895034fde6edac63cebc707 1219s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1219s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1219s git-debrebase merge_series series gbp pq import 1219s gbp:info: Trying to apply patches at 'b4310a884a38ef6aa895034fde6edac63cebc707' 1219s gbp:warning: Patch 0008-other-upstream-conflict.patch failed to apply, retrying with whitespace fixup 1219s gbp:error: Failed to apply '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge/debian/patches/0008-other-upstream-conflict.patch': Error running git apply: error: patch failed: docs/README:1 1219s error: docs/README: patch does not apply 1219s gbp:error: Couldn't apply patches 1219s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1219s git-debrebase |> 38ee93726fb48a60962f8d01d367986becb682da commit refs/debrebase/wreckage/junk 1219s git-debrebase >= delete refs/debrebase/wreckage/junk 1219s git-debrebase >$ 1219s git-debrebase >= create refs/debrebase/wreckage/mergebase-laundered 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1219s git-debrebase >= create refs/debrebase/wreckage/right-patchqueue 6577a293562429dbf61ac6d02c4a6124e13c8402 1219s git-debrebase >= create refs/debrebase/wreckage/new-base 22b123696189139d3f8c13fd184084505d435471 1219s git-debrebase >= create refs/debrebase/wreckage/left-input b37fe95bb0b1442d16764feed887f45f0f7e234d 1219s git-debrebase >= create refs/debrebase/wreckage/left-breakwater 9d77794ea8eca3fa78b8ee406128836771c7195f 1219s git-debrebase >= create refs/debrebase/wreckage/mergebase-breakwater 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1219s git-debrebase >= create refs/debrebase/wreckage/right-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1219s git-debrebase >= create refs/debrebase/wreckage/right-breakwater 247d69e2c498e57547983f4ac47559530666b403 1219s git-debrebase >= create refs/debrebase/wreckage/mergebase-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1219s git-debrebase >= create refs/debrebase/wreckage/right-input 135f7e96337316f3887d7d4af0f44d83a3d08b8e 1219s git-debrebase >= create refs/debrebase/wreckage/merged-patchqueue b4310a884a38ef6aa895034fde6edac63cebc707 1219s git-debrebase >= create refs/debrebase/wreckage/left-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1219s git-debrebase >= create refs/debrebase/wreckage/left-patchqueue a9738332ccab240ed5754572526f03d01974ec1b 1219s git-debrebase >= create refs/debrebase/wreckage/mergebase-patchqueue 29cd144e0ff448f3434711ecbfd9056d754fc4aa 1219s git-debrebase >= create refs/debrebase/wreckage/right-laundered a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 1219s git-debrebase >= create refs/debrebase/wreckage/left-laundered b37fe95bb0b1442d16764feed887f45f0f7e234d 1219s git-debrebase >= create refs/debrebase/wreckage/result-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1219s git-debrebase >= create refs/debrebase/wreckage/vanilla-merge fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 1219s git-debrebase >= create refs/debrebase/wreckage/interchange-mbcand-ok-0 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1219s git-debrebase >$ 1219s 1219s git-debrebase: Merge resolution failed: subprocess failed with error exit status 1 1219s git-debrebase: failed command: gbp pq import 1219s git-debrebase: Wreckage left in refs/debrebase/wreckage/*. 1219s git-debrebase: See git-debrebase(1) section FAILED MERGES for suggestions. 1219s + local 'ps=15 0' 1219s + set -o pipefail 1219s + case $ps in 1219s + t-grep-mpat F:docs/README /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1219s + local mpat=F:docs/README 1219s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1219s + local grepper=fgrep 1219s + case "$mpat" in 1219s + case "$mpat" in 1219s + grepper=fgrep 1219s + mpat=docs/README 1219s + fgrep -e docs/README /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1219s git-debrebase = VanillaMerge {"Type" => "VanillaMerge","CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","Parents" => [{"IsDgitImport" => undef,"Ix" => 0,"Differs" => 34,"CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","IsOrigin" => ""},{"Ix" => 1,"IsDgitImport" => undef,"CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","Differs" => 18,"IsOrigin" => ""}],"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent b37fe95bb0b1442d16764feed887f45f0f7e234d\nparent 135f7e96337316f3887d7d4af0f44d83a3d08b8e\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1219s gbp:error: Failed to apply '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge/debian/patches/0008-other-upstream-conflict.patch': Error running git apply: error: patch failed: docs/README:1 1219s error: docs/README: patch does not apply 1219s + wreckage-after 1219s ++ t-git-get-ref-exact refs/debrebase/wreckage/junk 1219s ++ local ref=refs/debrebase/wreckage/junk 1219s ++ case "$ref" in 1219s ++ git for-each-ref '--format=%(objectname)' '[r]efs/debrebase/wreckage/junk' 1219s + test '' = '' 1219s + git for-each-ref refs/debrebase/wreckage 1219s + egrep . 1219s 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/interchange-mbcand-ok-0 1219s a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/left-anchor 1219s 9d77794ea8eca3fa78b8ee406128836771c7195f commit refs/debrebase/wreckage/left-breakwater 1219s b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-input 1219s b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-laundered 1219s a9738332ccab240ed5754572526f03d01974ec1b commit refs/debrebase/wreckage/left-patchqueue 1219s 48c55fcd6aad3671faeeedd232289eea48db8cce commit refs/debrebase/wreckage/mergebase-anchor 1219s 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/mergebase-breakwater 1219s 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/mergebase-laundered 1219s 29cd144e0ff448f3434711ecbfd9056d754fc4aa commit refs/debrebase/wreckage/mergebase-patchqueue 1219s b4310a884a38ef6aa895034fde6edac63cebc707 commit refs/debrebase/wreckage/merged-patchqueue 1219s 22b123696189139d3f8c13fd184084505d435471 commit refs/debrebase/wreckage/new-base 1219s a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/result-anchor 1219s 48c55fcd6aad3671faeeedd232289eea48db8cce commit refs/debrebase/wreckage/right-anchor 1219s 247d69e2c498e57547983f4ac47559530666b403 commit refs/debrebase/wreckage/right-breakwater 1219s 135f7e96337316f3887d7d4af0f44d83a3d08b8e commit refs/debrebase/wreckage/right-input 1219s a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e commit refs/debrebase/wreckage/right-laundered 1219s 6577a293562429dbf61ac6d02c4a6124e13c8402 commit refs/debrebase/wreckage/right-patchqueue 1219s fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 commit refs/debrebase/wreckage/vanilla-merge 1219s + : ===== resolve the conflict ===== 1219s + : ----- badly ----- 1219s + quilt_faff_before 1 1219s + git checkout -b fix1 debrebase/wreckage/merged-patchqueue 1219s Switched to a new branch 'fix1' 1219s + QUILT_PATCHES=debian/patches 1219s + quilt push -a 1219s Applying patch debian/patches/0001-Add-a-new-upstream-file.patch 1219s patching file new-upstream-file 1219s 1219s Applying patch debian/patches/0002-Edit-the-.c-file.patch 1219s patching file src.c 1219s 1219s Applying patch debian/patches/subdir/addnewups 1219s patching file lib.c 1219s 1219s Applying patch debian/patches/0004-UPSTREAM-edit-src.c-before.patch 1219s patching file src.c 1219s 1219s Applying patch debian/patches/0005-MIXED-add-both-before.patch 1219s patching file src.c 1219s 1219s Applying patch debian/patches/0006-UPSTREAM-edit-src-other.c-other.patch 1219s patching file src-other.c 1219s 1219s Applying patch debian/patches/0007-MIXED-add-both-other-other.patch 1219s patching file src-other.c 1219s 1219s Applying patch debian/patches/0008-other-upstream-conflict.patch 1219s patching file docs/README 1219s Hunk #1 succeeded at 1 with fuzz 2. 1219s 1219s Now at patch debian/patches/0008-other-upstream-conflict.patch 1219s + quilt_faff_after 1219s + QUILT_PATCHES=debian/patches 1219s + quilt refresh 1219s Refreshed patch debian/patches/0008-other-upstream-conflict.patch 1219s + git add debian/patches 1219s + git commit -m FIX 1219s [fix1 4087ca8] FIX 1219s 1 file changed, 6 insertions(+), 5 deletions(-) 1219s + git reset --hard 1219s HEAD is now at 4087ca8 FIX 1219s + git clean -xdff 1219s Removing .pc/ 1219s Removing debian/patches/0008-other-upstream-conflict.patch~ 1219s Removing docs/README~ 1219s Removing lib.c 1219s Removing new-upstream-file 1219s Removing src-other.c 1219s + t-git-debrebase record-resolved-merge 1219s + local gdr=git-debrebase 1219s + : ' 1219s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1219s + git-debrebase --dgit=dgit -D --experimental-merge-resolution record-resolved-merge 1219s Checking how you have resolved the merge problem 1219s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1219s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1219s Seems to be vanilla-merge patchqueue. 1219s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1219s git-debrebase merge_series series gbp pq import 1220s gbp:info: Trying to apply patches at '4087ca8f6f46e0ad4028d88cbd20336902dfbac4' 1220s gbp:info: 8 patches listed in 'debian/patches/series' imported on 'patch-queue/mergec' 1220s git-debrebase merge_series series ok, building... 1220s git-debrebase merge_series series ok, building 937881101a4a6837fe8ed83636ac4f01eac0f09a 1220s git-debrebase merge_series series ok, building 08865a0a894859a3214a3bd62d5d4ee3d3b6bfa5 1220s git-debrebase merge_series series ok, building e56773201a173e107198ee0899b57916af9d96d8 1220s git-debrebase merge_series series ok, building a40ca03245a1256f18b8bdd71601fbbbcd1ce998 1220s git-debrebase merge_series series ok, building 2e89304ea350b74022584fbd307e58057164fc6c 1220s git-debrebase merge_series series ok, building af15286fc3e6d2561b3a1c3f0aed57056eb2c905 1220s git-debrebase merge_series series ok, building 19b9c51e3a9c289af06bc74c9d5b9127b9471d81 1220s git-debrebase merge_series series ok, building 61c3bdc2db6defe6675aa875c010b123b8c30568 1220s git-debrebase mwrecknote merged-result 2e2c77266a89e0c28b614bfcf937b2a4cc9f1a2c 1220s git-debrebase merge_series done debug=52970f6f2efbfe2dca2b1da97068e4f2931eb566 1220s git-debrebase mwrecknote merged-debug 52970f6f2efbfe2dca2b1da97068e4f2931eb566 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase merge_series returns 2e2c77266a89e0c28b614bfcf937b2a4cc9f1a2c 1220s OK. You can switch branches and try git-debrebase again. 1220s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1220s ' 1220s + git checkout master 1220s Switched to branch 'master' 1220s Your branch is ahead of 'origin/master' by 37 commits. 1220s (use "git push" to publish your local commits) 1220s + t-expect-fail 'E:upstream files are not the same' t-git-debrebase 1220s + local 'mpat=E:upstream files are not the same' 1220s + shift 1220s + set +o pipefail 1220s + LC_MESSAGES=C 1220s + LANGUAGE=C 1220s + t-git-debrebase 1220s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1220s + local gdr=git-debrebase 1220s + : ' 1220s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1220s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 1220s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1220s git-debrebase ffq check_specs * 1220s git-debrebase ffq merge master 1220s git-debrebase ffq check_remote origin remote fetch/merge branch 1220s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1220s OK, you are ahead of refs/remotes/origin/master 1220s git-debrebase ffq check_remote undef remote push branch 1220s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1220s git-debrebase *** WALK 64f3a6f001f9d164d170f660f8927b3e92ace3df 0 - 1220s git-debrebase get_differs fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0 1220s git-debrebase get_differs ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x32 1220s git-debrebase classify 64f3a6f001f9d164d170f660f8927b3e92ace3df $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7/0 ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6/0x32 1220s git-debrebase = Pseudomerge {"Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7\nparent ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Overwritten" => [{"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Ix" => 1,"Differs" => 50}],"Type" => "Pseudomerge","Contributor" => {"Differs" => 0,"Ix" => 0,"CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7"},"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"CommitId" => "64f3a6f001f9d164d170f660f8927b3e92ace3df","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n"} 1220s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x22 1220s git-debrebase get_differs 135f7e96337316f3887d7d4af0f44d83a3d08b8e a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x12 1220s git-debrebase classify fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p b37fe95bb0b1442d16764feed887f45f0f7e234d/0x22 135f7e96337316f3887d7d4af0f44d83a3d08b8e/0x12 1220s git-debrebase = VanillaMerge {"Parents" => [{"IsDgitImport" => undef,"IsOrigin" => "","Ix" => 0,"CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","Differs" => 34},{"Differs" => 18,"CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","Ix" => 1,"IsOrigin" => "","IsDgitImport" => undef}],"Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7","Type" => "VanillaMerge","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent b37fe95bb0b1442d16764feed887f45f0f7e234d\nparent 135f7e96337316f3887d7d4af0f44d83a3d08b8e\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1220s git-debrebase *** MERGE 1220s git-debrebase mwrecknote vanilla-merge fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 1220s git-debrebase *** WALK b37fe95bb0b1442d16764feed887f45f0f7e234d 0 - 1220s git-debrebase get_differs f56efc03310335c2ac5ce92426d06b9285521dc5 b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 = 0x2 1220s git-debrebase classify b37fe95bb0b1442d16764feed887f45f0f7e234d $t=b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 @p f56efc03310335c2ac5ce92426d06b9285521dc5/0x2 1220s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9\nparent f56efc03310335c2ac5ce92426d06b9285521dc5\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","Tree" => "b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9","CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","Parents" => [{"CommitId" => "f56efc03310335c2ac5ce92426d06b9285521dc5","Ix" => 0,"Differs" => 2}]} 1220s git-debrebase get_differs df6bd9a4a00482c1b1ff20f46460c55f82040227 b572e0b33b388437b34057c7e203744c52d82138 = 0x2 1220s git-debrebase classify f56efc03310335c2ac5ce92426d06b9285521dc5 $t=b572e0b33b388437b34057c7e203744c52d82138 @p df6bd9a4a00482c1b1ff20f46460c55f82040227/0x2 1220s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree b572e0b33b388437b34057c7e203744c52d82138\nparent df6bd9a4a00482c1b1ff20f46460c55f82040227\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "df6bd9a4a00482c1b1ff20f46460c55f82040227","Ix" => 0,"Differs" => 2}],"Tree" => "b572e0b33b388437b34057c7e203744c52d82138","Msg" => "UPSTREAM edit src.c (before)\n","CommitId" => "f56efc03310335c2ac5ce92426d06b9285521dc5"} 1220s git-debrebase get_differs 7ecce5149f80ae53a4fdab476b04947659f39765 c26f8635f5a3d239ca949aa666feee09ab57e882 = 0x2 1220s git-debrebase classify df6bd9a4a00482c1b1ff20f46460c55f82040227 $t=c26f8635f5a3d239ca949aa666feee09ab57e882 @p 7ecce5149f80ae53a4fdab476b04947659f39765/0x2 1220s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree c26f8635f5a3d239ca949aa666feee09ab57e882\nparent 7ecce5149f80ae53a4fdab476b04947659f39765\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "c26f8635f5a3d239ca949aa666feee09ab57e882","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "df6bd9a4a00482c1b1ff20f46460c55f82040227","Parents" => [{"Differs" => 2,"CommitId" => "7ecce5149f80ae53a4fdab476b04947659f39765","Ix" => 0}]} 1220s git-debrebase get_differs 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 = 0x2 1220s git-debrebase classify 7ecce5149f80ae53a4fdab476b04947659f39765 $t=2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 @p 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450/0x2 1220s git-debrebase = Upstream {"CommitId" => "7ecce5149f80ae53a4fdab476b04947659f39765","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6","Parents" => [{"Ix" => 0,"CommitId" => "7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450","Differs" => 2}],"Hdr" => "tree 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6\nparent 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream"} 1220s git-debrebase get_differs 9d77794ea8eca3fa78b8ee406128836771c7195f ced8034e4d13234deefc682b3523b0a9657f4e2a = 0x2 1220s git-debrebase classify 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 $t=ced8034e4d13234deefc682b3523b0a9657f4e2a @p 9d77794ea8eca3fa78b8ee406128836771c7195f/0x2 1220s git-debrebase = Upstream {"Hdr" => "tree ced8034e4d13234deefc682b3523b0a9657f4e2a\nparent 9d77794ea8eca3fa78b8ee406128836771c7195f\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f"}],"CommitId" => "7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450","Tree" => "ced8034e4d13234deefc682b3523b0a9657f4e2a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1220s git-debrebase get_differs a7a1ce7990fecc564e8a5fa13896686b4a962d1c 9d383022823105715207a03601780dbceeb8ee4d = 0x10 1220s git-debrebase classify 9d77794ea8eca3fa78b8ee406128836771c7195f $t=9d383022823105715207a03601780dbceeb8ee4d @p a7a1ce7990fecc564e8a5fa13896686b4a962d1c/0x10 1220s git-debrebase = Changelog {"Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent a7a1ce7990fecc564e8a5fa13896686b4a962d1c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Changelog","CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c"}]} 1220s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 1220s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 1220s git-debrebase classify a7a1ce7990fecc564e8a5fa13896686b4a962d1c $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1220s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Ix" => 1,"Differs" => 48}],"Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Anchor","CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]]} 1220s git-debrebase *** WALK prep done cur=a7a1ce7990fecc564e8a5fa13896686b4a962d1c brw 0 upp 4 proc 6 pm -1 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase WALK REBUILD a7a1ce7990fecc564e8a5fa13896686b4a962d1c 7 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1220s git-debrebase WALK BUILD 9d77794ea8eca3fa78b8ee406128836771c7195f Debian (rewriting=0) 1220s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1220s git-debrebase WALK BUILD 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 Upstream (rewriting=0) 1220s git-debrebase WALK BUILD 7ecce5149f80ae53a4fdab476b04947659f39765 Upstream (rewriting=0) 1220s git-debrebase WALK BUILD df6bd9a4a00482c1b1ff20f46460c55f82040227 Upstream (rewriting=0) 1220s git-debrebase WALK BUILD f56efc03310335c2ac5ce92426d06b9285521dc5 Upstream (rewriting=0) 1220s git-debrebase WALK BUILD b37fe95bb0b1442d16764feed887f45f0f7e234d Upstream (rewriting=0) 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d b37fe95bb0b1442d16764feed887f45f0f7e234d = 0 1220s git-debrebase *** WALK RETURN b37fe95bb0b1442d16764feed887f45f0f7e234d 9d77794ea8eca3fa78b8ee406128836771c7195f a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1220s git-debrebase mwrecknote left-input b37fe95bb0b1442d16764feed887f45f0f7e234d 1220s git-debrebase mwrecknote left-laundered b37fe95bb0b1442d16764feed887f45f0f7e234d 1220s git-debrebase mwrecknote left-breakwater 9d77794ea8eca3fa78b8ee406128836771c7195f 1220s git-debrebase mwrecknote left-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1220s git-debrebase MERGE BA best=a7a1ce7990fecc564e8a5fa13896686b4a962d1c p=a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1220s git-debrebase *** WALK 135f7e96337316f3887d7d4af0f44d83a3d08b8e 0 - 1220s git-debrebase get_differs a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0 1220s git-debrebase get_differs 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 1220s git-debrebase classify 135f7e96337316f3887d7d4af0f44d83a3d08b8e $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e/0 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca/0x2 1220s git-debrebase = Pseudomerge {"Parents" => [{"Ix" => 0,"CommitId" => "a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e","Differs" => 0},{"CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca","Ix" => 1,"Differs" => 2}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge","Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e\nparent 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Contributor" => $VAR1->{"Parents"}[0]} 1220s git-debrebase get_differs 06587090e7b2aa88e0fe178071070bbcf9bee291 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 1220s git-debrebase classify a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 06587090e7b2aa88e0fe178071070bbcf9bee291/0x2 1220s git-debrebase = Upstream {"Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 06587090e7b2aa88e0fe178071070bbcf9bee291\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","CommitId" => "a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e","Msg" => "other-upstream-conflict\n","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "06587090e7b2aa88e0fe178071070bbcf9bee291"}]} 1220s git-debrebase get_differs 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x2 1220s git-debrebase classify 06587090e7b2aa88e0fe178071070bbcf9bee291 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p 722aeaa8fd6da2d6bc6212577cf13ed31bee9721/0x2 1220s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent 722aeaa8fd6da2d6bc6212577cf13ed31bee9721\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","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","CommitId" => "06587090e7b2aa88e0fe178071070bbcf9bee291","Parents" => [{"Differs" => 2,"CommitId" => "722aeaa8fd6da2d6bc6212577cf13ed31bee9721","Ix" => 0}]} 1220s git-debrebase get_differs 2b64ed03b736658302f8c07540cf5031956d5d1c 42e8d18d3457ca5a51861bc7222aeb912c254975 = 0x2 1220s git-debrebase classify 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 $t=42e8d18d3457ca5a51861bc7222aeb912c254975 @p 2b64ed03b736658302f8c07540cf5031956d5d1c/0x2 1220s git-debrebase = Upstream {"Hdr" => "tree 42e8d18d3457ca5a51861bc7222aeb912c254975\nparent 2b64ed03b736658302f8c07540cf5031956d5d1c\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","CommitId" => "722aeaa8fd6da2d6bc6212577cf13ed31bee9721","Tree" => "42e8d18d3457ca5a51861bc7222aeb912c254975","Msg" => "UPSTREAM edit src-other.c (other)\n","Parents" => [{"Differs" => 2,"CommitId" => "2b64ed03b736658302f8c07540cf5031956d5d1c","Ix" => 0}]} 1220s git-debrebase get_differs ab2b08ad554cddf9381bd5ad427c1086b496110e 303c71503c03080bda903ee6582757788559a305 = 0x2 1220s git-debrebase classify 2b64ed03b736658302f8c07540cf5031956d5d1c $t=303c71503c03080bda903ee6582757788559a305 @p ab2b08ad554cddf9381bd5ad427c1086b496110e/0x2 1220s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ab2b08ad554cddf9381bd5ad427c1086b496110e"}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "303c71503c03080bda903ee6582757788559a305","CommitId" => "2b64ed03b736658302f8c07540cf5031956d5d1c","Type" => "Upstream","Hdr" => "tree 303c71503c03080bda903ee6582757788559a305\nparent ab2b08ad554cddf9381bd5ad427c1086b496110e\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1220s git-debrebase get_differs cb272cd86f177289fa60b63dbaa569cf4722c90c af1d4b6b4512b3d286fe984aa34588e889c1ab24 = 0x2 1220s git-debrebase classify ab2b08ad554cddf9381bd5ad427c1086b496110e $t=af1d4b6b4512b3d286fe984aa34588e889c1ab24 @p cb272cd86f177289fa60b63dbaa569cf4722c90c/0x2 1220s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree af1d4b6b4512b3d286fe984aa34588e889c1ab24\nparent cb272cd86f177289fa60b63dbaa569cf4722c90c\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "cb272cd86f177289fa60b63dbaa569cf4722c90c","Ix" => 0}],"Tree" => "af1d4b6b4512b3d286fe984aa34588e889c1ab24","Msg" => "UPSTREAM edit src.c (before)\n","CommitId" => "ab2b08ad554cddf9381bd5ad427c1086b496110e"} 1220s git-debrebase get_differs d5061809fd55315a08ab262231259720230ddc0b ab36d5c8cc32b63c9defc9547dd01c490ca95683 = 0x2 1220s git-debrebase classify cb272cd86f177289fa60b63dbaa569cf4722c90c $t=ab36d5c8cc32b63c9defc9547dd01c490ca95683 @p d5061809fd55315a08ab262231259720230ddc0b/0x2 1220s git-debrebase = Upstream {"CommitId" => "cb272cd86f177289fa60b63dbaa569cf4722c90c","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "ab36d5c8cc32b63c9defc9547dd01c490ca95683","Parents" => [{"Differs" => 2,"CommitId" => "d5061809fd55315a08ab262231259720230ddc0b","Ix" => 0}],"Hdr" => "tree ab36d5c8cc32b63c9defc9547dd01c490ca95683\nparent d5061809fd55315a08ab262231259720230ddc0b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream"} 1220s git-debrebase get_differs da5983ce3ff475b408b17b89e1975df4de601fad 464d5b09357dd0b145bbecc8ee74810993c6b39e = 0x2 1220s git-debrebase classify d5061809fd55315a08ab262231259720230ddc0b $t=464d5b09357dd0b145bbecc8ee74810993c6b39e @p da5983ce3ff475b408b17b89e1975df4de601fad/0x2 1220s git-debrebase = Upstream {"Hdr" => "tree 464d5b09357dd0b145bbecc8ee74810993c6b39e\nparent da5983ce3ff475b408b17b89e1975df4de601fad\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","CommitId" => "d5061809fd55315a08ab262231259720230ddc0b","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "464d5b09357dd0b145bbecc8ee74810993c6b39e","Parents" => [{"Differs" => 2,"CommitId" => "da5983ce3ff475b408b17b89e1975df4de601fad","Ix" => 0}]} 1220s git-debrebase get_differs 247d69e2c498e57547983f4ac47559530666b403 8a6447a3fd229137f4a5385df6b80b9f96829b0b = 0x2 1220s git-debrebase classify da5983ce3ff475b408b17b89e1975df4de601fad $t=8a6447a3fd229137f4a5385df6b80b9f96829b0b @p 247d69e2c498e57547983f4ac47559530666b403/0x2 1220s git-debrebase = Upstream {"Parents" => [{"CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Ix" => 0,"Differs" => 2}],"Tree" => "8a6447a3fd229137f4a5385df6b80b9f96829b0b","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "da5983ce3ff475b408b17b89e1975df4de601fad","Type" => "Upstream","Hdr" => "tree 8a6447a3fd229137f4a5385df6b80b9f96829b0b\nparent 247d69e2c498e57547983f4ac47559530666b403\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n"} 1220s git-debrebase get_differs d2df4dc1f9d085dc7c84da339a37150425eedea7 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1220s git-debrebase classify 247d69e2c498e57547983f4ac47559530666b403 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p d2df4dc1f9d085dc7c84da339a37150425eedea7/0x20 1220s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Ix" => 0}],"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Type" => "Packaging","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent d2df4dc1f9d085dc7c84da339a37150425eedea7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1220s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1220s git-debrebase classify d2df4dc1f9d085dc7c84da339a37150425eedea7 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1220s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Msg" => "DEBIAN add zorkmid-other (other)\n","CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Parents" => [{"Differs" => 32,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0}]} 1220s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1220s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1220s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1220s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1220s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1220s git-debrebase = Packaging {"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Msg" => "DEBIAN add zorkmid (before)\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"}]} 1220s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1220s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1220s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"}],"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1220s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1220s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1220s git-debrebase = Changelog {"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Ix" => 0,"Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog"} 1220s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1220s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1220s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1220s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16"},{"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1220s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 5 upp 8 proc 16 pm 0 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 17 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1220s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1220s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1220s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1220s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1220s git-debrebase WALK BUILD d2df4dc1f9d085dc7c84da339a37150425eedea7 Debian (rewriting=0) 1220s git-debrebase WALK BUILD 247d69e2c498e57547983f4ac47559530666b403 Debian (rewriting=0) 1220s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1220s git-debrebase WALK BUILD da5983ce3ff475b408b17b89e1975df4de601fad Upstream (rewriting=0) 1220s git-debrebase WALK BUILD d5061809fd55315a08ab262231259720230ddc0b Upstream (rewriting=0) 1220s git-debrebase WALK BUILD cb272cd86f177289fa60b63dbaa569cf4722c90c Upstream (rewriting=0) 1220s git-debrebase WALK BUILD ab2b08ad554cddf9381bd5ad427c1086b496110e Upstream (rewriting=0) 1220s git-debrebase WALK BUILD 2b64ed03b736658302f8c07540cf5031956d5d1c Upstream (rewriting=0) 1220s git-debrebase WALK BUILD 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 Upstream (rewriting=0) 1220s git-debrebase WALK BUILD 06587090e7b2aa88e0fe178071070bbcf9bee291 Upstream (rewriting=0) 1220s git-debrebase WALK BUILD a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e Upstream (rewriting=0) 1220s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase get_differs a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 135f7e96337316f3887d7d4af0f44d83a3d08b8e = 0 1220s git-debrebase *** WALK RETURN a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 247d69e2c498e57547983f4ac47559530666b403 48c55fcd6aad3671faeeedd232289eea48db8cce 1220s git-debrebase mwrecknote right-input 135f7e96337316f3887d7d4af0f44d83a3d08b8e 1220s git-debrebase mwrecknote right-laundered a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 1220s git-debrebase mwrecknote right-breakwater 247d69e2c498e57547983f4ac47559530666b403 1220s git-debrebase mwrecknote right-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1220s git-debrebase MERGE BA best=a7a1ce7990fecc564e8a5fa13896686b4a962d1c p=48c55fcd6aad3671faeeedd232289eea48db8cce 1220s git-debrebase mwrecknote result-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1220s git-debrebase mwrecknote interchange-mbcand-ok-0 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1220s git-debrebase *** WALK 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 0 - 1220s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1220s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1220s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Parents" => [{"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32}],"Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1220s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1220s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1220s git-debrebase = Packaging {"Parents" => [{"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid (before)\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1220s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1220s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1220s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"} 1220s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1220s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1220s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1220s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1220s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1220s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1220s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"} 1220s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 3 upp -1 proc 4 pm -1 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 5 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1220s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1220s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1220s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1220s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1220s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 = 0 1220s git-debrebase *** WALK RETURN 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 48c55fcd6aad3671faeeedd232289eea48db8cce 1220s git-debrebase mwrecknote mergebase-laundered 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1220s git-debrebase mwrecknote mergebase-breakwater 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1220s git-debrebase mwrecknote mergebase-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1220s git-debrebase *** WALK prep done cur=fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 brw 0 upp 1 proc 2 pm 0 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase WALK REBUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 3 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1220s git-debrebase WALK BUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 MergeCreateMergedBreakwaters (rewriting=0) 1220s Found a general merge, will try to tidy it up. 1220s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1220s git-debrebase WALK BUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 MergeMergeSeries (rewriting=1) 1220s Using supplied resolution for fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7... 1220s git-debrebase mwrecknote cached-resolution 2e2c77266a89e0c28b614bfcf937b2a4cc9f1a2c 1220s git-debrebase get_differs 2e2c77266a89e0c28b614bfcf937b2a4cc9f1a2c 64f3a6f001f9d164d170f660f8927b3e92ace3df = 0x2 1220s git-debrebase get_differs 2e2c77266a89e0c28b614bfcf937b2a4cc9f1a2c fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 = 0x2 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase |> 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/interchange-mbcand-ok-0 1220s git-debrebase |> a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/left-anchor 1220s git-debrebase |> 9d77794ea8eca3fa78b8ee406128836771c7195f commit refs/debrebase/wreckage/left-breakwater 1220s git-debrebase |> b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-input 1220s git-debrebase |> b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-laundered 1220s git-debrebase |> a9738332ccab240ed5754572526f03d01974ec1b commit refs/debrebase/wreckage/left-patchqueue 1220s git-debrebase |> 48c55fcd6aad3671faeeedd232289eea48db8cce commit refs/debrebase/wreckage/mergebase-anchor 1220s git-debrebase |> 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/mergebase-breakwater 1220s git-debrebase |> 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/mergebase-laundered 1220s git-debrebase |> 29cd144e0ff448f3434711ecbfd9056d754fc4aa commit refs/debrebase/wreckage/mergebase-patchqueue 1220s git-debrebase |> b4310a884a38ef6aa895034fde6edac63cebc707 commit refs/debrebase/wreckage/merged-patchqueue 1220s git-debrebase |> 22b123696189139d3f8c13fd184084505d435471 commit refs/debrebase/wreckage/new-base 1220s git-debrebase |> a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/result-anchor 1220s git-debrebase |> 48c55fcd6aad3671faeeedd232289eea48db8cce commit refs/debrebase/wreckage/right-anchor 1220s git-debrebase |> 247d69e2c498e57547983f4ac47559530666b403 commit refs/debrebase/wreckage/right-breakwater 1220s git-debrebase |> 135f7e96337316f3887d7d4af0f44d83a3d08b8e commit refs/debrebase/wreckage/right-input 1220s git-debrebase |> a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e commit refs/debrebase/wreckage/right-laundered 1220s git-debrebase |> 6577a293562429dbf61ac6d02c4a6124e13c8402 commit refs/debrebase/wreckage/right-patchqueue 1220s git-debrebase |> fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 commit refs/debrebase/wreckage/vanilla-merge 1220s git-debrebase >= delete refs/debrebase/wreckage/interchange-mbcand-ok-0 1220s git-debrebase >= delete refs/debrebase/wreckage/left-anchor 1220s git-debrebase >= delete refs/debrebase/wreckage/left-breakwater 1220s git-debrebase >= delete refs/debrebase/wreckage/left-input 1220s git-debrebase >= delete refs/debrebase/wreckage/left-laundered 1220s git-debrebase >= delete refs/debrebase/wreckage/left-patchqueue 1220s git-debrebase >= delete refs/debrebase/wreckage/mergebase-anchor 1220s git-debrebase >= delete refs/debrebase/wreckage/mergebase-breakwater 1220s git-debrebase >= delete refs/debrebase/wreckage/mergebase-laundered 1220s git-debrebase >= delete refs/debrebase/wreckage/mergebase-patchqueue 1220s git-debrebase >= delete refs/debrebase/wreckage/merged-patchqueue 1220s git-debrebase >= delete refs/debrebase/wreckage/new-base 1220s git-debrebase >= delete refs/debrebase/wreckage/result-anchor 1220s git-debrebase >= delete refs/debrebase/wreckage/right-anchor 1220s git-debrebase >= delete refs/debrebase/wreckage/right-breakwater 1220s git-debrebase >= delete refs/debrebase/wreckage/right-input 1220s git-debrebase >= delete refs/debrebase/wreckage/right-laundered 1220s git-debrebase >= delete refs/debrebase/wreckage/right-patchqueue 1220s git-debrebase >= delete refs/debrebase/wreckage/vanilla-merge 1220s git-debrebase >$ 1220s git-debrebase >= create refs/debrebase/wreckage/mergebase-breakwater 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1220s git-debrebase >= create refs/debrebase/wreckage/right-input 135f7e96337316f3887d7d4af0f44d83a3d08b8e 1220s git-debrebase >= create refs/debrebase/wreckage/left-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1220s git-debrebase >= create refs/debrebase/wreckage/vanilla-merge fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 1220s git-debrebase >= create refs/debrebase/wreckage/mergebase-laundered 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1220s git-debrebase >= create refs/debrebase/wreckage/right-breakwater 247d69e2c498e57547983f4ac47559530666b403 1220s git-debrebase >= create refs/debrebase/wreckage/mergebase-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1220s git-debrebase >= create refs/debrebase/wreckage/interchange-mbcand-ok-0 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1220s git-debrebase >= create refs/debrebase/wreckage/cached-resolution 2e2c77266a89e0c28b614bfcf937b2a4cc9f1a2c 1220s git-debrebase >= create refs/debrebase/wreckage/result-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1220s git-debrebase >= create refs/debrebase/wreckage/left-input b37fe95bb0b1442d16764feed887f45f0f7e234d 1220s git-debrebase >= create refs/debrebase/wreckage/left-breakwater 9d77794ea8eca3fa78b8ee406128836771c7195f 1220s git-debrebase >= create refs/debrebase/wreckage/right-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1220s git-debrebase >= create refs/debrebase/wreckage/left-laundered b37fe95bb0b1442d16764feed887f45f0f7e234d 1220s git-debrebase >= create refs/debrebase/wreckage/right-laundered a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 1220s git-debrebase >$ 1220s 1220s git-debrebase: Merge resolution failed: merge misresolved: upstream files are not the same (fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 2e2c77266a89e0c28b614bfcf937b2a4cc9f1a2c d.0x2) 1220s git-debrebase: Wreckage left in refs/debrebase/wreckage/*. 1220s git-debrebase: See git-debrebase(1) section FAILED MERGES for suggestions. 1220s + local 'ps=15 0' 1220s + set -o pipefail 1220s + case $ps in 1220s + t-grep-mpat 'E:upstream files are not the same' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1220s + local 'mpat=E:upstream files are not the same' 1220s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1220s + local grepper=fgrep 1220s + case "$mpat" in 1220s + case "$mpat" in 1220s + grepper=egrep 1220s + mpat='upstream files are not the same' 1220s + egrep -e 'upstream files are not the same' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1220s git-debrebase: Merge resolution failed: merge misresolved: upstream files are not the same (fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 2e2c77266a89e0c28b614bfcf937b2a4cc9f1a2c d.0x2) 1220s + t-git-debrebase scrap 1220s + local gdr=git-debrebase 1220s + : ' 1220s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1220s + git-debrebase --dgit=dgit -D --experimental-merge-resolution scrap 1220s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1220s git-debrebase |> 2e2c77266a89e0c28b614bfcf937b2a4cc9f1a2c commit refs/debrebase/wreckage/cached-resolution 1220s git-debrebase |> 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/interchange-mbcand-ok-0 1220s git-debrebase |> a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/left-anchor 1220s git-debrebase |> 9d77794ea8eca3fa78b8ee406128836771c7195f commit refs/debrebase/wreckage/left-breakwater 1220s git-debrebase |> b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-input 1220s git-debrebase |> b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-laundered 1220s git-debrebase |> 48c55fcd6aad3671faeeedd232289eea48db8cce commit refs/debrebase/wreckage/mergebase-anchor 1220s git-debrebase |> 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/mergebase-breakwater 1220s git-debrebase |> 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/mergebase-laundered 1220s git-debrebase |> a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/result-anchor 1220s git-debrebase |> 48c55fcd6aad3671faeeedd232289eea48db8cce commit refs/debrebase/wreckage/right-anchor 1220s git-debrebase |> 247d69e2c498e57547983f4ac47559530666b403 commit refs/debrebase/wreckage/right-breakwater 1220s git-debrebase |> 135f7e96337316f3887d7d4af0f44d83a3d08b8e commit refs/debrebase/wreckage/right-input 1220s git-debrebase |> a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e commit refs/debrebase/wreckage/right-laundered 1220s git-debrebase |> fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 commit refs/debrebase/wreckage/vanilla-merge 1220s git-debrebase >= delete refs/debrebase/merge-resolutions 1220s git-debrebase >= delete refs/debrebase/wreckage/cached-resolution 1220s git-debrebase >= delete refs/debrebase/wreckage/interchange-mbcand-ok-0 1220s git-debrebase >= delete refs/debrebase/wreckage/left-anchor 1220s git-debrebase >= delete refs/debrebase/wreckage/left-breakwater 1220s git-debrebase >= delete refs/debrebase/wreckage/left-input 1220s git-debrebase >= delete refs/debrebase/wreckage/left-laundered 1220s git-debrebase >= delete refs/debrebase/wreckage/mergebase-anchor 1220s git-debrebase >= delete refs/debrebase/wreckage/mergebase-breakwater 1220s git-debrebase >= delete refs/debrebase/wreckage/mergebase-laundered 1220s git-debrebase >= delete refs/debrebase/wreckage/result-anchor 1220s git-debrebase >= delete refs/debrebase/wreckage/right-anchor 1220s git-debrebase >= delete refs/debrebase/wreckage/right-breakwater 1220s git-debrebase >= delete refs/debrebase/wreckage/right-input 1220s git-debrebase >= delete refs/debrebase/wreckage/right-laundered 1220s git-debrebase >= delete refs/debrebase/wreckage/vanilla-merge 1220s git-debrebase >$ 1220s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1220s ' 1220s + no-wreckage 1220s + git for-each-ref refs/debrebase/wreckage 1220s + egrep . 1220s + : ----- well ----- 1220s + t-expect-fail F:docs/README t-git-debrebase 1220s + local mpat=F:docs/README 1220s + shift 1220s + set +o pipefail 1220s + LC_MESSAGES=C 1220s + LANGUAGE=C 1220s + t-git-debrebase 1220s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1220s + local gdr=git-debrebase 1220s + : ' 1220s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1220s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 1220s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1220s git-debrebase ffq check_specs * 1220s git-debrebase ffq merge master 1220s git-debrebase ffq check_remote origin remote fetch/merge branch 1220s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1220s OK, you are ahead of refs/remotes/origin/master 1220s git-debrebase ffq check_remote undef remote push branch 1220s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1220s git-debrebase *** WALK 64f3a6f001f9d164d170f660f8927b3e92ace3df 0 - 1220s git-debrebase get_differs fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0 1220s git-debrebase get_differs ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x32 1220s git-debrebase classify 64f3a6f001f9d164d170f660f8927b3e92ace3df $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7/0 ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6/0x32 1220s git-debrebase = Pseudomerge {"Contributor" => {"CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7","Ix" => 0,"Differs" => 0},"CommitId" => "64f3a6f001f9d164d170f660f8927b3e92ace3df","Overwritten" => [{"Differs" => 50,"Ix" => 1,"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6"}],"Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7\nparent ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345"} 1220s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x22 1220s git-debrebase get_differs 135f7e96337316f3887d7d4af0f44d83a3d08b8e a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x12 1220s git-debrebase classify fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p b37fe95bb0b1442d16764feed887f45f0f7e234d/0x22 135f7e96337316f3887d7d4af0f44d83a3d08b8e/0x12 1220s git-debrebase = VanillaMerge {"Parents" => [{"IsOrigin" => "","CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","IsDgitImport" => undef,"Ix" => 0,"Differs" => 34},{"Differs" => 18,"CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","IsOrigin" => "","Ix" => 1,"IsDgitImport" => undef}],"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent b37fe95bb0b1442d16764feed887f45f0f7e234d\nparent 135f7e96337316f3887d7d4af0f44d83a3d08b8e\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "VanillaMerge"} 1220s git-debrebase *** MERGE 1220s git-debrebase mwrecknote vanilla-merge fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 1220s git-debrebase *** WALK b37fe95bb0b1442d16764feed887f45f0f7e234d 0 - 1220s git-debrebase get_differs f56efc03310335c2ac5ce92426d06b9285521dc5 b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 = 0x2 1220s git-debrebase classify b37fe95bb0b1442d16764feed887f45f0f7e234d $t=b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 @p f56efc03310335c2ac5ce92426d06b9285521dc5/0x2 1220s git-debrebase = Upstream {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9","Type" => "Upstream","Hdr" => "tree b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9\nparent f56efc03310335c2ac5ce92426d06b9285521dc5\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","Parents" => [{"Ix" => 0,"CommitId" => "f56efc03310335c2ac5ce92426d06b9285521dc5","Differs" => 2}]} 1220s git-debrebase get_differs df6bd9a4a00482c1b1ff20f46460c55f82040227 b572e0b33b388437b34057c7e203744c52d82138 = 0x2 1220s git-debrebase classify f56efc03310335c2ac5ce92426d06b9285521dc5 $t=b572e0b33b388437b34057c7e203744c52d82138 @p df6bd9a4a00482c1b1ff20f46460c55f82040227/0x2 1220s git-debrebase = Upstream {"Parents" => [{"CommitId" => "df6bd9a4a00482c1b1ff20f46460c55f82040227","Ix" => 0,"Differs" => 2}],"CommitId" => "f56efc03310335c2ac5ce92426d06b9285521dc5","Hdr" => "tree b572e0b33b388437b34057c7e203744c52d82138\nparent df6bd9a4a00482c1b1ff20f46460c55f82040227\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Tree" => "b572e0b33b388437b34057c7e203744c52d82138","Msg" => "UPSTREAM edit src.c (before)\n"} 1220s git-debrebase get_differs 7ecce5149f80ae53a4fdab476b04947659f39765 c26f8635f5a3d239ca949aa666feee09ab57e882 = 0x2 1220s git-debrebase classify df6bd9a4a00482c1b1ff20f46460c55f82040227 $t=c26f8635f5a3d239ca949aa666feee09ab57e882 @p 7ecce5149f80ae53a4fdab476b04947659f39765/0x2 1220s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "7ecce5149f80ae53a4fdab476b04947659f39765","Differs" => 2}],"Tree" => "c26f8635f5a3d239ca949aa666feee09ab57e882","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "df6bd9a4a00482c1b1ff20f46460c55f82040227","Hdr" => "tree c26f8635f5a3d239ca949aa666feee09ab57e882\nparent 7ecce5149f80ae53a4fdab476b04947659f39765\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream"} 1220s git-debrebase get_differs 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 = 0x2 1220s git-debrebase classify 7ecce5149f80ae53a4fdab476b04947659f39765 $t=2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 @p 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450/0x2 1220s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450","Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6","Type" => "Upstream","CommitId" => "7ecce5149f80ae53a4fdab476b04947659f39765","Hdr" => "tree 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6\nparent 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n"} 1220s git-debrebase get_differs 9d77794ea8eca3fa78b8ee406128836771c7195f ced8034e4d13234deefc682b3523b0a9657f4e2a = 0x2 1220s git-debrebase classify 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 $t=ced8034e4d13234deefc682b3523b0a9657f4e2a @p 9d77794ea8eca3fa78b8ee406128836771c7195f/0x2 1220s git-debrebase = Upstream {"Parents" => [{"CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Ix" => 0,"Differs" => 2}],"Tree" => "ced8034e4d13234deefc682b3523b0a9657f4e2a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree ced8034e4d13234deefc682b3523b0a9657f4e2a\nparent 9d77794ea8eca3fa78b8ee406128836771c7195f\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450","Type" => "Upstream"} 1220s git-debrebase get_differs a7a1ce7990fecc564e8a5fa13896686b4a962d1c 9d383022823105715207a03601780dbceeb8ee4d = 0x10 1220s git-debrebase classify 9d77794ea8eca3fa78b8ee406128836771c7195f $t=9d383022823105715207a03601780dbceeb8ee4d @p a7a1ce7990fecc564e8a5fa13896686b4a962d1c/0x10 1220s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Differs" => 16}],"Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent a7a1ce7990fecc564e8a5fa13896686b4a962d1c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Type" => "Changelog","Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n"} 1220s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 1220s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 1220s git-debrebase classify a7a1ce7990fecc564e8a5fa13896686b4a962d1c $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1220s git-debrebase = Anchor {"Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Anchor","OrigParents" => [{"Ix" => 1,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Differs" => 48}],"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"},$VAR1->{"OrigParents"}[0]]} 1220s git-debrebase *** WALK prep done cur=a7a1ce7990fecc564e8a5fa13896686b4a962d1c brw 0 upp 4 proc 6 pm -1 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase WALK REBUILD a7a1ce7990fecc564e8a5fa13896686b4a962d1c 7 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1220s git-debrebase WALK BUILD 9d77794ea8eca3fa78b8ee406128836771c7195f Debian (rewriting=0) 1220s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1220s git-debrebase WALK BUILD 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 Upstream (rewriting=0) 1220s git-debrebase WALK BUILD 7ecce5149f80ae53a4fdab476b04947659f39765 Upstream (rewriting=0) 1220s git-debrebase WALK BUILD df6bd9a4a00482c1b1ff20f46460c55f82040227 Upstream (rewriting=0) 1220s git-debrebase WALK BUILD f56efc03310335c2ac5ce92426d06b9285521dc5 Upstream (rewriting=0) 1220s git-debrebase WALK BUILD b37fe95bb0b1442d16764feed887f45f0f7e234d Upstream (rewriting=0) 1220s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1220s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d b37fe95bb0b1442d16764feed887f45f0f7e234d = 0 1220s git-debrebase *** WALK RETURN b37fe95bb0b1442d16764feed887f45f0f7e234d 9d77794ea8eca3fa78b8ee406128836771c7195f a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1220s git-debrebase mwrecknote left-input b37fe95bb0b1442d16764feed887f45f0f7e234d 1220s git-debrebase mwrecknote left-laundered b37fe95bb0b1442d16764feed887f45f0f7e234d 1220s git-debrebase mwrecknote left-breakwater 9d77794ea8eca3fa78b8ee406128836771c7195f 1220s git-debrebase mwrecknote left-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1220s git-debrebase MERGE BA best=a7a1ce7990fecc564e8a5fa13896686b4a962d1c p=a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1220s git-debrebase *** WALK 135f7e96337316f3887d7d4af0f44d83a3d08b8e 0 - 1220s git-debrebase get_differs a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0 1220s git-debrebase get_differs 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 1220s git-debrebase classify 135f7e96337316f3887d7d4af0f44d83a3d08b8e $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e/0 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca/0x2 1220s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"CommitId" => "a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e","Differs" => 0},"CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","Overwritten" => [{"CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca","Ix" => 1,"Differs" => 2}],"Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e\nparent 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91"} 1220s git-debrebase get_differs 06587090e7b2aa88e0fe178071070bbcf9bee291 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 1220s git-debrebase classify a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 06587090e7b2aa88e0fe178071070bbcf9bee291/0x2 1220s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e","Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 06587090e7b2aa88e0fe178071070bbcf9bee291\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "other-upstream-conflict\n","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "06587090e7b2aa88e0fe178071070bbcf9bee291"}]} 1220s git-debrebase get_differs 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x2 1220s git-debrebase classify 06587090e7b2aa88e0fe178071070bbcf9bee291 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p 722aeaa8fd6da2d6bc6212577cf13ed31bee9721/0x2 1220s git-debrebase = Upstream {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Type" => "Upstream","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent 722aeaa8fd6da2d6bc6212577cf13ed31bee9721\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "06587090e7b2aa88e0fe178071070bbcf9bee291","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "722aeaa8fd6da2d6bc6212577cf13ed31bee9721"}]} 1220s git-debrebase get_differs 2b64ed03b736658302f8c07540cf5031956d5d1c 42e8d18d3457ca5a51861bc7222aeb912c254975 = 0x2 1220s git-debrebase classify 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 $t=42e8d18d3457ca5a51861bc7222aeb912c254975 @p 2b64ed03b736658302f8c07540cf5031956d5d1c/0x2 1220s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "2b64ed03b736658302f8c07540cf5031956d5d1c","Differs" => 2}],"Tree" => "42e8d18d3457ca5a51861bc7222aeb912c254975","Msg" => "UPSTREAM edit src-other.c (other)\n","Hdr" => "tree 42e8d18d3457ca5a51861bc7222aeb912c254975\nparent 2b64ed03b736658302f8c07540cf5031956d5d1c\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "722aeaa8fd6da2d6bc6212577cf13ed31bee9721","Type" => "Upstream"} 1220s git-debrebase get_differs ab2b08ad554cddf9381bd5ad427c1086b496110e 303c71503c03080bda903ee6582757788559a305 = 0x2 1220s git-debrebase classify 2b64ed03b736658302f8c07540cf5031956d5d1c $t=303c71503c03080bda903ee6582757788559a305 @p ab2b08ad554cddf9381bd5ad427c1086b496110e/0x2 1220s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ab2b08ad554cddf9381bd5ad427c1086b496110e"}],"CommitId" => "2b64ed03b736658302f8c07540cf5031956d5d1c","Hdr" => "tree 303c71503c03080bda903ee6582757788559a305\nparent ab2b08ad554cddf9381bd5ad427c1086b496110e\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Tree" => "303c71503c03080bda903ee6582757788559a305","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1220s git-debrebase get_differs cb272cd86f177289fa60b63dbaa569cf4722c90c af1d4b6b4512b3d286fe984aa34588e889c1ab24 = 0x2 1220s git-debrebase classify ab2b08ad554cddf9381bd5ad427c1086b496110e $t=af1d4b6b4512b3d286fe984aa34588e889c1ab24 @p cb272cd86f177289fa60b63dbaa569cf4722c90c/0x2 1220s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "ab2b08ad554cddf9381bd5ad427c1086b496110e","Hdr" => "tree af1d4b6b4512b3d286fe984aa34588e889c1ab24\nparent cb272cd86f177289fa60b63dbaa569cf4722c90c\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "af1d4b6b4512b3d286fe984aa34588e889c1ab24","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cb272cd86f177289fa60b63dbaa569cf4722c90c"}]} 1220s git-debrebase get_differs d5061809fd55315a08ab262231259720230ddc0b ab36d5c8cc32b63c9defc9547dd01c490ca95683 = 0x2 1220s git-debrebase classify cb272cd86f177289fa60b63dbaa569cf4722c90c $t=ab36d5c8cc32b63c9defc9547dd01c490ca95683 @p d5061809fd55315a08ab262231259720230ddc0b/0x2 1220s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "ab36d5c8cc32b63c9defc9547dd01c490ca95683","Type" => "Upstream","Hdr" => "tree ab36d5c8cc32b63c9defc9547dd01c490ca95683\nparent d5061809fd55315a08ab262231259720230ddc0b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "cb272cd86f177289fa60b63dbaa569cf4722c90c","Parents" => [{"Ix" => 0,"CommitId" => "d5061809fd55315a08ab262231259720230ddc0b","Differs" => 2}]} 1221s git-debrebase get_differs da5983ce3ff475b408b17b89e1975df4de601fad 464d5b09357dd0b145bbecc8ee74810993c6b39e = 0x2 1221s git-debrebase classify d5061809fd55315a08ab262231259720230ddc0b $t=464d5b09357dd0b145bbecc8ee74810993c6b39e @p da5983ce3ff475b408b17b89e1975df4de601fad/0x2 1221s git-debrebase = Upstream {"Hdr" => "tree 464d5b09357dd0b145bbecc8ee74810993c6b39e\nparent da5983ce3ff475b408b17b89e1975df4de601fad\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "d5061809fd55315a08ab262231259720230ddc0b","Type" => "Upstream","Tree" => "464d5b09357dd0b145bbecc8ee74810993c6b39e","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "da5983ce3ff475b408b17b89e1975df4de601fad","Ix" => 0,"Differs" => 2}]} 1221s git-debrebase get_differs 247d69e2c498e57547983f4ac47559530666b403 8a6447a3fd229137f4a5385df6b80b9f96829b0b = 0x2 1221s git-debrebase classify da5983ce3ff475b408b17b89e1975df4de601fad $t=8a6447a3fd229137f4a5385df6b80b9f96829b0b @p 247d69e2c498e57547983f4ac47559530666b403/0x2 1221s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Differs" => 2}],"Type" => "Upstream","Hdr" => "tree 8a6447a3fd229137f4a5385df6b80b9f96829b0b\nparent 247d69e2c498e57547983f4ac47559530666b403\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "da5983ce3ff475b408b17b89e1975df4de601fad","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "8a6447a3fd229137f4a5385df6b80b9f96829b0b"} 1221s git-debrebase get_differs d2df4dc1f9d085dc7c84da339a37150425eedea7 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1221s git-debrebase classify 247d69e2c498e57547983f4ac47559530666b403 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p d2df4dc1f9d085dc7c84da339a37150425eedea7/0x20 1221s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Differs" => 32}],"Type" => "Packaging","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent d2df4dc1f9d085dc7c84da339a37150425eedea7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6"} 1221s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1221s git-debrebase classify d2df4dc1f9d085dc7c84da339a37150425eedea7 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1221s git-debrebase = Packaging {"Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Type" => "Packaging","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Msg" => "DEBIAN add zorkmid-other (other)\n"} 1221s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1221s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1221s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Ix" => 0}]} 1221s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1221s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1221s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (before)\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Parents" => [{"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32}]} 1221s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1221s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1221s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Ix" => 0}],"Type" => "Changelog","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1221s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1221s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1221s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Ix" => 0}],"Type" => "Changelog","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\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"} 1221s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1221s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1221s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1221s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"OrigParents" => [$VAR1->{"Parents"}[1]]} 1221s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 5 upp 8 proc 16 pm 0 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1221s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 17 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1221s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1221s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1221s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1221s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1221s git-debrebase WALK BUILD d2df4dc1f9d085dc7c84da339a37150425eedea7 Debian (rewriting=0) 1221s git-debrebase WALK BUILD 247d69e2c498e57547983f4ac47559530666b403 Debian (rewriting=0) 1221s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1221s git-debrebase WALK BUILD da5983ce3ff475b408b17b89e1975df4de601fad Upstream (rewriting=0) 1221s git-debrebase WALK BUILD d5061809fd55315a08ab262231259720230ddc0b Upstream (rewriting=0) 1221s git-debrebase WALK BUILD cb272cd86f177289fa60b63dbaa569cf4722c90c Upstream (rewriting=0) 1221s git-debrebase WALK BUILD ab2b08ad554cddf9381bd5ad427c1086b496110e Upstream (rewriting=0) 1221s git-debrebase WALK BUILD 2b64ed03b736658302f8c07540cf5031956d5d1c Upstream (rewriting=0) 1221s git-debrebase WALK BUILD 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 Upstream (rewriting=0) 1221s git-debrebase WALK BUILD 06587090e7b2aa88e0fe178071070bbcf9bee291 Upstream (rewriting=0) 1221s git-debrebase WALK BUILD a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e Upstream (rewriting=0) 1221s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1221s git-debrebase get_differs a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 135f7e96337316f3887d7d4af0f44d83a3d08b8e = 0 1221s git-debrebase *** WALK RETURN a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 247d69e2c498e57547983f4ac47559530666b403 48c55fcd6aad3671faeeedd232289eea48db8cce 1221s git-debrebase mwrecknote right-input 135f7e96337316f3887d7d4af0f44d83a3d08b8e 1221s git-debrebase mwrecknote right-laundered a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 1221s git-debrebase mwrecknote right-breakwater 247d69e2c498e57547983f4ac47559530666b403 1221s git-debrebase mwrecknote right-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1221s git-debrebase MERGE BA best=a7a1ce7990fecc564e8a5fa13896686b4a962d1c p=48c55fcd6aad3671faeeedd232289eea48db8cce 1221s git-debrebase mwrecknote result-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1221s git-debrebase mwrecknote interchange-mbcand-ok-0 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1221s git-debrebase *** WALK 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 0 - 1221s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1221s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1221s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Ix" => 0}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Type" => "Packaging"} 1221s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1221s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1221s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Parents" => [{"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0,"Differs" => 32}]} 1221s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1221s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1221s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Ix" => 0}]} 1221s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1221s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1221s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}]} 1221s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1221s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1221s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1221s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"Parents" => [{"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1221s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 3 upp -1 proc 4 pm -1 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1221s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 5 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1221s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1221s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1221s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1221s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1221s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1221s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 = 0 1221s git-debrebase *** WALK RETURN 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 48c55fcd6aad3671faeeedd232289eea48db8cce 1221s git-debrebase mwrecknote mergebase-laundered 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1221s git-debrebase mwrecknote mergebase-breakwater 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1221s git-debrebase mwrecknote mergebase-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1221s git-debrebase *** WALK prep done cur=fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 brw 0 upp 1 proc 2 pm 0 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1221s git-debrebase WALK REBUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 3 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1221s git-debrebase WALK BUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 MergeCreateMergedBreakwaters (rewriting=0) 1221s Found a general merge, will try to tidy it up. 1221s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1221s git-debrebase WALK BUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 MergeMergeSeries (rewriting=1) 1221s git-debrebase >(no reflog) 1221s Running merge resolution for fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7... 1221s git-debrebase mwrecknote new-base 22b123696189139d3f8c13fd184084505d435471 1221s git-debrebase merge_series newbase=22b123696189139d3f8c13fd184084505d435471 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1221s git-debrebase gbp_pq_export p-base 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1221s git-debrebase merge_series pec d6c9f90711cc4ca0f8fcd3be0e85489a2a84fcc0 pec' 29cd144e0ff448f3434711ecbfd9056d754fc4aa 1221s git-debrebase mwrecknote mergebase-patchqueue 29cd144e0ff448f3434711ecbfd9056d754fc4aa 1221s git-debrebase gbp_pq_export p-1 247d69e2c498e57547983f4ac47559530666b403 a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 1221s git-debrebase merge_series pec dadd8b9ca2bdcc6c98fc63fdc589c75ae0e1d905 pec' 6577a293562429dbf61ac6d02c4a6124e13c8402 1221s git-debrebase mwrecknote right-patchqueue 6577a293562429dbf61ac6d02c4a6124e13c8402 1221s git-debrebase gbp_pq_export p-0 9d77794ea8eca3fa78b8ee406128836771c7195f b37fe95bb0b1442d16764feed887f45f0f7e234d 1221s git-debrebase merge_series pec 93be20878e0234e9dfa59ac95912e0962d0ff2f0 pec' a9738332ccab240ed5754572526f03d01974ec1b 1221s git-debrebase mwrecknote left-patchqueue a9738332ccab240ed5754572526f03d01974ec1b 1221s git-debrebase merge_series merging... 1221s git-debrebase merge_series merge ok, series... 1221s git-debrebase merge_series patch 0001-Add-a-new-upstream-file.patch keep 1221s merge_series patch 0002-Edit-the-.c-file.patch keep 1221s merge_series prereq 0002-Edit-the-.c-file.patch -> 0001-Add-a-new-upstream-file.patch keep 1221s merge_series patch 0004-UPSTREAM-edit-src.c-before.patch keep 1221s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0001-Add-a-new-upstream-file.patch keep 1221s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0002-Edit-the-.c-file.patch keep 1221s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> subdir/addnewups keep 1221s merge_series patch 0005-MIXED-add-both-before.patch keep 1221s merge_series prereq 0005-MIXED-add-both-before.patch -> 0001-Add-a-new-upstream-file.patch keep 1221s merge_series prereq 0005-MIXED-add-both-before.patch -> 0002-Edit-the-.c-file.patch keep 1221s merge_series prereq 0005-MIXED-add-both-before.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1221s merge_series prereq 0005-MIXED-add-both-before.patch -> subdir/addnewups keep 1221s merge_series patch 0006-UPSTREAM-edit-src-other.c-other.patch keep 1221s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0001-Add-a-new-upstream-file.patch keep 1221s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0002-Edit-the-.c-file.patch keep 1221s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1221s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0005-MIXED-add-both-before.patch keep 1221s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> subdir/addnewups keep 1221s merge_series patch 0007-MIXED-add-both-other-other.patch keep 1221s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0001-Add-a-new-upstream-file.patch keep 1221s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0002-Edit-the-.c-file.patch keep 1221s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1221s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0005-MIXED-add-both-before.patch keep 1221s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 1221s merge_series prereq 0007-MIXED-add-both-other-other.patch -> subdir/addnewups keep 1221s merge_series patch 0008-other-upstream-conflict.patch keep 1221s merge_series prereq 0008-other-upstream-conflict.patch -> 0001-Add-a-new-upstream-file.patch keep 1221s merge_series prereq 0008-other-upstream-conflict.patch -> 0002-Edit-the-.c-file.patch keep 1221s merge_series prereq 0008-other-upstream-conflict.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1221s merge_series prereq 0008-other-upstream-conflict.patch -> 0005-MIXED-add-both-before.patch keep 1221s merge_series prereq 0008-other-upstream-conflict.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 1221s merge_series prereq 0008-other-upstream-conflict.patch -> 0007-MIXED-add-both-other-other.patch keep 1221s merge_series prereq 0008-other-upstream-conflict.patch -> subdir/addnewups keep 1221s merge_series patch subdir/addnewups keep 1221s merge_series prereq subdir/addnewups -> 0001-Add-a-new-upstream-file.patch keep 1221s merge_series prereq subdir/addnewups -> 0002-Edit-the-.c-file.patch keep 1221s merge_series series next 0001-Add-a-new-upstream-file.patch 1221s git-debrebase merge_series series next 0002-Edit-the-.c-file.patch 1221s git-debrebase merge_series series next subdir/addnewups 1221s git-debrebase merge_series series next 0004-UPSTREAM-edit-src.c-before.patch 1221s git-debrebase merge_series series next 0005-MIXED-add-both-before.patch 1221s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-other.c-other.patch 1221s git-debrebase merge_series series next 0007-MIXED-add-both-other-other.patch 1221s git-debrebase merge_series series next 0008-other-upstream-conflict.patch 1221s git-debrebase mwrecknote merged-patchqueue b4310a884a38ef6aa895034fde6edac63cebc707 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1221s git-debrebase merge_series series gbp pq import 1221s gbp:info: Trying to apply patches at 'b4310a884a38ef6aa895034fde6edac63cebc707' 1221s gbp:warning: Patch 0008-other-upstream-conflict.patch failed to apply, retrying with whitespace fixup 1221s gbp:error: Failed to apply '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge/debian/patches/0008-other-upstream-conflict.patch': Error running git apply: error: patch failed: docs/README:1 1221s error: docs/README: patch does not apply 1221s gbp:error: Couldn't apply patches 1221s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1221s git-debrebase >$ 1221s git-debrebase >= create refs/debrebase/wreckage/mergebase-patchqueue 29cd144e0ff448f3434711ecbfd9056d754fc4aa 1221s git-debrebase >= create refs/debrebase/wreckage/right-laundered a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 1221s git-debrebase >= create refs/debrebase/wreckage/left-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1221s git-debrebase >= create refs/debrebase/wreckage/result-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1221s git-debrebase >= create refs/debrebase/wreckage/left-breakwater 9d77794ea8eca3fa78b8ee406128836771c7195f 1221s git-debrebase >= create refs/debrebase/wreckage/interchange-mbcand-ok-0 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1221s git-debrebase >= create refs/debrebase/wreckage/mergebase-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1221s git-debrebase >= create refs/debrebase/wreckage/mergebase-breakwater 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1221s git-debrebase >= create refs/debrebase/wreckage/right-breakwater 247d69e2c498e57547983f4ac47559530666b403 1221s git-debrebase >= create refs/debrebase/wreckage/right-input 135f7e96337316f3887d7d4af0f44d83a3d08b8e 1221s git-debrebase >= create refs/debrebase/wreckage/mergebase-laundered 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1221s git-debrebase >= create refs/debrebase/wreckage/right-patchqueue 6577a293562429dbf61ac6d02c4a6124e13c8402 1221s git-debrebase >= create refs/debrebase/wreckage/left-patchqueue a9738332ccab240ed5754572526f03d01974ec1b 1221s git-debrebase >= create refs/debrebase/wreckage/right-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1221s git-debrebase >= create refs/debrebase/wreckage/new-base 22b123696189139d3f8c13fd184084505d435471 1221s git-debrebase >= create refs/debrebase/wreckage/left-input b37fe95bb0b1442d16764feed887f45f0f7e234d 1221s git-debrebase >= create refs/debrebase/wreckage/left-laundered b37fe95bb0b1442d16764feed887f45f0f7e234d 1221s git-debrebase >= create refs/debrebase/wreckage/merged-patchqueue b4310a884a38ef6aa895034fde6edac63cebc707 1221s git-debrebase >= create refs/debrebase/wreckage/vanilla-merge fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 1221s git-debrebase >$ 1221s 1221s git-debrebase: Merge resolution failed: subprocess failed with error exit status 1 1221s git-debrebase: failed command: gbp pq import 1221s git-debrebase: Wreckage left in refs/debrebase/wreckage/*. 1221s git-debrebase: See git-debrebase(1) section FAILED MERGES for suggestions. 1221s + local 'ps=15 0' 1221s + set -o pipefail 1221s + case $ps in 1221s + t-grep-mpat F:docs/README /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1221s + local mpat=F:docs/README 1221s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1221s + local grepper=fgrep 1221s + case "$mpat" in 1221s + case "$mpat" in 1221s + grepper=fgrep 1221s + mpat=docs/README 1221s + fgrep -e docs/README /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1221s git-debrebase = VanillaMerge {"Parents" => [{"IsOrigin" => "","CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","IsDgitImport" => undef,"Ix" => 0,"Differs" => 34},{"Differs" => 18,"CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","IsOrigin" => "","Ix" => 1,"IsDgitImport" => undef}],"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent b37fe95bb0b1442d16764feed887f45f0f7e234d\nparent 135f7e96337316f3887d7d4af0f44d83a3d08b8e\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "VanillaMerge"} 1221s gbp:error: Failed to apply '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge/debian/patches/0008-other-upstream-conflict.patch': Error running git apply: error: patch failed: docs/README:1 1221s error: docs/README: patch does not apply 1221s + wreckage-after 1221s ++ t-git-get-ref-exact refs/debrebase/wreckage/junk 1221s ++ local ref=refs/debrebase/wreckage/junk 1221s ++ case "$ref" in 1221s ++ git for-each-ref '--format=%(objectname)' '[r]efs/debrebase/wreckage/junk' 1221s + test '' = '' 1221s + git for-each-ref refs/debrebase/wreckage 1221s + egrep . 1221s 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/interchange-mbcand-ok-0 1221s a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/left-anchor 1221s 9d77794ea8eca3fa78b8ee406128836771c7195f commit refs/debrebase/wreckage/left-breakwater 1221s b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-input 1221s b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-laundered 1221s a9738332ccab240ed5754572526f03d01974ec1b commit refs/debrebase/wreckage/left-patchqueue 1221s 48c55fcd6aad3671faeeedd232289eea48db8cce commit refs/debrebase/wreckage/mergebase-anchor 1221s 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/mergebase-breakwater 1221s 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/mergebase-laundered 1221s 29cd144e0ff448f3434711ecbfd9056d754fc4aa commit refs/debrebase/wreckage/mergebase-patchqueue 1221s b4310a884a38ef6aa895034fde6edac63cebc707 commit refs/debrebase/wreckage/merged-patchqueue 1221s 22b123696189139d3f8c13fd184084505d435471 commit refs/debrebase/wreckage/new-base 1221s a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/result-anchor 1221s 48c55fcd6aad3671faeeedd232289eea48db8cce commit refs/debrebase/wreckage/right-anchor 1221s 247d69e2c498e57547983f4ac47559530666b403 commit refs/debrebase/wreckage/right-breakwater 1221s 135f7e96337316f3887d7d4af0f44d83a3d08b8e commit refs/debrebase/wreckage/right-input 1221s a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e commit refs/debrebase/wreckage/right-laundered 1221s 6577a293562429dbf61ac6d02c4a6124e13c8402 commit refs/debrebase/wreckage/right-patchqueue 1221s fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 commit refs/debrebase/wreckage/vanilla-merge 1221s + quilt_faff_before 2 1221s + git checkout -b fix2 debrebase/wreckage/merged-patchqueue 1221s Switched to a new branch 'fix2' 1221s + QUILT_PATCHES=debian/patches 1221s + quilt push -a 1222s Applying patch debian/patches/0001-Add-a-new-upstream-file.patch 1222s patching file new-upstream-file 1222s 1222s Applying patch debian/patches/0002-Edit-the-.c-file.patch 1222s patching file src.c 1222s 1222s Applying patch debian/patches/subdir/addnewups 1222s patching file lib.c 1222s 1222s Applying patch debian/patches/0004-UPSTREAM-edit-src.c-before.patch 1222s patching file src.c 1222s 1222s Applying patch debian/patches/0005-MIXED-add-both-before.patch 1222s patching file src.c 1222s 1222s Applying patch debian/patches/0006-UPSTREAM-edit-src-other.c-other.patch 1222s patching file src-other.c 1222s 1222s Applying patch debian/patches/0007-MIXED-add-both-other-other.patch 1222s patching file src-other.c 1222s 1222s Applying patch debian/patches/0008-other-upstream-conflict.patch 1222s patching file docs/README 1222s Hunk #1 succeeded at 1 with fuzz 2. 1222s 1222s Now at patch debian/patches/0008-other-upstream-conflict.patch 1222s + git checkout master docs/README 1222s Updated 1 path from a426141 1222s + git reset docs/README 1222s Unstaged changes after reset: 1222s M docs/README 1222s M src.c 1222s + quilt_faff_after 1222s + QUILT_PATCHES=debian/patches 1222s + quilt refresh 1222s Refreshed patch debian/patches/0008-other-upstream-conflict.patch 1222s + git add debian/patches 1222s + git commit -m FIX 1222s [fix2 99d3f70] FIX 1222s 1 file changed, 6 insertions(+), 5 deletions(-) 1222s + git reset --hard 1222s HEAD is now at 99d3f70 FIX 1222s + git clean -xdff 1222s Removing .pc/ 1222s Removing debian/patches/0008-other-upstream-conflict.patch~ 1222s Removing lib.c 1222s Removing new-upstream-file 1222s Removing src-other.c 1222s + t-git-debrebase record-resolved-merge 1222s + local gdr=git-debrebase 1222s + : ' 1222s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1222s + git-debrebase --dgit=dgit -D --experimental-merge-resolution record-resolved-merge 1222s Checking how you have resolved the merge problem 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1222s Seems to be vanilla-merge patchqueue. 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1222s git-debrebase merge_series series gbp pq import 1222s gbp:info: Trying to apply patches at '99d3f700a97e2d894a420d8b9abf9e692fa6bebb' 1222s gbp:info: 8 patches listed in 'debian/patches/series' imported on 'patch-queue/mergec' 1222s git-debrebase merge_series series ok, building... 1222s git-debrebase merge_series series ok, building e033b01105c125f777576d3fb32d1ab7f2e8a720 1222s git-debrebase merge_series series ok, building 3751a4b34dc30eb0a895effc349c06f07af81530 1222s git-debrebase merge_series series ok, building eca8424ad2cbd6c4ae9d41c90f550b4e1037b6bd 1222s git-debrebase merge_series series ok, building af823bf2741460a3f8b9947d6d8308a259d4a438 1222s git-debrebase merge_series series ok, building 24fc7ff49e9746ea8beafca18bfda9847198ffe5 1222s git-debrebase merge_series series ok, building b75826f094e5f3b5b5b4936d00ea2d97096ba0d6 1222s git-debrebase merge_series series ok, building 3275b7d972708e7f97dd938dafdcd8b23095c028 1222s git-debrebase merge_series series ok, building 221908d7dc3653b2d640513596c1dc298e82d20c 1222s git-debrebase mwrecknote merged-result e74be556fc3fe9f1afb626685a970c70e5730b69 1222s git-debrebase merge_series done debug=2e3fd10fea07f28e2c7e23b012689495216b84ab 1222s git-debrebase mwrecknote merged-debug 2e3fd10fea07f28e2c7e23b012689495216b84ab 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1222s git-debrebase merge_series returns e74be556fc3fe9f1afb626685a970c70e5730b69 1222s OK. You can switch branches and try git-debrebase again. 1222s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1222s ' 1222s + git checkout master 1222s Switched to branch 'master' 1222s Your branch is ahead of 'origin/master' by 37 commits. 1222s (use "git push" to publish your local commits) 1222s + t-git-debrebase 1222s + local gdr=git-debrebase 1222s + : ' 1222s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1222s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 1222s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1222s git-debrebase ffq check_specs * 1222s git-debrebase ffq merge master 1222s git-debrebase ffq check_remote origin remote fetch/merge branch 1222s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1222s OK, you are ahead of refs/remotes/origin/master 1222s git-debrebase ffq check_remote undef remote push branch 1222s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1222s git-debrebase *** WALK 64f3a6f001f9d164d170f660f8927b3e92ace3df 0 - 1222s git-debrebase get_differs fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0 1222s git-debrebase get_differs ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x32 1222s git-debrebase classify 64f3a6f001f9d164d170f660f8927b3e92ace3df $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7/0 ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6/0x32 1222s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7"},"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","CommitId" => "64f3a6f001f9d164d170f660f8927b3e92ace3df","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Overwritten" => [{"Ix" => 1,"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Differs" => 50}],"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7\nparent ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Pseudomerge"} 1222s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x22 1222s git-debrebase get_differs 135f7e96337316f3887d7d4af0f44d83a3d08b8e a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x12 1222s git-debrebase classify fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p b37fe95bb0b1442d16764feed887f45f0f7e234d/0x22 135f7e96337316f3887d7d4af0f44d83a3d08b8e/0x12 1222s git-debrebase = VanillaMerge {"Type" => "VanillaMerge","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent b37fe95bb0b1442d16764feed887f45f0f7e234d\nparent 135f7e96337316f3887d7d4af0f44d83a3d08b8e\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 34,"IsDgitImport" => undef,"CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","IsOrigin" => ""},{"Ix" => 1,"IsDgitImport" => undef,"Differs" => 18,"CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","IsOrigin" => ""}],"Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","CommitId" => "fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345"} 1222s git-debrebase *** MERGE 1222s git-debrebase mwrecknote vanilla-merge fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 1222s git-debrebase *** WALK b37fe95bb0b1442d16764feed887f45f0f7e234d 0 - 1222s git-debrebase get_differs f56efc03310335c2ac5ce92426d06b9285521dc5 b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 = 0x2 1222s git-debrebase classify b37fe95bb0b1442d16764feed887f45f0f7e234d $t=b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 @p f56efc03310335c2ac5ce92426d06b9285521dc5/0x2 1222s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "f56efc03310335c2ac5ce92426d06b9285521dc5","Ix" => 0}],"Hdr" => "tree b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9\nparent f56efc03310335c2ac5ce92426d06b9285521dc5\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","CommitId" => "b37fe95bb0b1442d16764feed887f45f0f7e234d","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9"} 1222s git-debrebase get_differs df6bd9a4a00482c1b1ff20f46460c55f82040227 b572e0b33b388437b34057c7e203744c52d82138 = 0x2 1222s git-debrebase classify f56efc03310335c2ac5ce92426d06b9285521dc5 $t=b572e0b33b388437b34057c7e203744c52d82138 @p df6bd9a4a00482c1b1ff20f46460c55f82040227/0x2 1222s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n","CommitId" => "f56efc03310335c2ac5ce92426d06b9285521dc5","Type" => "Upstream","Hdr" => "tree b572e0b33b388437b34057c7e203744c52d82138\nparent df6bd9a4a00482c1b1ff20f46460c55f82040227\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "df6bd9a4a00482c1b1ff20f46460c55f82040227","Ix" => 0}],"Tree" => "b572e0b33b388437b34057c7e203744c52d82138"} 1222s git-debrebase get_differs 7ecce5149f80ae53a4fdab476b04947659f39765 c26f8635f5a3d239ca949aa666feee09ab57e882 = 0x2 1222s git-debrebase classify df6bd9a4a00482c1b1ff20f46460c55f82040227 $t=c26f8635f5a3d239ca949aa666feee09ab57e882 @p 7ecce5149f80ae53a4fdab476b04947659f39765/0x2 1222s git-debrebase = Upstream {"Tree" => "c26f8635f5a3d239ca949aa666feee09ab57e882","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "7ecce5149f80ae53a4fdab476b04947659f39765","Ix" => 0}],"Hdr" => "tree c26f8635f5a3d239ca949aa666feee09ab57e882\nparent 7ecce5149f80ae53a4fdab476b04947659f39765\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","CommitId" => "df6bd9a4a00482c1b1ff20f46460c55f82040227"} 1222s git-debrebase get_differs 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 = 0x2 1222s git-debrebase classify 7ecce5149f80ae53a4fdab476b04947659f39765 $t=2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 @p 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450/0x2 1222s git-debrebase = Upstream {"Tree" => "2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6","Type" => "Upstream","Hdr" => "tree 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6\nparent 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "7ecce5149f80ae53a4fdab476b04947659f39765"} 1222s git-debrebase get_differs 9d77794ea8eca3fa78b8ee406128836771c7195f ced8034e4d13234deefc682b3523b0a9657f4e2a = 0x2 1222s git-debrebase classify 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 $t=ced8034e4d13234deefc682b3523b0a9657f4e2a @p 9d77794ea8eca3fa78b8ee406128836771c7195f/0x2 1222s git-debrebase = Upstream {"Tree" => "ced8034e4d13234deefc682b3523b0a9657f4e2a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450","Type" => "Upstream","Parents" => [{"CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Differs" => 2,"Ix" => 0}],"Hdr" => "tree ced8034e4d13234deefc682b3523b0a9657f4e2a\nparent 9d77794ea8eca3fa78b8ee406128836771c7195f\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n"} 1222s git-debrebase get_differs a7a1ce7990fecc564e8a5fa13896686b4a962d1c 9d383022823105715207a03601780dbceeb8ee4d = 0x10 1222s git-debrebase classify 9d77794ea8eca3fa78b8ee406128836771c7195f $t=9d383022823105715207a03601780dbceeb8ee4d @p a7a1ce7990fecc564e8a5fa13896686b4a962d1c/0x10 1222s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Differs" => 16}],"Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent a7a1ce7990fecc564e8a5fa13896686b4a962d1c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "9d383022823105715207a03601780dbceeb8ee4d"} 1222s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 1222s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 1222s git-debrebase classify a7a1ce7990fecc564e8a5fa13896686b4a962d1c $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1222s git-debrebase = Anchor {"Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Anchor","Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","OrigParents" => [{"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Differs" => 48,"Ix" => 1}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 2,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1222s git-debrebase *** WALK prep done cur=a7a1ce7990fecc564e8a5fa13896686b4a962d1c brw 0 upp 4 proc 6 pm -1 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1222s git-debrebase WALK REBUILD a7a1ce7990fecc564e8a5fa13896686b4a962d1c 7 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1222s git-debrebase WALK BUILD 9d77794ea8eca3fa78b8ee406128836771c7195f Debian (rewriting=0) 1222s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1222s git-debrebase WALK BUILD 7a5adf40f2ca5044cf8e1fd1cb0c13e073f88450 Upstream (rewriting=0) 1222s git-debrebase WALK BUILD 7ecce5149f80ae53a4fdab476b04947659f39765 Upstream (rewriting=0) 1222s git-debrebase WALK BUILD df6bd9a4a00482c1b1ff20f46460c55f82040227 Upstream (rewriting=0) 1222s git-debrebase WALK BUILD f56efc03310335c2ac5ce92426d06b9285521dc5 Upstream (rewriting=0) 1222s git-debrebase WALK BUILD b37fe95bb0b1442d16764feed887f45f0f7e234d Upstream (rewriting=0) 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1222s git-debrebase get_differs b37fe95bb0b1442d16764feed887f45f0f7e234d b37fe95bb0b1442d16764feed887f45f0f7e234d = 0 1222s git-debrebase *** WALK RETURN b37fe95bb0b1442d16764feed887f45f0f7e234d 9d77794ea8eca3fa78b8ee406128836771c7195f a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1222s git-debrebase mwrecknote left-input b37fe95bb0b1442d16764feed887f45f0f7e234d 1222s git-debrebase mwrecknote left-laundered b37fe95bb0b1442d16764feed887f45f0f7e234d 1222s git-debrebase mwrecknote left-breakwater 9d77794ea8eca3fa78b8ee406128836771c7195f 1222s git-debrebase mwrecknote left-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1222s git-debrebase MERGE BA best=a7a1ce7990fecc564e8a5fa13896686b4a962d1c p=a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1222s git-debrebase *** WALK 135f7e96337316f3887d7d4af0f44d83a3d08b8e 0 - 1222s git-debrebase get_differs a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0 1222s git-debrebase get_differs 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 1222s git-debrebase classify 135f7e96337316f3887d7d4af0f44d83a3d08b8e $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e/0 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca/0x2 1222s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"CommitId" => "a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e","Differs" => 0},"Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Parents" => [$VAR1->{"Contributor"},{"CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca","Differs" => 2,"Ix" => 1}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Overwritten" => [$VAR1->{"Parents"}[1]],"CommitId" => "135f7e96337316f3887d7d4af0f44d83a3d08b8e","Type" => "Pseudomerge","Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e\nparent 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1222s git-debrebase get_differs 06587090e7b2aa88e0fe178071070bbcf9bee291 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 1222s git-debrebase classify a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 06587090e7b2aa88e0fe178071070bbcf9bee291/0x2 1222s git-debrebase = Upstream {"Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 06587090e7b2aa88e0fe178071070bbcf9bee291\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "06587090e7b2aa88e0fe178071070bbcf9bee291"}],"Type" => "Upstream","CommitId" => "a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e","Msg" => "other-upstream-conflict\n"} 1222s git-debrebase get_differs 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x2 1222s git-debrebase classify 06587090e7b2aa88e0fe178071070bbcf9bee291 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p 722aeaa8fd6da2d6bc6212577cf13ed31bee9721/0x2 1222s git-debrebase = Upstream {"Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "722aeaa8fd6da2d6bc6212577cf13ed31bee9721"}],"Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent 722aeaa8fd6da2d6bc6212577cf13ed31bee9721\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","CommitId" => "06587090e7b2aa88e0fe178071070bbcf9bee291"} 1222s git-debrebase get_differs 2b64ed03b736658302f8c07540cf5031956d5d1c 42e8d18d3457ca5a51861bc7222aeb912c254975 = 0x2 1222s git-debrebase classify 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 $t=42e8d18d3457ca5a51861bc7222aeb912c254975 @p 2b64ed03b736658302f8c07540cf5031956d5d1c/0x2 1222s git-debrebase = Upstream {"Tree" => "42e8d18d3457ca5a51861bc7222aeb912c254975","Msg" => "UPSTREAM edit src-other.c (other)\n","CommitId" => "722aeaa8fd6da2d6bc6212577cf13ed31bee9721","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "2b64ed03b736658302f8c07540cf5031956d5d1c"}],"Hdr" => "tree 42e8d18d3457ca5a51861bc7222aeb912c254975\nparent 2b64ed03b736658302f8c07540cf5031956d5d1c\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1222s git-debrebase get_differs ab2b08ad554cddf9381bd5ad427c1086b496110e 303c71503c03080bda903ee6582757788559a305 = 0x2 1222s git-debrebase classify 2b64ed03b736658302f8c07540cf5031956d5d1c $t=303c71503c03080bda903ee6582757788559a305 @p ab2b08ad554cddf9381bd5ad427c1086b496110e/0x2 1222s git-debrebase = Upstream {"Tree" => "303c71503c03080bda903ee6582757788559a305","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ab2b08ad554cddf9381bd5ad427c1086b496110e"}],"Hdr" => "tree 303c71503c03080bda903ee6582757788559a305\nparent ab2b08ad554cddf9381bd5ad427c1086b496110e\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","CommitId" => "2b64ed03b736658302f8c07540cf5031956d5d1c"} 1222s git-debrebase get_differs cb272cd86f177289fa60b63dbaa569cf4722c90c af1d4b6b4512b3d286fe984aa34588e889c1ab24 = 0x2 1222s git-debrebase classify ab2b08ad554cddf9381bd5ad427c1086b496110e $t=af1d4b6b4512b3d286fe984aa34588e889c1ab24 @p cb272cd86f177289fa60b63dbaa569cf4722c90c/0x2 1222s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree af1d4b6b4512b3d286fe984aa34588e889c1ab24\nparent cb272cd86f177289fa60b63dbaa569cf4722c90c\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cb272cd86f177289fa60b63dbaa569cf4722c90c"}],"Msg" => "UPSTREAM edit src.c (before)\n","CommitId" => "ab2b08ad554cddf9381bd5ad427c1086b496110e","Tree" => "af1d4b6b4512b3d286fe984aa34588e889c1ab24"} 1222s git-debrebase get_differs d5061809fd55315a08ab262231259720230ddc0b ab36d5c8cc32b63c9defc9547dd01c490ca95683 = 0x2 1222s git-debrebase classify cb272cd86f177289fa60b63dbaa569cf4722c90c $t=ab36d5c8cc32b63c9defc9547dd01c490ca95683 @p d5061809fd55315a08ab262231259720230ddc0b/0x2 1222s git-debrebase = Upstream {"Tree" => "ab36d5c8cc32b63c9defc9547dd01c490ca95683","Type" => "Upstream","Hdr" => "tree ab36d5c8cc32b63c9defc9547dd01c490ca95683\nparent d5061809fd55315a08ab262231259720230ddc0b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "d5061809fd55315a08ab262231259720230ddc0b","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "cb272cd86f177289fa60b63dbaa569cf4722c90c"} 1222s git-debrebase get_differs da5983ce3ff475b408b17b89e1975df4de601fad 464d5b09357dd0b145bbecc8ee74810993c6b39e = 0x2 1222s git-debrebase classify d5061809fd55315a08ab262231259720230ddc0b $t=464d5b09357dd0b145bbecc8ee74810993c6b39e @p da5983ce3ff475b408b17b89e1975df4de601fad/0x2 1222s git-debrebase = Upstream {"Tree" => "464d5b09357dd0b145bbecc8ee74810993c6b39e","CommitId" => "d5061809fd55315a08ab262231259720230ddc0b","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "da5983ce3ff475b408b17b89e1975df4de601fad","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 464d5b09357dd0b145bbecc8ee74810993c6b39e\nparent da5983ce3ff475b408b17b89e1975df4de601fad\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream"} 1222s git-debrebase get_differs 247d69e2c498e57547983f4ac47559530666b403 8a6447a3fd229137f4a5385df6b80b9f96829b0b = 0x2 1222s git-debrebase classify da5983ce3ff475b408b17b89e1975df4de601fad $t=8a6447a3fd229137f4a5385df6b80b9f96829b0b @p 247d69e2c498e57547983f4ac47559530666b403/0x2 1222s git-debrebase = Upstream {"Hdr" => "tree 8a6447a3fd229137f4a5385df6b80b9f96829b0b\nparent 247d69e2c498e57547983f4ac47559530666b403\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Ix" => 0}],"Type" => "Upstream","CommitId" => "da5983ce3ff475b408b17b89e1975df4de601fad","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "8a6447a3fd229137f4a5385df6b80b9f96829b0b"} 1222s git-debrebase get_differs d2df4dc1f9d085dc7c84da339a37150425eedea7 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1222s git-debrebase classify 247d69e2c498e57547983f4ac47559530666b403 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p d2df4dc1f9d085dc7c84da339a37150425eedea7/0x20 1222s git-debrebase = Packaging {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Type" => "Packaging","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent d2df4dc1f9d085dc7c84da339a37150425eedea7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7"}],"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6"} 1222s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1222s git-debrebase classify d2df4dc1f9d085dc7c84da339a37150425eedea7 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1222s git-debrebase = Packaging {"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"}],"Type" => "Packaging","CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Msg" => "DEBIAN add zorkmid-other (other)\n"} 1222s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1222s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1222s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32,"Ix" => 0}]} 1222s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1222s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1222s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging","Parents" => [{"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "DEBIAN add zorkmid (before)\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"} 1222s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1222s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1222s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16}],"Type" => "Changelog","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1222s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1222s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1222s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1222s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1222s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1222s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1222s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16"},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1222s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 5 upp 8 proc 16 pm 0 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1222s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 17 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1222s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1222s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1222s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1222s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1222s git-debrebase WALK BUILD d2df4dc1f9d085dc7c84da339a37150425eedea7 Debian (rewriting=0) 1222s git-debrebase WALK BUILD 247d69e2c498e57547983f4ac47559530666b403 Debian (rewriting=0) 1222s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1222s git-debrebase WALK BUILD da5983ce3ff475b408b17b89e1975df4de601fad Upstream (rewriting=0) 1222s git-debrebase WALK BUILD d5061809fd55315a08ab262231259720230ddc0b Upstream (rewriting=0) 1222s git-debrebase WALK BUILD cb272cd86f177289fa60b63dbaa569cf4722c90c Upstream (rewriting=0) 1222s git-debrebase WALK BUILD ab2b08ad554cddf9381bd5ad427c1086b496110e Upstream (rewriting=0) 1222s git-debrebase WALK BUILD 2b64ed03b736658302f8c07540cf5031956d5d1c Upstream (rewriting=0) 1222s git-debrebase WALK BUILD 722aeaa8fd6da2d6bc6212577cf13ed31bee9721 Upstream (rewriting=0) 1222s git-debrebase WALK BUILD 06587090e7b2aa88e0fe178071070bbcf9bee291 Upstream (rewriting=0) 1222s git-debrebase WALK BUILD a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e Upstream (rewriting=0) 1222s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1222s git-debrebase get_differs a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 135f7e96337316f3887d7d4af0f44d83a3d08b8e = 0 1222s git-debrebase *** WALK RETURN a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 247d69e2c498e57547983f4ac47559530666b403 48c55fcd6aad3671faeeedd232289eea48db8cce 1222s git-debrebase mwrecknote right-input 135f7e96337316f3887d7d4af0f44d83a3d08b8e 1222s git-debrebase mwrecknote right-laundered a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e 1222s git-debrebase mwrecknote right-breakwater 247d69e2c498e57547983f4ac47559530666b403 1222s git-debrebase mwrecknote right-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1222s git-debrebase MERGE BA best=a7a1ce7990fecc564e8a5fa13896686b4a962d1c p=48c55fcd6aad3671faeeedd232289eea48db8cce 1222s git-debrebase mwrecknote result-anchor a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1222s git-debrebase mwrecknote interchange-mbcand-ok-0 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1222s git-debrebase *** WALK 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 0 - 1222s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1222s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1222s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"} 1222s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1222s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1222s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32}],"Msg" => "DEBIAN add zorkmid (before)\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 1222s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1222s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1222s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"} 1222s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1222s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1222s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1222s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1222s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1222s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1222s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48}],"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1222s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 3 upp -1 proc 4 pm -1 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1222s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 5 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1222s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1222s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1222s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1222s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1222s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1222s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 = 0 1222s git-debrebase *** WALK RETURN 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 48c55fcd6aad3671faeeedd232289eea48db8cce 1222s git-debrebase mwrecknote mergebase-laundered 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1222s git-debrebase mwrecknote mergebase-breakwater 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1222s git-debrebase mwrecknote mergebase-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1222s git-debrebase *** WALK prep done cur=fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 brw 0 upp 1 proc 2 pm 0 1222s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1223s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1223s git-debrebase WALK REBUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 3 1223s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1223s git-debrebase WALK BUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 MergeCreateMergedBreakwaters (rewriting=0) 1223s Found a general merge, will try to tidy it up. 1223s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1223s git-debrebase WALK BUILD fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 MergeMergeSeries (rewriting=1) 1223s Using supplied resolution for fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7... 1223s git-debrebase mwrecknote cached-resolution e74be556fc3fe9f1afb626685a970c70e5730b69 1223s git-debrebase get_differs e74be556fc3fe9f1afb626685a970c70e5730b69 64f3a6f001f9d164d170f660f8927b3e92ace3df = 0 1223s git-debrebase get_differs e74be556fc3fe9f1afb626685a970c70e5730b69 fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 = 0 1223s Merge resolution successful. 1223s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1223s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1223s git-debrebase get_differs e74be556fc3fe9f1afb626685a970c70e5730b69 64f3a6f001f9d164d170f660f8927b3e92ace3df = 0 1223s git-debrebase *** WALK RETURN e74be556fc3fe9f1afb626685a970c70e5730b69 22b123696189139d3f8c13fd184084505d435471 a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1223s git-debrebase: laundered (head was 64f3a6f001f9d164d170f660f8927b3e92ace3df) 1223s git-debrebase |> 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/interchange-mbcand-ok-0 1223s git-debrebase |> a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/left-anchor 1223s git-debrebase |> 9d77794ea8eca3fa78b8ee406128836771c7195f commit refs/debrebase/wreckage/left-breakwater 1223s git-debrebase |> b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-input 1223s git-debrebase |> b37fe95bb0b1442d16764feed887f45f0f7e234d commit refs/debrebase/wreckage/left-laundered 1223s git-debrebase |> a9738332ccab240ed5754572526f03d01974ec1b commit refs/debrebase/wreckage/left-patchqueue 1223s git-debrebase |> 48c55fcd6aad3671faeeedd232289eea48db8cce commit refs/debrebase/wreckage/mergebase-anchor 1223s git-debrebase |> 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/mergebase-breakwater 1223s git-debrebase |> 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 commit refs/debrebase/wreckage/mergebase-laundered 1223s git-debrebase |> 29cd144e0ff448f3434711ecbfd9056d754fc4aa commit refs/debrebase/wreckage/mergebase-patchqueue 1223s git-debrebase |> b4310a884a38ef6aa895034fde6edac63cebc707 commit refs/debrebase/wreckage/merged-patchqueue 1223s git-debrebase |> 22b123696189139d3f8c13fd184084505d435471 commit refs/debrebase/wreckage/new-base 1223s git-debrebase |> a7a1ce7990fecc564e8a5fa13896686b4a962d1c commit refs/debrebase/wreckage/result-anchor 1223s git-debrebase |> 48c55fcd6aad3671faeeedd232289eea48db8cce commit refs/debrebase/wreckage/right-anchor 1223s git-debrebase |> 247d69e2c498e57547983f4ac47559530666b403 commit refs/debrebase/wreckage/right-breakwater 1223s git-debrebase |> 135f7e96337316f3887d7d4af0f44d83a3d08b8e commit refs/debrebase/wreckage/right-input 1223s git-debrebase |> a4e3ec26fa72ccf2428add4c86036d04c4ce0e9e commit refs/debrebase/wreckage/right-laundered 1223s git-debrebase |> 6577a293562429dbf61ac6d02c4a6124e13c8402 commit refs/debrebase/wreckage/right-patchqueue 1223s git-debrebase |> fa45d1acdc2a3c4ff49425825d8cb284f8ee14a7 commit refs/debrebase/wreckage/vanilla-merge 1223s git-debrebase >= update refs/ffq-prev/heads/master 64f3a6f001f9d164d170f660f8927b3e92ace3df 0000000000000000000000000000000000000000 1223s git-debrebase >= delete refs/debrebase-last/heads/master 1223s git-debrebase >= update HEAD e74be556fc3fe9f1afb626685a970c70e5730b69 64f3a6f001f9d164d170f660f8927b3e92ace3df 1223s git-debrebase >= delete refs/debrebase/wreckage/interchange-mbcand-ok-0 1223s git-debrebase >= delete refs/debrebase/wreckage/left-anchor 1223s git-debrebase >= delete refs/debrebase/wreckage/left-breakwater 1223s git-debrebase >= delete refs/debrebase/wreckage/left-input 1223s git-debrebase >= delete refs/debrebase/wreckage/left-laundered 1223s git-debrebase >= delete refs/debrebase/wreckage/left-patchqueue 1223s git-debrebase >= delete refs/debrebase/wreckage/mergebase-anchor 1223s git-debrebase >= delete refs/debrebase/wreckage/mergebase-breakwater 1223s git-debrebase >= delete refs/debrebase/wreckage/mergebase-laundered 1223s git-debrebase >= delete refs/debrebase/wreckage/mergebase-patchqueue 1223s git-debrebase >= delete refs/debrebase/wreckage/merged-patchqueue 1223s git-debrebase >= delete refs/debrebase/wreckage/new-base 1223s git-debrebase >= delete refs/debrebase/wreckage/result-anchor 1223s git-debrebase >= delete refs/debrebase/wreckage/right-anchor 1223s git-debrebase >= delete refs/debrebase/wreckage/right-breakwater 1223s git-debrebase >= delete refs/debrebase/wreckage/right-input 1223s git-debrebase >= delete refs/debrebase/wreckage/right-laundered 1223s git-debrebase >= delete refs/debrebase/wreckage/right-patchqueue 1223s git-debrebase >= delete refs/debrebase/wreckage/vanilla-merge 1223s git-debrebase >$ 1223s Recorded previous head for preservation 1223s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1223s ' 1223s + t-gdr-good laundered 1223s + local state=laundered 1223s + local beforetag= 1223s + case $state in 1223s + git diff --quiet -- :. ':!debian/patches' 1223s + LC_MESSAGES=C 1223s + t-git-debrebase status 1223s + local gdr=git-debrebase 1223s + : ' 1223s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1223s + git-debrebase --dgit=dgit -D --experimental-merge-resolution status 1223s git-debrebase get_differs f245e3515f23de3098b899e5e605250502795a26 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x2 1223s git-debrebase classify e74be556fc3fe9f1afb626685a970c70e5730b69 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p f245e3515f23de3098b899e5e605250502795a26/0x2 1223s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent f245e3515f23de3098b899e5e605250502795a26\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","CommitId" => "e74be556fc3fe9f1afb626685a970c70e5730b69","Parents" => [{"Differs" => 2,"CommitId" => "f245e3515f23de3098b899e5e605250502795a26","Ix" => 0}],"Msg" => "other-upstream-conflict\n\n\nGbp-Pq: Name 0008-other-upstream-conflict.patch"} 1223s git-debrebase get_differs f141674269dcaeff40a6ed8fb701eb69e5c5c913 e74d768e2fd245b6e9eb2d67f913521fda692f32 = 0x2 1223s git-debrebase classify f245e3515f23de3098b899e5e605250502795a26 $t=e74d768e2fd245b6e9eb2d67f913521fda692f32 @p f141674269dcaeff40a6ed8fb701eb69e5c5c913/0x2 1223s git-debrebase = Upstream {"CommitId" => "f245e3515f23de3098b899e5e605250502795a26","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","Parents" => [{"CommitId" => "f141674269dcaeff40a6ed8fb701eb69e5c5c913","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Hdr" => "tree e74d768e2fd245b6e9eb2d67f913521fda692f32\nparent f141674269dcaeff40a6ed8fb701eb69e5c5c913\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "e74d768e2fd245b6e9eb2d67f913521fda692f32"} 1223s git-debrebase get_differs 94bba6651ceecbcc6ba606618115f0347bcb9977 9fae2fead150e86c052c8bca251cd3cbce6c3143 = 0x2 1223s git-debrebase classify f141674269dcaeff40a6ed8fb701eb69e5c5c913 $t=9fae2fead150e86c052c8bca251cd3cbce6c3143 @p 94bba6651ceecbcc6ba606618115f0347bcb9977/0x2 1223s git-debrebase = Upstream {"CommitId" => "f141674269dcaeff40a6ed8fb701eb69e5c5c913","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Parents" => [{"Differs" => 2,"CommitId" => "94bba6651ceecbcc6ba606618115f0347bcb9977","Ix" => 0}],"Hdr" => "tree 9fae2fead150e86c052c8bca251cd3cbce6c3143\nparent 94bba6651ceecbcc6ba606618115f0347bcb9977\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Tree" => "9fae2fead150e86c052c8bca251cd3cbce6c3143"} 1223s git-debrebase get_differs 429bffb98dad51ed936c39e851b6c498268afe97 ab66256bb5fcabec3f3366cc8f26948f314c7b4f = 0x2 1223s git-debrebase classify 94bba6651ceecbcc6ba606618115f0347bcb9977 $t=ab66256bb5fcabec3f3366cc8f26948f314c7b4f @p 429bffb98dad51ed936c39e851b6c498268afe97/0x2 1223s git-debrebase = Upstream {"CommitId" => "94bba6651ceecbcc6ba606618115f0347bcb9977","Parents" => [{"Differs" => 2,"CommitId" => "429bffb98dad51ed936c39e851b6c498268afe97","Ix" => 0}],"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","Hdr" => "tree ab66256bb5fcabec3f3366cc8f26948f314c7b4f\nparent 429bffb98dad51ed936c39e851b6c498268afe97\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "ab66256bb5fcabec3f3366cc8f26948f314c7b4f"} 1223s git-debrebase get_differs 45d523efbc91fbf56d299448f11742cc9e72b808 acda5093779293801e00d8395f1bc1e4dbdf8ac6 = 0x2 1223s git-debrebase classify 429bffb98dad51ed936c39e851b6c498268afe97 $t=acda5093779293801e00d8395f1bc1e4dbdf8ac6 @p 45d523efbc91fbf56d299448f11742cc9e72b808/0x2 1223s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Parents" => [{"Ix" => 0,"CommitId" => "45d523efbc91fbf56d299448f11742cc9e72b808","Differs" => 2}],"CommitId" => "429bffb98dad51ed936c39e851b6c498268afe97","Tree" => "acda5093779293801e00d8395f1bc1e4dbdf8ac6","Hdr" => "tree acda5093779293801e00d8395f1bc1e4dbdf8ac6\nparent 45d523efbc91fbf56d299448f11742cc9e72b808\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream"} 1223s git-debrebase get_differs 463e089938bf739cea12ba66ca5bd60bd6260c64 5190ac16a0511ad70c1228457fe154cb28d0eb3a = 0x2 1223s git-debrebase classify 45d523efbc91fbf56d299448f11742cc9e72b808 $t=5190ac16a0511ad70c1228457fe154cb28d0eb3a @p 463e089938bf739cea12ba66ca5bd60bd6260c64/0x2 1223s git-debrebase = Upstream {"Tree" => "5190ac16a0511ad70c1228457fe154cb28d0eb3a","Type" => "Upstream","Hdr" => "tree 5190ac16a0511ad70c1228457fe154cb28d0eb3a\nparent 463e089938bf739cea12ba66ca5bd60bd6260c64\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" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "463e089938bf739cea12ba66ca5bd60bd6260c64"}],"CommitId" => "45d523efbc91fbf56d299448f11742cc9e72b808"} 1223s git-debrebase get_differs 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 = 0x2 1223s git-debrebase classify 463e089938bf739cea12ba66ca5bd60bd6260c64 $t=cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 @p 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f/0x2 1223s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "7f5b7c92614b47ad2317d9ef00470fdfad1bd07f"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "463e089938bf739cea12ba66ca5bd60bd6260c64","Tree" => "cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93","Type" => "Upstream","Hdr" => "tree cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93\nparent 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n"} 1223s git-debrebase get_differs 22b123696189139d3f8c13fd184084505d435471 1e3c72379ce937e21ac991edbaef98058a509e20 = 0x2 1223s git-debrebase classify 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f $t=1e3c72379ce937e21ac991edbaef98058a509e20 @p 22b123696189139d3f8c13fd184084505d435471/0x2 1223s git-debrebase = Upstream {"CommitId" => "7f5b7c92614b47ad2317d9ef00470fdfad1bd07f","Parents" => [{"Ix" => 0,"CommitId" => "22b123696189139d3f8c13fd184084505d435471","Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 1e3c72379ce937e21ac991edbaef98058a509e20\nparent 22b123696189139d3f8c13fd184084505d435471\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Tree" => "1e3c72379ce937e21ac991edbaef98058a509e20"} 1223s git-debrebase get_differs 9d77794ea8eca3fa78b8ee406128836771c7195f 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x20 1223s git-debrebase get_differs 247d69e2c498e57547983f4ac47559530666b403 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x12 1223s git-debrebase classify 22b123696189139d3f8c13fd184084505d435471 $t=19be1dc2921e8842dafec024eb89b0268a9a988f @p 9d77794ea8eca3fa78b8ee406128836771c7195f/0x20 247d69e2c498e57547983f4ac47559530666b403/0x12 1223s git-debrebase = MergedBreakwaters {"Tree" => "19be1dc2921e8842dafec024eb89b0268a9a988f","Type" => "MergedBreakwaters","Hdr" => "tree 19be1dc2921e8842dafec024eb89b0268a9a988f\nparent 9d77794ea8eca3fa78b8ee406128836771c7195f\nparent 247d69e2c498e57547983f4ac47559530666b403\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"IsOrigin" => "","IsDgitImport" => undef,"CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Differs" => 32,"Ix" => 0},{"IsOrigin" => "","IsDgitImport" => undef,"CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Differs" => 18,"Ix" => 1}],"Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","CommitId" => "22b123696189139d3f8c13fd184084505d435471"} 1223s git-debrebase get_differs a7a1ce7990fecc564e8a5fa13896686b4a962d1c 9d383022823105715207a03601780dbceeb8ee4d = 0x10 1223s git-debrebase classify 9d77794ea8eca3fa78b8ee406128836771c7195f $t=9d383022823105715207a03601780dbceeb8ee4d @p a7a1ce7990fecc564e8a5fa13896686b4a962d1c/0x10 1223s git-debrebase = Changelog {"CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Parents" => [{"Differs" => 16,"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Ix" => 0}],"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent a7a1ce7990fecc564e8a5fa13896686b4a962d1c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Changelog","Tree" => "9d383022823105715207a03601780dbceeb8ee4d"} 1223s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 1223s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 1223s git-debrebase classify a7a1ce7990fecc564e8a5fa13896686b4a962d1c $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1223s git-debrebase = Anchor {"Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 2,"Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da"}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Anchor"} 1223s git-debrebase get_differs d2df4dc1f9d085dc7c84da339a37150425eedea7 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1223s git-debrebase classify 247d69e2c498e57547983f4ac47559530666b403 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p d2df4dc1f9d085dc7c84da339a37150425eedea7/0x20 1223s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7"}],"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent d2df4dc1f9d085dc7c84da339a37150425eedea7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Packaging"} 1223s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1223s git-debrebase classify d2df4dc1f9d085dc7c84da339a37150425eedea7 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1223s git-debrebase = Packaging {"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"}],"Msg" => "DEBIAN add zorkmid-other (other)\n","Type" => "Packaging","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c"} 1223s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1223s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1223s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"} 1223s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1223s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1223s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32}]} 1223s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1223s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1223s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Ix" => 0}],"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"} 1223s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1223s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1223s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Differs" => 16}],"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1223s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1223s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1223s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1223s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16"},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1223s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1223s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1223s ' 1223s + case $state in 1223s + egrep '^ *branch is laundered' ../status.check 1223s branch is laundered 1223s + t-gdr-good-analyse HEAD laundered 1223s + local head=HEAD 1223s + local state=laundered 1223s + local wsfx= 1223s + local etypes bwtip 1223s + case $state in 1223s + etypes=Upstream 1223s ++ t-git-debrebase breakwater 1223s ++ local gdr=git-debrebase 1223s ++ : ' 1223s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1223s ++ git-debrebase --dgit=dgit -D --experimental-merge-resolution breakwater 1223s git-debrebase get_differs f245e3515f23de3098b899e5e605250502795a26 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x2 1223s git-debrebase classify e74be556fc3fe9f1afb626685a970c70e5730b69 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p f245e3515f23de3098b899e5e605250502795a26/0x2 1223s git-debrebase = Upstream {"CommitId" => "e74be556fc3fe9f1afb626685a970c70e5730b69","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent f245e3515f23de3098b899e5e605250502795a26\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Msg" => "other-upstream-conflict\n\n\nGbp-Pq: Name 0008-other-upstream-conflict.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f245e3515f23de3098b899e5e605250502795a26"}]} 1223s git-debrebase get_differs f141674269dcaeff40a6ed8fb701eb69e5c5c913 e74d768e2fd245b6e9eb2d67f913521fda692f32 = 0x2 1223s git-debrebase classify f245e3515f23de3098b899e5e605250502795a26 $t=e74d768e2fd245b6e9eb2d67f913521fda692f32 @p f141674269dcaeff40a6ed8fb701eb69e5c5c913/0x2 1223s 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","Parents" => [{"CommitId" => "f141674269dcaeff40a6ed8fb701eb69e5c5c913","Differs" => 2,"Ix" => 0}],"CommitId" => "f245e3515f23de3098b899e5e605250502795a26","Tree" => "e74d768e2fd245b6e9eb2d67f913521fda692f32","Hdr" => "tree e74d768e2fd245b6e9eb2d67f913521fda692f32\nparent f141674269dcaeff40a6ed8fb701eb69e5c5c913\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1223s git-debrebase get_differs 94bba6651ceecbcc6ba606618115f0347bcb9977 9fae2fead150e86c052c8bca251cd3cbce6c3143 = 0x2 1223s git-debrebase classify f141674269dcaeff40a6ed8fb701eb69e5c5c913 $t=9fae2fead150e86c052c8bca251cd3cbce6c3143 @p 94bba6651ceecbcc6ba606618115f0347bcb9977/0x2 1223s git-debrebase = Upstream {"Hdr" => "tree 9fae2fead150e86c052c8bca251cd3cbce6c3143\nparent 94bba6651ceecbcc6ba606618115f0347bcb9977\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "9fae2fead150e86c052c8bca251cd3cbce6c3143","CommitId" => "f141674269dcaeff40a6ed8fb701eb69e5c5c913","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "94bba6651ceecbcc6ba606618115f0347bcb9977"}],"Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Type" => "Upstream"} 1223s git-debrebase get_differs 429bffb98dad51ed936c39e851b6c498268afe97 ab66256bb5fcabec3f3366cc8f26948f314c7b4f = 0x2 1223s git-debrebase classify 94bba6651ceecbcc6ba606618115f0347bcb9977 $t=ab66256bb5fcabec3f3366cc8f26948f314c7b4f @p 429bffb98dad51ed936c39e851b6c498268afe97/0x2 1223s git-debrebase = Upstream {"Hdr" => "tree ab66256bb5fcabec3f3366cc8f26948f314c7b4f\nparent 429bffb98dad51ed936c39e851b6c498268afe97\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "94bba6651ceecbcc6ba606618115f0347bcb9977","Tree" => "ab66256bb5fcabec3f3366cc8f26948f314c7b4f","Parents" => [{"CommitId" => "429bffb98dad51ed936c39e851b6c498268afe97","Ix" => 0,"Differs" => 2}],"Type" => "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"} 1223s git-debrebase get_differs 45d523efbc91fbf56d299448f11742cc9e72b808 acda5093779293801e00d8395f1bc1e4dbdf8ac6 = 0x2 1223s git-debrebase classify 429bffb98dad51ed936c39e851b6c498268afe97 $t=acda5093779293801e00d8395f1bc1e4dbdf8ac6 @p 45d523efbc91fbf56d299448f11742cc9e72b808/0x2 1223s git-debrebase = Upstream {"CommitId" => "429bffb98dad51ed936c39e851b6c498268afe97","Tree" => "acda5093779293801e00d8395f1bc1e4dbdf8ac6","Hdr" => "tree acda5093779293801e00d8395f1bc1e4dbdf8ac6\nparent 45d523efbc91fbf56d299448f11742cc9e72b808\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","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "45d523efbc91fbf56d299448f11742cc9e72b808"}]} 1223s git-debrebase get_differs 463e089938bf739cea12ba66ca5bd60bd6260c64 5190ac16a0511ad70c1228457fe154cb28d0eb3a = 0x2 1223s git-debrebase classify 45d523efbc91fbf56d299448f11742cc9e72b808 $t=5190ac16a0511ad70c1228457fe154cb28d0eb3a @p 463e089938bf739cea12ba66ca5bd60bd6260c64/0x2 1223s git-debrebase = Upstream {"Hdr" => "tree 5190ac16a0511ad70c1228457fe154cb28d0eb3a\nparent 463e089938bf739cea12ba66ca5bd60bd6260c64\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "5190ac16a0511ad70c1228457fe154cb28d0eb3a","CommitId" => "45d523efbc91fbf56d299448f11742cc9e72b808","Parents" => [{"CommitId" => "463e089938bf739cea12ba66ca5bd60bd6260c64","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1223s git-debrebase get_differs 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 = 0x2 1223s git-debrebase classify 463e089938bf739cea12ba66ca5bd60bd6260c64 $t=cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 @p 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f/0x2 1223s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "7f5b7c92614b47ad2317d9ef00470fdfad1bd07f","Ix" => 0,"Differs" => 2}],"Tree" => "cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93","CommitId" => "463e089938bf739cea12ba66ca5bd60bd6260c64","Hdr" => "tree cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93\nparent 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n"} 1223s git-debrebase get_differs 22b123696189139d3f8c13fd184084505d435471 1e3c72379ce937e21ac991edbaef98058a509e20 = 0x2 1223s git-debrebase classify 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f $t=1e3c72379ce937e21ac991edbaef98058a509e20 @p 22b123696189139d3f8c13fd184084505d435471/0x2 1223s git-debrebase = Upstream {"Tree" => "1e3c72379ce937e21ac991edbaef98058a509e20","CommitId" => "7f5b7c92614b47ad2317d9ef00470fdfad1bd07f","Hdr" => "tree 1e3c72379ce937e21ac991edbaef98058a509e20\nparent 22b123696189139d3f8c13fd184084505d435471\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "22b123696189139d3f8c13fd184084505d435471","Ix" => 0,"Differs" => 2}]} 1223s git-debrebase get_differs 9d77794ea8eca3fa78b8ee406128836771c7195f 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x20 1223s git-debrebase get_differs 247d69e2c498e57547983f4ac47559530666b403 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x12 1223s git-debrebase classify 22b123696189139d3f8c13fd184084505d435471 $t=19be1dc2921e8842dafec024eb89b0268a9a988f @p 9d77794ea8eca3fa78b8ee406128836771c7195f/0x20 247d69e2c498e57547983f4ac47559530666b403/0x12 1223s git-debrebase = MergedBreakwaters {"Type" => "MergedBreakwaters","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","Parents" => [{"CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","IsOrigin" => "","Ix" => 0,"Differs" => 32,"IsDgitImport" => undef},{"Ix" => 1,"Differs" => 18,"IsDgitImport" => undef,"CommitId" => "247d69e2c498e57547983f4ac47559530666b403","IsOrigin" => ""}],"CommitId" => "22b123696189139d3f8c13fd184084505d435471","Tree" => "19be1dc2921e8842dafec024eb89b0268a9a988f","Hdr" => "tree 19be1dc2921e8842dafec024eb89b0268a9a988f\nparent 9d77794ea8eca3fa78b8ee406128836771c7195f\nparent 247d69e2c498e57547983f4ac47559530666b403\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1223s git-debrebase get_differs a7a1ce7990fecc564e8a5fa13896686b4a962d1c 9d383022823105715207a03601780dbceeb8ee4d = 0x10 1223s git-debrebase classify 9d77794ea8eca3fa78b8ee406128836771c7195f $t=9d383022823105715207a03601780dbceeb8ee4d @p a7a1ce7990fecc564e8a5fa13896686b4a962d1c/0x10 1223s git-debrebase = Changelog {"Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent a7a1ce7990fecc564e8a5fa13896686b4a962d1c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "9d383022823105715207a03601780dbceeb8ee4d","CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c"}],"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog"} 1223s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 1223s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 1223s git-debrebase classify a7a1ce7990fecc564e8a5fa13896686b4a962d1c $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1223s git-debrebase = Anchor {"Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Anchor","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da"}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"},$VAR1->{"OrigParents"}[0]],"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314"} 1223s git-debrebase get_differs d2df4dc1f9d085dc7c84da339a37150425eedea7 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1223s git-debrebase classify 247d69e2c498e57547983f4ac47559530666b403 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p d2df4dc1f9d085dc7c84da339a37150425eedea7/0x20 1223s git-debrebase = Packaging {"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent d2df4dc1f9d085dc7c84da339a37150425eedea7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Packaging","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Ix" => 0,"Differs" => 32}]} 1223s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1223s git-debrebase classify d2df4dc1f9d085dc7c84da339a37150425eedea7 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1223s git-debrebase = Packaging {"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid-other (other)\n","Type" => "Packaging"} 1223s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1223s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1223s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 1223s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1223s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1223s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 1223s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1223s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1223s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"}]} 1223s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1223s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1223s 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" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1223s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1223s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1223s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1223s git-debrebase = Anchor {"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48,"Ix" => 1}],"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" => "23886cf8bbaefa175a2403d6556564175e096c16"},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1223s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1223s ' 1223s + bwtip=Y:22b123696189139d3f8c13fd184084505d435471 1223s + anal=../anal 1223s + t-git-debrebase analyse HEAD 1223s + local gdr=git-debrebase 1223s + : ' 1223s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1223s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse HEAD 1223s git-debrebase *** WALK e74be556fc3fe9f1afb626685a970c70e5730b69 1 *main::STDOUT 1223s git-debrebase get_differs f245e3515f23de3098b899e5e605250502795a26 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x2 1223s git-debrebase classify e74be556fc3fe9f1afb626685a970c70e5730b69 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p f245e3515f23de3098b899e5e605250502795a26/0x2 1223s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f245e3515f23de3098b899e5e605250502795a26"}],"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent f245e3515f23de3098b899e5e605250502795a26\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "e74be556fc3fe9f1afb626685a970c70e5730b69","Msg" => "other-upstream-conflict\n\n\nGbp-Pq: Name 0008-other-upstream-conflict.patch"} 1223s git-debrebase get_differs f141674269dcaeff40a6ed8fb701eb69e5c5c913 e74d768e2fd245b6e9eb2d67f913521fda692f32 = 0x2 1223s git-debrebase classify f245e3515f23de3098b899e5e605250502795a26 $t=e74d768e2fd245b6e9eb2d67f913521fda692f32 @p f141674269dcaeff40a6ed8fb701eb69e5c5c913/0x2 1223s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "f141674269dcaeff40a6ed8fb701eb69e5c5c913","Ix" => 0,"Differs" => 2}],"Tree" => "e74d768e2fd245b6e9eb2d67f913521fda692f32","Hdr" => "tree e74d768e2fd245b6e9eb2d67f913521fda692f32\nparent f141674269dcaeff40a6ed8fb701eb69e5c5c913\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "f245e3515f23de3098b899e5e605250502795a26","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"} 1223s git-debrebase get_differs 94bba6651ceecbcc6ba606618115f0347bcb9977 9fae2fead150e86c052c8bca251cd3cbce6c3143 = 0x2 1223s git-debrebase classify f141674269dcaeff40a6ed8fb701eb69e5c5c913 $t=9fae2fead150e86c052c8bca251cd3cbce6c3143 @p 94bba6651ceecbcc6ba606618115f0347bcb9977/0x2 1223s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "9fae2fead150e86c052c8bca251cd3cbce6c3143","Parents" => [{"Differs" => 2,"CommitId" => "94bba6651ceecbcc6ba606618115f0347bcb9977","Ix" => 0}],"Hdr" => "tree 9fae2fead150e86c052c8bca251cd3cbce6c3143\nparent 94bba6651ceecbcc6ba606618115f0347bcb9977\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "f141674269dcaeff40a6ed8fb701eb69e5c5c913","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch"} 1223s git-debrebase get_differs 429bffb98dad51ed936c39e851b6c498268afe97 ab66256bb5fcabec3f3366cc8f26948f314c7b4f = 0x2 1223s git-debrebase classify 94bba6651ceecbcc6ba606618115f0347bcb9977 $t=ab66256bb5fcabec3f3366cc8f26948f314c7b4f @p 429bffb98dad51ed936c39e851b6c498268afe97/0x2 1223s git-debrebase = Upstream {"CommitId" => "94bba6651ceecbcc6ba606618115f0347bcb9977","Hdr" => "tree ab66256bb5fcabec3f3366cc8f26948f314c7b4f\nparent 429bffb98dad51ed936c39e851b6c498268afe97\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\nGbp-Pq: Name 0005-MIXED-add-both-before.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "429bffb98dad51ed936c39e851b6c498268afe97"}],"Tree" => "ab66256bb5fcabec3f3366cc8f26948f314c7b4f","Type" => "Upstream"} 1223s git-debrebase get_differs 45d523efbc91fbf56d299448f11742cc9e72b808 acda5093779293801e00d8395f1bc1e4dbdf8ac6 = 0x2 1223s git-debrebase classify 429bffb98dad51ed936c39e851b6c498268afe97 $t=acda5093779293801e00d8395f1bc1e4dbdf8ac6 @p 45d523efbc91fbf56d299448f11742cc9e72b808/0x2 1223s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Hdr" => "tree acda5093779293801e00d8395f1bc1e4dbdf8ac6\nparent 45d523efbc91fbf56d299448f11742cc9e72b808\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "429bffb98dad51ed936c39e851b6c498268afe97","Type" => "Upstream","Tree" => "acda5093779293801e00d8395f1bc1e4dbdf8ac6","Parents" => [{"Ix" => 0,"CommitId" => "45d523efbc91fbf56d299448f11742cc9e72b808","Differs" => 2}]} 1223s git-debrebase get_differs 463e089938bf739cea12ba66ca5bd60bd6260c64 5190ac16a0511ad70c1228457fe154cb28d0eb3a = 0x2 1223s git-debrebase classify 45d523efbc91fbf56d299448f11742cc9e72b808 $t=5190ac16a0511ad70c1228457fe154cb28d0eb3a @p 463e089938bf739cea12ba66ca5bd60bd6260c64/0x2 1223s git-debrebase = Upstream {"CommitId" => "45d523efbc91fbf56d299448f11742cc9e72b808","Hdr" => "tree 5190ac16a0511ad70c1228457fe154cb28d0eb3a\nparent 463e089938bf739cea12ba66ca5bd60bd6260c64\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" => "463e089938bf739cea12ba66ca5bd60bd6260c64"}],"Tree" => "5190ac16a0511ad70c1228457fe154cb28d0eb3a","Type" => "Upstream"} 1223s git-debrebase get_differs 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 = 0x2 1223s git-debrebase classify 463e089938bf739cea12ba66ca5bd60bd6260c64 $t=cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 @p 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f/0x2 1223s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "463e089938bf739cea12ba66ca5bd60bd6260c64","Hdr" => "tree cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93\nparent 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "7f5b7c92614b47ad2317d9ef00470fdfad1bd07f"}],"Tree" => "cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93","Type" => "Upstream"} 1223s git-debrebase get_differs 22b123696189139d3f8c13fd184084505d435471 1e3c72379ce937e21ac991edbaef98058a509e20 = 0x2 1223s git-debrebase classify 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f $t=1e3c72379ce937e21ac991edbaef98058a509e20 @p 22b123696189139d3f8c13fd184084505d435471/0x2 1223s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "22b123696189139d3f8c13fd184084505d435471"}],"Tree" => "1e3c72379ce937e21ac991edbaef98058a509e20","Type" => "Upstream","CommitId" => "7f5b7c92614b47ad2317d9ef00470fdfad1bd07f","Hdr" => "tree 1e3c72379ce937e21ac991edbaef98058a509e20\nparent 22b123696189139d3f8c13fd184084505d435471\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"} 1223s git-debrebase get_differs 9d77794ea8eca3fa78b8ee406128836771c7195f 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x20 1223s git-debrebase get_differs 247d69e2c498e57547983f4ac47559530666b403 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x12 1223s git-debrebase classify 22b123696189139d3f8c13fd184084505d435471 $t=19be1dc2921e8842dafec024eb89b0268a9a988f @p 9d77794ea8eca3fa78b8ee406128836771c7195f/0x20 247d69e2c498e57547983f4ac47559530666b403/0x12 1223s git-debrebase = MergedBreakwaters {"Type" => "MergedBreakwaters","Parents" => [{"CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","IsOrigin" => "","Ix" => 0,"Differs" => 32,"IsDgitImport" => undef},{"IsDgitImport" => undef,"Differs" => 18,"Ix" => 1,"IsOrigin" => "","CommitId" => "247d69e2c498e57547983f4ac47559530666b403"}],"Tree" => "19be1dc2921e8842dafec024eb89b0268a9a988f","Hdr" => "tree 19be1dc2921e8842dafec024eb89b0268a9a988f\nparent 9d77794ea8eca3fa78b8ee406128836771c7195f\nparent 247d69e2c498e57547983f4ac47559530666b403\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "22b123696189139d3f8c13fd184084505d435471","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n"} 1223s git-debrebase get_differs a7a1ce7990fecc564e8a5fa13896686b4a962d1c 9d383022823105715207a03601780dbceeb8ee4d = 0x10 1223s git-debrebase classify 9d77794ea8eca3fa78b8ee406128836771c7195f $t=9d383022823105715207a03601780dbceeb8ee4d @p a7a1ce7990fecc564e8a5fa13896686b4a962d1c/0x10 1223s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent a7a1ce7990fecc564e8a5fa13896686b4a962d1c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c"}],"Type" => "Changelog"} 1223s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 1223s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 1223s git-debrebase classify a7a1ce7990fecc564e8a5fa13896686b4a962d1c $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1223s git-debrebase = Anchor {"Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0,"Differs" => 2},{"Differs" => 48,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Ix" => 1}],"Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nparent 38ee93726fb48a60962f8d01d367986becb682da\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"} 1223s git-debrebase get_differs d2df4dc1f9d085dc7c84da339a37150425eedea7 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1223s git-debrebase classify 247d69e2c498e57547983f4ac47559530666b403 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p d2df4dc1f9d085dc7c84da339a37150425eedea7/0x20 1223s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7"}],"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Type" => "Packaging","CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent d2df4dc1f9d085dc7c84da339a37150425eedea7\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"} 1223s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1223s git-debrebase classify d2df4dc1f9d085dc7c84da339a37150425eedea7 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1223s git-debrebase = Packaging {"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","Parents" => [{"Differs" => 32,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0}],"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Type" => "Packaging"} 1223s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1223s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1223s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Ix" => 0}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1223s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1223s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1223s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0,"Differs" => 32}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"} 1223s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1223s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1223s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16}],"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"} 1223s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1223s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1223s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1223s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1223s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1223s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1223s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Ix" => 1}],"Type" => "Anchor","Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"} 1223s git-debrebase *** WALK prep done cur=22b123696189139d3f8c13fd184084505d435471 brw -1 upp 7 proc 8 pm -1 1223s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1223s ' 1223s ++ git rev-parse HEAD 1223s + expect=e74be556fc3fe9f1afb626685a970c70e5730b69 1223s + exec 1223s + local cid ctype info nparents 1223s + read cid ctype info 1223s + : ===== e74be556fc3fe9f1afb626685a970c70e5730b69 Upstream ===== 1223s + test e74be556fc3fe9f1afb626685a970c70e5730b69 = e74be556fc3fe9f1afb626685a970c70e5730b69 1223s + local cetype=Upstream 1223s + '[' xUpstream = xUpstream ']' 1223s + cetype=SAME 1223s ++ git log -n1 --pretty=format:%P e74be556fc3fe9f1afb626685a970c70e5730b69 1223s + local parents=f245e3515f23de3098b899e5e605250502795a26 1223s + expect=f245e3515f23de3098b899e5e605250502795a26 1223s + enparents=1 1223s + : Upstream/SAME f245e3515f23de3098b899e5e605250502795a26 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s ++ printf %s f245e3515f23de3098b899e5e605250502795a26 1223s ++ wc -w 1223s + local cnparents=1 1223s + test 1 = 1 1223s ++ for f in $parents 1223s ++ echo f245e3515f23de3098b899e5e605250502795a26 1223s ++ wc -w 1223s ++ t-sort -u 1223s ++ LC_COLLATE=C 1223s ++ sort -u 1223s + local cndparents=1 1223s + test 1 = 1 1223s + case "$parents" in 1223s + case "$ctype" in 1223s + read cid ctype info 1223s + : ===== f245e3515f23de3098b899e5e605250502795a26 Upstream ===== 1223s + test f245e3515f23de3098b899e5e605250502795a26 = f245e3515f23de3098b899e5e605250502795a26 1223s + local cetype=Upstream 1223s + '[' xUpstream = xUpstream ']' 1223s + cetype=SAME 1223s ++ git log -n1 --pretty=format:%P f245e3515f23de3098b899e5e605250502795a26 1223s + local parents=f141674269dcaeff40a6ed8fb701eb69e5c5c913 1223s + expect=f141674269dcaeff40a6ed8fb701eb69e5c5c913 1223s + enparents=1 1223s + : Upstream/SAME f141674269dcaeff40a6ed8fb701eb69e5c5c913 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s ++ printf %s f141674269dcaeff40a6ed8fb701eb69e5c5c913 1223s ++ wc -w 1223s + local cnparents=1 1223s + test 1 = 1 1223s ++ for f in $parents 1223s ++ echo f141674269dcaeff40a6ed8fb701eb69e5c5c913 1223s ++ wc -w 1223s ++ t-sort -u 1223s ++ LC_COLLATE=C 1223s ++ sort -u 1223s + local cndparents=1 1223s + test 1 = 1 1223s + case "$parents" in 1223s + case "$ctype" in 1223s + read cid ctype info 1223s + : ===== f141674269dcaeff40a6ed8fb701eb69e5c5c913 Upstream ===== 1223s + test f141674269dcaeff40a6ed8fb701eb69e5c5c913 = f141674269dcaeff40a6ed8fb701eb69e5c5c913 1223s + local cetype=Upstream 1223s + '[' xUpstream = xUpstream ']' 1223s + cetype=SAME 1223s ++ git log -n1 --pretty=format:%P f141674269dcaeff40a6ed8fb701eb69e5c5c913 1223s + local parents=94bba6651ceecbcc6ba606618115f0347bcb9977 1223s + expect=94bba6651ceecbcc6ba606618115f0347bcb9977 1223s + enparents=1 1223s + : Upstream/SAME 94bba6651ceecbcc6ba606618115f0347bcb9977 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s ++ printf %s 94bba6651ceecbcc6ba606618115f0347bcb9977 1223s ++ wc -w 1223s + local cnparents=1 1223s + test 1 = 1 1223s ++ for f in $parents 1223s ++ echo 94bba6651ceecbcc6ba606618115f0347bcb9977 1223s ++ wc -w 1223s ++ t-sort -u 1223s ++ LC_COLLATE=C 1223s ++ sort -u 1223s + local cndparents=1 1223s + test 1 = 1 1223s + case "$parents" in 1223s + case "$ctype" in 1223s + read cid ctype info 1223s + : ===== 94bba6651ceecbcc6ba606618115f0347bcb9977 Upstream ===== 1223s + test 94bba6651ceecbcc6ba606618115f0347bcb9977 = 94bba6651ceecbcc6ba606618115f0347bcb9977 1223s + local cetype=Upstream 1223s + '[' xUpstream = xUpstream ']' 1223s + cetype=SAME 1223s ++ git log -n1 --pretty=format:%P 94bba6651ceecbcc6ba606618115f0347bcb9977 1223s + local parents=429bffb98dad51ed936c39e851b6c498268afe97 1223s + expect=429bffb98dad51ed936c39e851b6c498268afe97 1223s + enparents=1 1223s + : Upstream/SAME 429bffb98dad51ed936c39e851b6c498268afe97 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s ++ printf %s 429bffb98dad51ed936c39e851b6c498268afe97 1223s ++ wc -w 1223s + local cnparents=1 1223s + test 1 = 1 1223s ++ for f in $parents 1223s ++ echo 429bffb98dad51ed936c39e851b6c498268afe97 1223s ++ wc -w 1223s ++ t-sort -u 1223s ++ LC_COLLATE=C 1223s ++ sort -u 1223s + local cndparents=1 1223s + test 1 = 1 1223s + case "$parents" in 1223s + case "$ctype" in 1223s + read cid ctype info 1223s + : ===== 429bffb98dad51ed936c39e851b6c498268afe97 Upstream ===== 1223s + test 429bffb98dad51ed936c39e851b6c498268afe97 = 429bffb98dad51ed936c39e851b6c498268afe97 1223s + local cetype=Upstream 1223s + '[' xUpstream = xUpstream ']' 1223s + cetype=SAME 1223s ++ git log -n1 --pretty=format:%P 429bffb98dad51ed936c39e851b6c498268afe97 1223s + local parents=45d523efbc91fbf56d299448f11742cc9e72b808 1223s + expect=45d523efbc91fbf56d299448f11742cc9e72b808 1223s + enparents=1 1223s + : Upstream/SAME 45d523efbc91fbf56d299448f11742cc9e72b808 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s ++ printf %s 45d523efbc91fbf56d299448f11742cc9e72b808 1223s ++ wc -w 1223s + local cnparents=1 1223s + test 1 = 1 1223s ++ for f in $parents 1223s ++ echo 45d523efbc91fbf56d299448f11742cc9e72b808 1223s ++ wc -w 1223s ++ t-sort -u 1223s ++ LC_COLLATE=C 1223s ++ sort -u 1223s + local cndparents=1 1223s + test 1 = 1 1223s + case "$parents" in 1223s + case "$ctype" in 1223s + read cid ctype info 1223s + : ===== 45d523efbc91fbf56d299448f11742cc9e72b808 Upstream ===== 1223s + test 45d523efbc91fbf56d299448f11742cc9e72b808 = 45d523efbc91fbf56d299448f11742cc9e72b808 1223s + local cetype=Upstream 1223s + '[' xUpstream = xUpstream ']' 1223s + cetype=SAME 1223s ++ git log -n1 --pretty=format:%P 45d523efbc91fbf56d299448f11742cc9e72b808 1223s + local parents=463e089938bf739cea12ba66ca5bd60bd6260c64 1223s + expect=463e089938bf739cea12ba66ca5bd60bd6260c64 1223s + enparents=1 1223s + : Upstream/SAME 463e089938bf739cea12ba66ca5bd60bd6260c64 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s ++ printf %s 463e089938bf739cea12ba66ca5bd60bd6260c64 1223s ++ wc -w 1223s + local cnparents=1 1223s + test 1 = 1 1223s ++ for f in $parents 1223s ++ echo 463e089938bf739cea12ba66ca5bd60bd6260c64 1223s ++ wc -w 1223s ++ t-sort -u 1223s ++ LC_COLLATE=C 1223s ++ sort -u 1223s + local cndparents=1 1223s + test 1 = 1 1223s + case "$parents" in 1223s + case "$ctype" in 1223s + read cid ctype info 1223s + : ===== 463e089938bf739cea12ba66ca5bd60bd6260c64 Upstream ===== 1223s + test 463e089938bf739cea12ba66ca5bd60bd6260c64 = 463e089938bf739cea12ba66ca5bd60bd6260c64 1223s + local cetype=Upstream 1223s + '[' xUpstream = xUpstream ']' 1223s + cetype=SAME 1223s ++ git log -n1 --pretty=format:%P 463e089938bf739cea12ba66ca5bd60bd6260c64 1223s + local parents=7f5b7c92614b47ad2317d9ef00470fdfad1bd07f 1223s + expect=7f5b7c92614b47ad2317d9ef00470fdfad1bd07f 1223s + enparents=1 1223s + : Upstream/SAME 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s ++ printf %s 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f 1223s ++ wc -w 1223s + local cnparents=1 1223s + test 1 = 1 1223s ++ for f in $parents 1223s ++ echo 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f 1223s ++ wc -w 1223s ++ t-sort -u 1223s ++ LC_COLLATE=C 1223s ++ sort -u 1223s + local cndparents=1 1223s + test 1 = 1 1223s + case "$parents" in 1223s + case "$ctype" in 1223s + read cid ctype info 1223s + : ===== 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f Upstream ===== 1223s + test 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f = 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f 1223s + local cetype=Upstream 1223s + '[' xUpstream = xUpstream ']' 1223s + cetype=SAME 1223s ++ git log -n1 --pretty=format:%P 7f5b7c92614b47ad2317d9ef00470fdfad1bd07f 1223s + local parents=22b123696189139d3f8c13fd184084505d435471 1223s + expect=22b123696189139d3f8c13fd184084505d435471 1223s + enparents=1 1223s + : Upstream/SAME 22b123696189139d3f8c13fd184084505d435471 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s ++ printf %s 22b123696189139d3f8c13fd184084505d435471 1223s ++ wc -w 1223s + local cnparents=1 1223s + test 1 = 1 1223s ++ for f in $parents 1223s ++ echo 22b123696189139d3f8c13fd184084505d435471 1223s ++ wc -w 1223s ++ t-sort -u 1223s ++ LC_COLLATE=C 1223s ++ sort -u 1223s + local cndparents=1 1223s + test 1 = 1 1223s + case "$parents" in 1223s + case "$ctype" in 1223s + read cid ctype info 1223s + : ===== 22b123696189139d3f8c13fd184084505d435471 MergedBreakwaters ===== 1223s + test 22b123696189139d3f8c13fd184084505d435471 = 22b123696189139d3f8c13fd184084505d435471 1223s + local cetype=Upstream 1223s + '[' xMergedBreakwaters = xUpstream ']' 1223s ++ git log -n1 --pretty=format:%P 22b123696189139d3f8c13fd184084505d435471 1223s + local 'parents=9d77794ea8eca3fa78b8ee406128836771c7195f 247d69e2c498e57547983f4ac47559530666b403' 1223s + expect='9d77794ea8eca3fa78b8ee406128836771c7195f 247d69e2c498e57547983f4ac47559530666b403' 1223s + enparents=1 1223s + : MergedBreakwaters/Upstream '9d77794ea8eca3fa78b8ee406128836771c7195f 247d69e2c498e57547983f4ac47559530666b403' 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s + enparents=2 1223s ++ printf %s '9d77794ea8eca3fa78b8ee406128836771c7195f 247d69e2c498e57547983f4ac47559530666b403' 1223s ++ wc -w 1223s + local cnparents=2 1223s + test 2 = 2 1223s ++ for f in $parents 1223s ++ echo 9d77794ea8eca3fa78b8ee406128836771c7195f 1223s ++ for f in $parents 1223s ++ echo 247d69e2c498e57547983f4ac47559530666b403 1223s ++ wc -w 1223s ++ t-sort -u 1223s ++ LC_COLLATE=C 1223s ++ sort -u 1223s + local cndparents=2 1223s + test 2 = 2 1223s + case "$parents" in 1223s + case "$ctype" in 1223s + local f 1223s + local parent_ix=0 1223s + for f in $parents 1223s + t-gdr-good-analyse 9d77794ea8eca3fa78b8ee406128836771c7195f breakwater -mp0 1223s + local head=9d77794ea8eca3fa78b8ee406128836771c7195f 1223s + local state=breakwater 1223s + local wsfx=-mp0 1223s + local etypes bwtip 1223s + case $state in 1223s + etypes=Packaging 1223s + anal=../anal-mp0 1223s + t-git-debrebase analyse 9d77794ea8eca3fa78b8ee406128836771c7195f 1223s + local gdr=git-debrebase 1223s + : ' 1223s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1223s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse 9d77794ea8eca3fa78b8ee406128836771c7195f 1223s git-debrebase *** WALK 9d77794ea8eca3fa78b8ee406128836771c7195f 1 *main::STDOUT 1223s git-debrebase get_differs a7a1ce7990fecc564e8a5fa13896686b4a962d1c 9d383022823105715207a03601780dbceeb8ee4d = 0x10 1223s git-debrebase classify 9d77794ea8eca3fa78b8ee406128836771c7195f $t=9d383022823105715207a03601780dbceeb8ee4d @p a7a1ce7990fecc564e8a5fa13896686b4a962d1c/0x10 1223s git-debrebase = Changelog {"CommitId" => "9d77794ea8eca3fa78b8ee406128836771c7195f","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"Ix" => 0,"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Differs" => 16}],"Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent a7a1ce7990fecc564e8a5fa13896686b4a962d1c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Type" => "Changelog"} 1223s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 1223s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 1223s git-debrebase classify a7a1ce7990fecc564e8a5fa13896686b4a962d1c $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1223s git-debrebase = Anchor {"Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Anchor","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da"}],"CommitId" => "a7a1ce7990fecc564e8a5fa13896686b4a962d1c","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"},$VAR1->{"OrigParents"}[0]]} 1223s git-debrebase *** WALK prep done cur=a7a1ce7990fecc564e8a5fa13896686b4a962d1c brw 0 upp -1 proc 1 pm -1 1223s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1223s ' 1223s ++ git rev-parse 9d77794ea8eca3fa78b8ee406128836771c7195f 1223s + expect=9d77794ea8eca3fa78b8ee406128836771c7195f 1223s + exec 1223s + local cid ctype info nparents 1223s + read cid ctype info 1223s + : ===== 9d77794ea8eca3fa78b8ee406128836771c7195f Changelog ===== 1223s + test 9d77794ea8eca3fa78b8ee406128836771c7195f = 9d77794ea8eca3fa78b8ee406128836771c7195f 1223s + local cetype=Packaging 1223s + '[' xChangelog = xPackaging ']' 1223s ++ git log -n1 --pretty=format:%P 9d77794ea8eca3fa78b8ee406128836771c7195f 1223s + local parents=a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1223s + expect=a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1223s + enparents=1 1223s + : Changelog/Packaging a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s + git diff --quiet a7a1ce7990fecc564e8a5fa13896686b4a962d1c..9d77794ea8eca3fa78b8ee406128836771c7195f -- :. ':!debian/changelog' 1223s + etypes=Packaging 1223s ++ printf %s a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1223s ++ wc -w 1223s + local cnparents=1 1223s + test 1 = 1 1223s ++ for f in $parents 1223s ++ echo a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1223s ++ wc -w 1223s ++ t-sort -u 1223s ++ LC_COLLATE=C 1223s ++ sort -u 1223s + local cndparents=1 1223s + test 1 = 1 1223s + case "$parents" in 1223s + case "$ctype" in 1223s + read cid ctype info 1223s + : ===== a7a1ce7990fecc564e8a5fa13896686b4a962d1c Anchor ===== 1223s + test a7a1ce7990fecc564e8a5fa13896686b4a962d1c = a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1223s + local cetype=Packaging 1223s + '[' xAnchor = xPackaging ']' 1223s ++ git log -n1 --pretty=format:%P a7a1ce7990fecc564e8a5fa13896686b4a962d1c 1223s + local 'parents=4fac284b9a57ca57ecdeffa6278dea2759cd00e9 38ee93726fb48a60962f8d01d367986becb682da' 1223s + expect='4fac284b9a57ca57ecdeffa6278dea2759cd00e9 38ee93726fb48a60962f8d01d367986becb682da' 1223s + enparents=1 1223s + : Anchor/Packaging '4fac284b9a57ca57ecdeffa6278dea2759cd00e9 38ee93726fb48a60962f8d01d367986becb682da' 1223s + case "$ctype/$cetype" in 1223s + case "$ctype/$etypes" in 1223s + case "$cetype" in 1223s + case "$ctype" in 1223s + break 1223s + parent_ix=1 1223s + for f in $parents 1223s + t-gdr-good-analyse 247d69e2c498e57547983f4ac47559530666b403 breakwater -mp1 1223s + local head=247d69e2c498e57547983f4ac47559530666b403 1223s + local state=breakwater 1223s + local wsfx=-mp1 1223s + local etypes bwtip 1223s + case $state in 1223s + etypes=Packaging 1223s + anal=../anal-mp1 1223s + t-git-debrebase analyse 247d69e2c498e57547983f4ac47559530666b403 1223s + local gdr=git-debrebase 1223s + : ' 1223s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1223s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse 247d69e2c498e57547983f4ac47559530666b403 1223s git-debrebase *** WALK 247d69e2c498e57547983f4ac47559530666b403 1 *main::STDOUT 1223s git-debrebase get_differs d2df4dc1f9d085dc7c84da339a37150425eedea7 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1223s git-debrebase classify 247d69e2c498e57547983f4ac47559530666b403 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p d2df4dc1f9d085dc7c84da339a37150425eedea7/0x20 1223s git-debrebase = Packaging {"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","CommitId" => "247d69e2c498e57547983f4ac47559530666b403","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent d2df4dc1f9d085dc7c84da339a37150425eedea7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7","Differs" => 32,"Ix" => 0}],"Type" => "Packaging"} 1223s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1223s git-debrebase classify d2df4dc1f9d085dc7c84da339a37150425eedea7 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1223s git-debrebase = Packaging {"Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","CommitId" => "d2df4dc1f9d085dc7c84da339a37150425eedea7"} 1223s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1223s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1223s git-debrebase = Packaging {"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"}],"Type" => "Packaging"} 1223s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1223s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1223s git-debrebase = Packaging {"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32}]} 1223s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1223s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1223s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Ix" => 0}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Msg" => "dch -r -D unstable\n"} 1223s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1223s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1224s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1224s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1224s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1224s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1224s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Type" => "Anchor","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16"},{"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48,"Ix" => 1}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 1224s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 5 upp -1 proc 6 pm -1 1224s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1224s ' 1224s ++ git rev-parse 247d69e2c498e57547983f4ac47559530666b403 1224s + expect=247d69e2c498e57547983f4ac47559530666b403 1224s + exec 1224s + local cid ctype info nparents 1224s + read cid ctype info 1224s + : ===== 247d69e2c498e57547983f4ac47559530666b403 Packaging ===== 1224s + test 247d69e2c498e57547983f4ac47559530666b403 = 247d69e2c498e57547983f4ac47559530666b403 1224s + local cetype=Packaging 1224s + '[' xPackaging = xPackaging ']' 1224s + cetype=SAME 1224s ++ git log -n1 --pretty=format:%P 247d69e2c498e57547983f4ac47559530666b403 1224s + local parents=d2df4dc1f9d085dc7c84da339a37150425eedea7 1224s + expect=d2df4dc1f9d085dc7c84da339a37150425eedea7 1224s + enparents=1 1224s + : Packaging/SAME d2df4dc1f9d085dc7c84da339a37150425eedea7 1224s + case "$ctype/$cetype" in 1224s + case "$ctype/$etypes" in 1224s + case "$cetype" in 1224s + case "$ctype" in 1224s + git diff --quiet d2df4dc1f9d085dc7c84da339a37150425eedea7..247d69e2c498e57547983f4ac47559530666b403 -- :. ':!debian' 1224s + git diff --quiet d2df4dc1f9d085dc7c84da339a37150425eedea7..247d69e2c498e57547983f4ac47559530666b403 -- :debian/patches 1224s + etypes=Packaging 1224s ++ printf %s d2df4dc1f9d085dc7c84da339a37150425eedea7 1224s ++ wc -w 1224s + local cnparents=1 1224s + test 1 = 1 1224s ++ for f in $parents 1224s ++ echo d2df4dc1f9d085dc7c84da339a37150425eedea7 1224s ++ wc -w 1224s ++ t-sort -u 1224s ++ LC_COLLATE=C 1224s ++ sort -u 1224s + local cndparents=1 1224s + test 1 = 1 1224s + case "$parents" in 1224s + case "$ctype" in 1224s + read cid ctype info 1224s + : ===== d2df4dc1f9d085dc7c84da339a37150425eedea7 Packaging ===== 1224s + test d2df4dc1f9d085dc7c84da339a37150425eedea7 = d2df4dc1f9d085dc7c84da339a37150425eedea7 1224s + local cetype=Packaging 1224s + '[' xPackaging = xPackaging ']' 1224s + cetype=SAME 1224s ++ git log -n1 --pretty=format:%P d2df4dc1f9d085dc7c84da339a37150425eedea7 1224s + local parents=4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1224s + expect=4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1224s + enparents=1 1224s + : Packaging/SAME 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1224s + case "$ctype/$cetype" in 1224s + case "$ctype/$etypes" in 1224s + case "$cetype" in 1224s + case "$ctype" in 1224s + git diff --quiet 4fac284b9a57ca57ecdeffa6278dea2759cd00e9..d2df4dc1f9d085dc7c84da339a37150425eedea7 -- :. ':!debian' 1224s + git diff --quiet 4fac284b9a57ca57ecdeffa6278dea2759cd00e9..d2df4dc1f9d085dc7c84da339a37150425eedea7 -- :debian/patches 1224s + etypes=Packaging 1224s ++ printf %s 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1224s ++ wc -w 1224s + local cnparents=1 1224s + test 1 = 1 1224s ++ for f in $parents 1224s ++ echo 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1224s ++ wc -w 1224s ++ t-sort -u 1224s ++ LC_COLLATE=C 1224s ++ sort -u 1224s + local cndparents=1 1224s + test 1 = 1 1224s + case "$parents" in 1224s + case "$ctype" in 1224s + read cid ctype info 1224s + : ===== 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Packaging ===== 1224s + test 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 = 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1224s + local cetype=Packaging 1224s + '[' xPackaging = xPackaging ']' 1224s + cetype=SAME 1224s ++ git log -n1 --pretty=format:%P 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1224s + local parents=6820a0900873c206f54cab6ac552afb016b49205 1224s + expect=6820a0900873c206f54cab6ac552afb016b49205 1224s + enparents=1 1224s + : Packaging/SAME 6820a0900873c206f54cab6ac552afb016b49205 1224s + case "$ctype/$cetype" in 1224s + case "$ctype/$etypes" in 1224s + case "$cetype" in 1224s + case "$ctype" in 1224s + git diff --quiet 6820a0900873c206f54cab6ac552afb016b49205..4fac284b9a57ca57ecdeffa6278dea2759cd00e9 -- :. ':!debian' 1224s + git diff --quiet 6820a0900873c206f54cab6ac552afb016b49205..4fac284b9a57ca57ecdeffa6278dea2759cd00e9 -- :debian/patches 1224s + etypes=Packaging 1224s ++ printf %s 6820a0900873c206f54cab6ac552afb016b49205 1224s ++ wc -w 1224s + local cnparents=1 1224s + test 1 = 1 1224s ++ for f in $parents 1224s ++ echo 6820a0900873c206f54cab6ac552afb016b49205 1224s ++ wc -w 1224s ++ t-sort -u 1224s ++ LC_COLLATE=C 1224s ++ sort -u 1224s + local cndparents=1 1224s + test 1 = 1 1224s + case "$parents" in 1224s + case "$ctype" in 1224s + read cid ctype info 1224s + : ===== 6820a0900873c206f54cab6ac552afb016b49205 Packaging ===== 1224s + test 6820a0900873c206f54cab6ac552afb016b49205 = 6820a0900873c206f54cab6ac552afb016b49205 1224s + local cetype=Packaging 1224s + '[' xPackaging = xPackaging ']' 1224s + cetype=SAME 1224s ++ git log -n1 --pretty=format:%P 6820a0900873c206f54cab6ac552afb016b49205 1224s + local parents=db129944b7f434b59509f6c007624fd8a89fe823 1224s + expect=db129944b7f434b59509f6c007624fd8a89fe823 1224s + enparents=1 1224s + : Packaging/SAME db129944b7f434b59509f6c007624fd8a89fe823 1224s + case "$ctype/$cetype" in 1224s + case "$ctype/$etypes" in 1224s + case "$cetype" in 1224s + case "$ctype" in 1224s + git diff --quiet db129944b7f434b59509f6c007624fd8a89fe823..6820a0900873c206f54cab6ac552afb016b49205 -- :. ':!debian' 1224s + git diff --quiet db129944b7f434b59509f6c007624fd8a89fe823..6820a0900873c206f54cab6ac552afb016b49205 -- :debian/patches 1224s + etypes=Packaging 1224s ++ printf %s db129944b7f434b59509f6c007624fd8a89fe823 1224s ++ wc -w 1224s + local cnparents=1 1224s + test 1 = 1 1224s ++ for f in $parents 1224s ++ echo db129944b7f434b59509f6c007624fd8a89fe823 1224s ++ wc -w 1224s ++ t-sort -u 1224s ++ LC_COLLATE=C 1224s ++ sort -u 1224s + local cndparents=1 1224s + test 1 = 1 1224s + case "$parents" in 1224s + case "$ctype" in 1224s + read cid ctype info 1224s + : ===== db129944b7f434b59509f6c007624fd8a89fe823 Changelog ===== 1224s + test db129944b7f434b59509f6c007624fd8a89fe823 = db129944b7f434b59509f6c007624fd8a89fe823 1224s + local cetype=Packaging 1224s + '[' xChangelog = xPackaging ']' 1224s ++ git log -n1 --pretty=format:%P db129944b7f434b59509f6c007624fd8a89fe823 1224s + local parents=eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1224s + expect=eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1224s + enparents=1 1224s + : Changelog/Packaging eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1224s + case "$ctype/$cetype" in 1224s + case "$ctype/$etypes" in 1224s + case "$cetype" in 1224s + case "$ctype" in 1224s + git diff --quiet eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2..db129944b7f434b59509f6c007624fd8a89fe823 -- :. ':!debian/changelog' 1224s + etypes=Packaging 1224s ++ printf %s eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1224s ++ wc -w 1224s + local cnparents=1 1224s + test 1 = 1 1224s ++ for f in $parents 1224s ++ echo eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1224s ++ wc -w 1224s ++ t-sort -u 1224s ++ LC_COLLATE=C 1224s ++ sort -u 1224s + local cndparents=1 1224s + test 1 = 1 1224s + case "$parents" in 1224s + case "$ctype" in 1224s + read cid ctype info 1224s + : ===== eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Changelog ===== 1224s + test eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 = eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1224s + local cetype=Packaging 1224s + '[' xChangelog = xPackaging ']' 1224s ++ git log -n1 --pretty=format:%P eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1224s + local parents=48c55fcd6aad3671faeeedd232289eea48db8cce 1224s + expect=48c55fcd6aad3671faeeedd232289eea48db8cce 1224s + enparents=1 1224s + : Changelog/Packaging 48c55fcd6aad3671faeeedd232289eea48db8cce 1224s + case "$ctype/$cetype" in 1224s + case "$ctype/$etypes" in 1224s + case "$cetype" in 1224s + case "$ctype" in 1224s + git diff --quiet 48c55fcd6aad3671faeeedd232289eea48db8cce..eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 -- :. ':!debian/changelog' 1224s + etypes=Packaging 1224s ++ printf %s 48c55fcd6aad3671faeeedd232289eea48db8cce 1224s ++ wc -w 1224s + local cnparents=1 1224s + test 1 = 1 1224s ++ for f in $parents 1224s ++ echo 48c55fcd6aad3671faeeedd232289eea48db8cce 1224s ++ wc -w 1224s ++ t-sort -u 1224s ++ LC_COLLATE=C 1224s ++ sort -u 1224s + local cndparents=1 1224s + test 1 = 1 1224s + case "$parents" in 1224s + case "$ctype" in 1224s + read cid ctype info 1224s + : ===== 48c55fcd6aad3671faeeedd232289eea48db8cce Anchor ===== 1224s + test 48c55fcd6aad3671faeeedd232289eea48db8cce = 48c55fcd6aad3671faeeedd232289eea48db8cce 1224s + local cetype=Packaging 1224s + '[' xAnchor = xPackaging ']' 1224s ++ git log -n1 --pretty=format:%P 48c55fcd6aad3671faeeedd232289eea48db8cce 1224s + local 'parents=23886cf8bbaefa175a2403d6556564175e096c16 c503a3d8e91a8fe38919c1795f29cacc3a671c3e' 1224s + expect='23886cf8bbaefa175a2403d6556564175e096c16 c503a3d8e91a8fe38919c1795f29cacc3a671c3e' 1224s + enparents=1 1224s + : Anchor/Packaging '23886cf8bbaefa175a2403d6556564175e096c16 c503a3d8e91a8fe38919c1795f29cacc3a671c3e' 1224s + case "$ctype/$cetype" in 1224s + case "$ctype/$etypes" in 1224s + case "$cetype" in 1224s + case "$ctype" in 1224s + break 1224s + parent_ix=2 1224s + return 1224s + t-ok 1224s + : ======================================== 1224s + t-check-only-bpd 1224s + '[' .. = .. ']' 1224s + return 1224s + t-fscks 1224s + shopt -s nullglob 1224s + for d in $tmp/*/.git $tmp/git/*.git 1224s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1224s + t-git-fsck 1224s ++ git rev-parse --git-dir 1224s + local fsckerrs=.git/dgit-test-fsck.errs 1224s + set +e 1224s + LC_MESSAGES=C 1224s + git fsck --no-dangling --strict 1224s + tee .git/dgit-test-fsck.errs 1224s + ps='0 0' 1224s + set -e 1224s + local pats 1224s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1224s + test '0 0' = '0 0' 1224s + pats+=(-e 'notice: HEAD points to an unborn branch') 1224s + pats+=(-e 'notice: No default references') 1224s + set +e 1224s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1224s + rc=1 1224s + set -e 1224s + case $rc in 1224s + t-save-artifacts 1224s + artifacts=/tmp/autopkgtest.XK8uun/gdr-merge-conflicts-artifacts 1224s + '[' x/tmp/autopkgtest.XK8uun/gdr-merge-conflicts-artifacts = x ']' 1224s + '[' xtmp = x ']' 1224s + GZIP=-1v 1224s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-merge-conflicts-artifacts/gdr-merge-conflicts.tar.gz '--exclude=*.tar' . 1224s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1224s 81.4% 1224s + echo ok. 1224s ok. 1224s + rc=0 1224s + set +x 1224s + set +e 1224s + pwd 1224s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1224s + '[' x '!=' x ']' 1224s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1224s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1224s + set -e 1224s + test 0 = 0 1224s autopkgtest [23:07:34]: test gdr-merge-conflicts: -----------------------] 1225s autopkgtest [23:07:35]: test gdr-merge-conflicts: - - - - - - - - - - results - - - - - - - - - - 1225s gdr-merge-conflicts PASS 1225s autopkgtest [23:07:35]: test gdr-diverge-nmu: preparing testbed 1306s autopkgtest [23:08:56]: testbed dpkg architecture: ppc64el 1306s autopkgtest [23:08:56]: testbed apt version: 2.4.13 1306s autopkgtest [23:08:56]: @@@@@@@@@@@@@@@@@@@@ test bed setup 1306s autopkgtest [23:08:56]: testbed release detected to be: jammy 1307s autopkgtest [23:08:57]: updating testbed package index (apt update) 1308s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 1308s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 1308s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 1308s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 1308s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 1308s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 1308s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.2 kB] 1308s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el Packages [170 kB] 1308s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el c-n-f Metadata [2476 B] 1308s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el Packages [1704 B] 1308s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el c-n-f Metadata [116 B] 1308s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el Packages [85.0 kB] 1308s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el c-n-f Metadata [2064 B] 1308s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse ppc64el c-n-f Metadata [116 B] 1311s Fetched 715 kB in 1s (724 kB/s) 1312s Reading package lists... 1312s autopkgtest [23:09:02]: upgrading testbed (apt dist-upgrade and autopurge) 1313s Reading package lists... 1313s Building dependency tree... 1313s Reading state information... 1313s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 1313s Starting 2 pkgProblemResolver with broken count: 0 1313s Done 1313s Entering ResolveByKeep 1314s 1314s The following NEW packages will be installed: 1314s linux-headers-5.15.0-136 linux-headers-5.15.0-136-generic 1314s linux-image-5.15.0-136-generic linux-modules-5.15.0-136-generic 1314s linux-modules-extra-5.15.0-136-generic 1314s The following packages will be upgraded: 1314s apt apt-utils libapt-pkg6.0 linux-generic linux-headers-generic 1314s linux-headers-virtual linux-image-generic linux-image-virtual linux-virtual 1314s 9 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. 1314s Need to get 112 MB of archives. 1314s After this operation, 613 MB of additional disk space will be used. 1314s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el libapt-pkg6.0 ppc64el 2.4.14 [1030 kB] 1314s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt ppc64el 2.4.14 [1407 kB] 1315s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt-utils ppc64el 2.4.14 [236 kB] 1315s Get:4 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-5.15.0-136-generic ppc64el 5.15.0-136.147 [22.0 MB] 1316s Get:5 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-5.15.0-136-generic ppc64el 5.15.0-136.147 [11.5 MB] 1317s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-extra-5.15.0-136-generic ppc64el 5.15.0-136.147 [60.3 MB] 1319s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-generic ppc64el 5.15.0.136.134 [1700 B] 1319s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-generic ppc64el 5.15.0.136.134 [2466 B] 1319s Get:9 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-virtual ppc64el 5.15.0.136.134 [1676 B] 1319s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-virtual ppc64el 5.15.0.136.134 [2464 B] 1319s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-virtual ppc64el 5.15.0.136.134 [1634 B] 1319s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136 all 5.15.0-136.147 [12.3 MB] 1320s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136-generic ppc64el 5.15.0-136.147 [3208 kB] 1320s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-generic ppc64el 5.15.0.136.134 [2364 B] 1320s Fetched 112 MB in 6s (18.0 MB/s) 1321s (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 ... 66539 files and directories currently installed.) 1321s Preparing to unpack .../libapt-pkg6.0_2.4.14_ppc64el.deb ... 1321s Unpacking libapt-pkg6.0:ppc64el (2.4.14) over (2.4.13) ... 1321s Setting up libapt-pkg6.0:ppc64el (2.4.14) ... 1321s (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 ... 66539 files and directories currently installed.) 1321s Preparing to unpack .../apt_2.4.14_ppc64el.deb ... 1321s Unpacking apt (2.4.14) over (2.4.13) ... 1321s Setting up apt (2.4.14) ... 1322s (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 ... 66539 files and directories currently installed.) 1322s Preparing to unpack .../00-apt-utils_2.4.14_ppc64el.deb ... 1322s Unpacking apt-utils (2.4.14) over (2.4.13) ... 1322s Selecting previously unselected package linux-modules-5.15.0-136-generic. 1322s Preparing to unpack .../01-linux-modules-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1322s Unpacking linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 1322s Selecting previously unselected package linux-image-5.15.0-136-generic. 1322s Preparing to unpack .../02-linux-image-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1322s Unpacking linux-image-5.15.0-136-generic (5.15.0-136.147) ... 1322s Selecting previously unselected package linux-modules-extra-5.15.0-136-generic. 1322s Preparing to unpack .../03-linux-modules-extra-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1322s Unpacking linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 1325s Preparing to unpack .../04-linux-generic_5.15.0.136.134_ppc64el.deb ... 1325s Unpacking linux-generic (5.15.0.136.134) over (5.15.0.135.133) ... 1325s Preparing to unpack .../05-linux-image-generic_5.15.0.136.134_ppc64el.deb ... 1325s Unpacking linux-image-generic (5.15.0.136.134) over (5.15.0.135.133) ... 1325s Preparing to unpack .../06-linux-virtual_5.15.0.136.134_ppc64el.deb ... 1325s Unpacking linux-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 1325s Preparing to unpack .../07-linux-image-virtual_5.15.0.136.134_ppc64el.deb ... 1325s Unpacking linux-image-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 1325s Preparing to unpack .../08-linux-headers-virtual_5.15.0.136.134_ppc64el.deb ... 1325s Unpacking linux-headers-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 1325s Selecting previously unselected package linux-headers-5.15.0-136. 1325s Preparing to unpack .../09-linux-headers-5.15.0-136_5.15.0-136.147_all.deb ... 1325s Unpacking linux-headers-5.15.0-136 (5.15.0-136.147) ... 1327s Selecting previously unselected package linux-headers-5.15.0-136-generic. 1327s Preparing to unpack .../10-linux-headers-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1327s Unpacking linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 1328s Preparing to unpack .../11-linux-headers-generic_5.15.0.136.134_ppc64el.deb ... 1328s Unpacking linux-headers-generic (5.15.0.136.134) over (5.15.0.135.133) ... 1328s Setting up apt-utils (2.4.14) ... 1328s Setting up linux-headers-5.15.0-136 (5.15.0-136.147) ... 1328s Setting up linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 1328s Setting up linux-headers-generic (5.15.0.136.134) ... 1328s Setting up linux-headers-virtual (5.15.0.136.134) ... 1328s Setting up linux-image-5.15.0-136-generic (5.15.0-136.147) ... 1329s I: /boot/vmlinux is now a symlink to vmlinux-5.15.0-136-generic 1329s I: /boot/initrd.img is now a symlink to initrd.img-5.15.0-136-generic 1329s Setting up linux-image-virtual (5.15.0.136.134) ... 1329s Setting up linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 1330s Setting up linux-virtual (5.15.0.136.134) ... 1330s Setting up linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 1332s Setting up linux-image-generic (5.15.0.136.134) ... 1332s Setting up linux-generic (5.15.0.136.134) ... 1332s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 1332s Processing triggers for man-db (2.10.2-1) ... 1332s Processing triggers for linux-image-5.15.0-136-generic (5.15.0-136.147) ... 1332s /etc/kernel/postinst.d/initramfs-tools: 1332s update-initramfs: Generating /boot/initrd.img-5.15.0-136-generic 1332s No lz4 in /usr/bin:/sbin:/bin, using gzip 1358s /etc/kernel/postinst.d/zz-update-grub: 1358s Sourcing file `/etc/default/grub' 1358s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 1358s Sourcing file `/etc/default/grub.d/init-select.cfg' 1358s Generating grub configuration file ... 1358s Found linux image: /boot/vmlinux-5.15.0-136-generic 1358s Found initrd image: /boot/initrd.img-5.15.0-136-generic 1358s Found linux image: /boot/vmlinux-5.15.0-135-generic 1358s Found initrd image: /boot/initrd.img-5.15.0-135-generic 1358s Warning: os-prober will not be executed to detect other bootable partitions. 1358s Systems on them will not be added to the GRUB boot configuration. 1358s Check GRUB_DISABLE_OS_PROBER documentation entry. 1358s done 1360s Reading package lists... 1360s Building dependency tree... 1360s Reading state information... 1360s Starting pkgProblemResolver with broken count: 0 1360s Starting 2 pkgProblemResolver with broken count: 0 1360s Done 1360s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1361s autopkgtest [23:09:51]: rebooting testbed after setup commands that affected boot 1396s Reading package lists... 1396s Building dependency tree... 1396s Reading state information... 1396s Starting pkgProblemResolver with broken count: 0 1396s Starting 2 pkgProblemResolver with broken count: 0 1396s Done 1397s The following NEW packages will be installed: 1397s autoconf automake autopoint autotools-dev build-essential chiark-utils-bin 1397s cpp cpp-11 debhelper debugedit devscripts dgit dgit-infrastructure 1397s dh-autoreconf dh-strip-nondeterminism dput dwz fakeroot faketime g++ g++-11 1397s gcc gcc-11 gcc-11-base gettext git git-buildpackage git-debrebase git-man 1397s intltool-debian libarchive-zip-perl libasan6 libatomic1 1397s libb-hooks-op-check-perl libc-dev-bin libc6-dev libcc1-0 1397s libclass-method-modifiers-perl libclass-xsaccessor-perl libcrypt-dev 1397s libdbd-sqlite3-perl libdbi-perl libdebhelper-perl libdevel-callchecker-perl 1397s libdynaloader-functions-perl libencode-locale-perl liberror-perl 1397s libexporter-tiny-perl libfakeroot libfaketime libfile-dirlist-perl 1397s libfile-fnmatch-perl libfile-homedir-perl libfile-listing-perl 1397s libfile-stripnondeterminism-perl libfile-touch-perl libfile-which-perl 1397s libgcc-11-dev libgomp1 libhtml-parser-perl libhtml-tagset-perl 1397s libhtml-tree-perl libhttp-cookies-perl libhttp-date-perl 1397s libhttp-message-perl libhttp-negotiate-perl libimport-into-perl 1397s libio-html-perl libio-pty-perl libio-socket-ssl-perl libipc-run-perl 1397s libisl23 libitm1 libjson-perl liblist-moreutils-perl 1397s liblist-moreutils-xs-perl liblsan0 liblwp-mediatypes-perl 1397s liblwp-protocol-https-perl libmodule-runtime-perl libmoo-perl libmpc3 1397s libnet-http-perl libnet-ssleay-perl libnsl-dev libparams-classify-perl 1397s libquadmath0 librole-tiny-perl libstdc++-11-dev libsub-override-perl 1397s libsub-quote-perl libtext-csv-perl libtext-glob-perl libtimedate-perl 1397s libtirpc-dev libtool libtry-tiny-perl libtsan0 libubsan1 liburi-perl 1397s libwww-curl-perl libwww-perl libwww-robotrules-perl linux-libc-dev m4 1397s patchutils perl-openssl-defaults po-debconf python3-dateutil python3-debian 1397s python3-gpg rpcsvc-proto sqlite3 wdiff 1397s 0 upgraded, 114 newly installed, 0 to remove and 0 not upgraded. 1397s Need to get 68.5 MB of archives. 1397s After this operation, 262 MB of additional disk space will be used. 1397s Get:1 http://ftpmaster.internal/ubuntu jammy/main ppc64el m4 ppc64el 1.4.18-5ubuntu2 [214 kB] 1397s Get:2 http://ftpmaster.internal/ubuntu jammy/main ppc64el autoconf all 2.71-2 [338 kB] 1397s Get:3 http://ftpmaster.internal/ubuntu jammy/main ppc64el autotools-dev all 20220109.1 [44.9 kB] 1397s Get:4 http://ftpmaster.internal/ubuntu jammy/main ppc64el automake all 1:1.16.5-1.3 [558 kB] 1397s Get:5 http://ftpmaster.internal/ubuntu jammy/main ppc64el autopoint all 0.21-4ubuntu4 [422 kB] 1397s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc-dev-bin ppc64el 2.35-0ubuntu3.9 [21.4 kB] 1397s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-libc-dev ppc64el 5.15.0-136.147 [1313 kB] 1397s Get:8 http://ftpmaster.internal/ubuntu jammy/main ppc64el libcrypt-dev ppc64el 1:4.4.27-1 [142 kB] 1397s Get:9 http://ftpmaster.internal/ubuntu jammy/main ppc64el rpcsvc-proto ppc64el 1.4.2-0ubuntu6 [82.3 kB] 1397s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtirpc-dev ppc64el 1.3.2-2ubuntu0.1 [223 kB] 1397s Get:11 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnsl-dev ppc64el 1.3.0-2build2 [80.0 kB] 1397s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc6-dev ppc64el 2.35-0ubuntu3.9 [2053 kB] 1398s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11-base ppc64el 11.4.0-1ubuntu1~22.04 [20.3 kB] 1398s Get:14 http://ftpmaster.internal/ubuntu jammy/main ppc64el libisl23 ppc64el 0.24-2build1 [833 kB] 1398s Get:15 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmpc3 ppc64el 1.2.1-2build1 [52.2 kB] 1398s Get:16 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el cpp-11 ppc64el 11.4.0-1ubuntu1~22.04 [8800 kB] 1398s Get:17 http://ftpmaster.internal/ubuntu jammy/main ppc64el cpp ppc64el 4:11.2.0-1ubuntu1 [27.7 kB] 1398s Get:18 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libcc1-0 ppc64el 12.3.0-1ubuntu1~22.04 [49.5 kB] 1398s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgomp1 ppc64el 12.3.0-1ubuntu1~22.04 [140 kB] 1398s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libitm1 ppc64el 12.3.0-1ubuntu1~22.04 [32.9 kB] 1398s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libatomic1 ppc64el 12.3.0-1ubuntu1~22.04 [10.6 kB] 1398s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libasan6 ppc64el 11.4.0-1ubuntu1~22.04 [2303 kB] 1398s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el liblsan0 ppc64el 12.3.0-1ubuntu1~22.04 [1090 kB] 1398s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtsan0 ppc64el 11.4.0-1ubuntu1~22.04 [2278 kB] 1398s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libubsan1 ppc64el 12.3.0-1ubuntu1~22.04 [1001 kB] 1398s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libquadmath0 ppc64el 12.3.0-1ubuntu1~22.04 [156 kB] 1398s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgcc-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [1477 kB] 1398s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11 ppc64el 11.4.0-1ubuntu1~22.04 [17.7 MB] 1399s Get:29 http://ftpmaster.internal/ubuntu jammy/main ppc64el gcc ppc64el 4:11.2.0-1ubuntu1 [5152 B] 1399s Get:30 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libstdc++-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [2197 kB] 1399s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el g++-11 ppc64el 11.4.0-1ubuntu1~22.04 [10.2 MB] 1400s Get:32 http://ftpmaster.internal/ubuntu jammy/main ppc64el g++ ppc64el 4:11.2.0-1ubuntu1 [1408 B] 1400s Get:33 http://ftpmaster.internal/ubuntu jammy/main ppc64el build-essential ppc64el 12.9ubuntu3 [4752 B] 1400s Get:34 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 1400s Get:35 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtool all 2.4.6-15build2 [164 kB] 1400s Get:36 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-autoreconf all 20 [16.1 kB] 1400s Get:37 http://ftpmaster.internal/ubuntu jammy/main ppc64el libarchive-zip-perl all 1.68-1 [90.2 kB] 1400s Get:38 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-override-perl all 0.09-2 [9532 B] 1400s Get:39 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 1400s Get:40 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-strip-nondeterminism all 1.13.0-1 [5344 B] 1400s Get:41 http://ftpmaster.internal/ubuntu jammy/main ppc64el debugedit ppc64el 1:5.0-4build1 [51.6 kB] 1400s Get:42 http://ftpmaster.internal/ubuntu jammy/main ppc64el dwz ppc64el 0.14-1build2 [124 kB] 1400s Get:43 http://ftpmaster.internal/ubuntu jammy/main ppc64el gettext ppc64el 0.21-4ubuntu4 [976 kB] 1400s Get:44 http://ftpmaster.internal/ubuntu jammy/main ppc64el intltool-debian all 0.35.0+20060710.5 [24.9 kB] 1400s Get:45 http://ftpmaster.internal/ubuntu jammy/main ppc64el po-debconf all 1.0.21+nmu1 [233 kB] 1400s Get:46 http://ftpmaster.internal/ubuntu jammy/main ppc64el debhelper all 13.6ubuntu1 [923 kB] 1400s Get:47 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfakeroot ppc64el 1.28-1ubuntu1 [33.8 kB] 1400s Get:48 http://ftpmaster.internal/ubuntu jammy/main ppc64el fakeroot ppc64el 1.28-1ubuntu1 [62.8 kB] 1400s Get:49 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-dirlist-perl all 0.05-2 [7100 B] 1400s Get:50 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-which-perl all 1.23-1 [13.8 kB] 1400s Get:51 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-homedir-perl all 1.006-1 [38.3 kB] 1400s Get:52 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-touch-perl all 0.12-1 [9024 B] 1400s Get:53 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-pty-perl ppc64el 1:1.15-2build2 [35.3 kB] 1400s Get:54 http://ftpmaster.internal/ubuntu jammy/main ppc64el libipc-run-perl all 20200505.0-1 [89.8 kB] 1400s Get:55 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 1400s Get:56 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-xsaccessor-perl ppc64el 1.19-3build9 [36.6 kB] 1400s Get:57 http://ftpmaster.internal/ubuntu jammy/main ppc64el libb-hooks-op-check-perl ppc64el 0.22-1build5 [10.4 kB] 1400s Get:58 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 1400s Get:59 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdevel-callchecker-perl ppc64el 0.008-1ubuntu4 [14.7 kB] 1400s Get:60 http://ftpmaster.internal/ubuntu jammy/main ppc64el libparams-classify-perl ppc64el 0.015-1build5 [23.9 kB] 1400s Get:61 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmodule-runtime-perl all 0.016-1 [16.2 kB] 1400s Get:62 http://ftpmaster.internal/ubuntu jammy/main ppc64el libimport-into-perl all 1.002005-1 [11.0 kB] 1400s Get:63 http://ftpmaster.internal/ubuntu jammy/main ppc64el librole-tiny-perl all 2.002004-1 [16.3 kB] 1400s Get:64 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-quote-perl all 2.006006-1 [19.5 kB] 1400s Get:65 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmoo-perl all 2.005004-3 [48.0 kB] 1400s Get:66 http://ftpmaster.internal/ubuntu jammy/main ppc64el libencode-locale-perl all 1.05-1.1 [11.8 kB] 1400s Get:67 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtimedate-perl all 2.3300-2 [34.0 kB] 1400s Get:68 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-date-perl all 6.05-1 [9920 B] 1400s Get:69 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-listing-perl all 6.14-1 [11.2 kB] 1400s Get:70 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tagset-perl all 3.20-4 [12.5 kB] 1400s Get:71 http://ftpmaster.internal/ubuntu jammy/main ppc64el liburi-perl all 5.10-1 [78.8 kB] 1400s Get:72 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-parser-perl ppc64el 3.76-1build2 [93.6 kB] 1400s Get:73 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tree-perl all 5.07-2 [200 kB] 1400s Get:74 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-html-perl all 1.004-2 [15.4 kB] 1400s Get:75 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 1400s Get:76 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-message-perl all 6.36-1 [76.8 kB] 1400s Get:77 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-cookies-perl all 6.10-1 [18.4 kB] 1400s Get:78 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-negotiate-perl all 6.01-1 [12.5 kB] 1400s Get:79 http://ftpmaster.internal/ubuntu jammy/main ppc64el perl-openssl-defaults ppc64el 5build2 [7540 B] 1400s Get:80 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-ssleay-perl ppc64el 1.92-1build2 [332 kB] 1400s Get:81 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-socket-ssl-perl all 2.074-2 [192 kB] 1400s Get:82 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-http-perl all 6.22-1 [23.2 kB] 1400s Get:83 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 1400s Get:84 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtry-tiny-perl all 0.31-1 [21.8 kB] 1400s Get:85 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-robotrules-perl all 6.02-1 [12.6 kB] 1400s Get:86 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-perl all 6.61-1 [141 kB] 1400s Get:87 http://ftpmaster.internal/ubuntu jammy/main ppc64el patchutils ppc64el 0.4.2-1build2 [86.6 kB] 1400s Get:88 http://ftpmaster.internal/ubuntu jammy/main ppc64el wdiff ppc64el 1.2.2-2build3 [29.5 kB] 1400s Get:89 http://ftpmaster.internal/ubuntu jammy/main ppc64el devscripts ppc64el 2.22.1ubuntu1 [1058 kB] 1400s Get:90 http://ftpmaster.internal/ubuntu jammy/main ppc64el liberror-perl all 0.17029-1 [26.5 kB] 1400s Get:91 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 1400s Get:92 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git ppc64el 1:2.34.1-1ubuntu1.12 [4143 kB] 1401s Get:93 http://ftpmaster.internal/ubuntu jammy/main ppc64el python3-dateutil all 2.8.1-6 [78.4 kB] 1401s Get:94 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-buildpackage all 0.9.25 [799 kB] 1401s Get:95 http://ftpmaster.internal/ubuntu jammy/main ppc64el libexporter-tiny-perl all 1.002002-1 [36.2 kB] 1401s Get:96 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-xs-perl ppc64el 0.430-2build2 [42.5 kB] 1401s Get:97 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-perl all 0.430-2 [38.2 kB] 1401s Get:98 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-debian all 0.1.43ubuntu1.1 [107 kB] 1401s Get:99 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-gpg ppc64el 1.16.0-1.2ubuntu4.2 [227 kB] 1401s Get:100 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el dput all 1.1.0ubuntu2.1 [44.7 kB] 1401s Get:101 http://ftpmaster.internal/ubuntu jammy/main ppc64el libjson-perl all 4.04000-1 [81.8 kB] 1401s Get:102 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtext-glob-perl all 0.11-2 [8042 B] 1401s Get:103 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libwww-curl-perl ppc64el 4.17-7build2 [72.5 kB] 1401s Get:104 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libtext-csv-perl all 2.01-1 [108 kB] 1401s Get:105 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit all 9.15 [194 kB] 1401s Get:106 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfile-fnmatch-perl ppc64el 0.02-2build8 [10.5 kB] 1401s Get:107 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-debrebase all 9.15 [67.5 kB] 1401s Get:108 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdbi-perl ppc64el 1.643-3build3 [748 kB] 1401s Get:109 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libdbd-sqlite3-perl ppc64el 1.70-3build1 [172 kB] 1401s Get:110 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el sqlite3 ppc64el 3.37.2-2ubuntu0.3 [880 kB] 1401s Get:111 http://ftpmaster.internal/ubuntu jammy/universe ppc64el chiark-utils-bin ppc64el 6.1.2+nmu1 [55.7 kB] 1401s Get:112 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit-infrastructure all 9.15 [40.8 kB] 1401s Get:113 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfaketime ppc64el 0.9.8-9 [35.9 kB] 1401s Get:114 http://ftpmaster.internal/ubuntu jammy/universe ppc64el faketime ppc64el 0.9.8-9 [10.3 kB] 1402s Fetched 68.5 MB in 5s (14.5 MB/s) 1402s Selecting previously unselected package m4. 1403s (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 ... 101007 files and directories currently installed.) 1403s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_ppc64el.deb ... 1403s Unpacking m4 (1.4.18-5ubuntu2) ... 1403s Selecting previously unselected package autoconf. 1403s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 1403s Unpacking autoconf (2.71-2) ... 1403s Selecting previously unselected package autotools-dev. 1403s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 1403s Unpacking autotools-dev (20220109.1) ... 1403s Selecting previously unselected package automake. 1403s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 1403s Unpacking automake (1:1.16.5-1.3) ... 1403s Selecting previously unselected package autopoint. 1403s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 1403s Unpacking autopoint (0.21-4ubuntu4) ... 1403s Selecting previously unselected package libc-dev-bin. 1403s Preparing to unpack .../005-libc-dev-bin_2.35-0ubuntu3.9_ppc64el.deb ... 1403s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 1403s Selecting previously unselected package linux-libc-dev:ppc64el. 1403s Preparing to unpack .../006-linux-libc-dev_5.15.0-136.147_ppc64el.deb ... 1403s Unpacking linux-libc-dev:ppc64el (5.15.0-136.147) ... 1403s Selecting previously unselected package libcrypt-dev:ppc64el. 1403s Preparing to unpack .../007-libcrypt-dev_1%3a4.4.27-1_ppc64el.deb ... 1403s Unpacking libcrypt-dev:ppc64el (1:4.4.27-1) ... 1403s Selecting previously unselected package rpcsvc-proto. 1403s Preparing to unpack .../008-rpcsvc-proto_1.4.2-0ubuntu6_ppc64el.deb ... 1403s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 1403s Selecting previously unselected package libtirpc-dev:ppc64el. 1403s Preparing to unpack .../009-libtirpc-dev_1.3.2-2ubuntu0.1_ppc64el.deb ... 1403s Unpacking libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 1403s Selecting previously unselected package libnsl-dev:ppc64el. 1403s Preparing to unpack .../010-libnsl-dev_1.3.0-2build2_ppc64el.deb ... 1403s Unpacking libnsl-dev:ppc64el (1.3.0-2build2) ... 1403s Selecting previously unselected package libc6-dev:ppc64el. 1403s Preparing to unpack .../011-libc6-dev_2.35-0ubuntu3.9_ppc64el.deb ... 1403s Unpacking libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 1403s Selecting previously unselected package gcc-11-base:ppc64el. 1403s Preparing to unpack .../012-gcc-11-base_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1403s Unpacking gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 1403s Selecting previously unselected package libisl23:ppc64el. 1403s Preparing to unpack .../013-libisl23_0.24-2build1_ppc64el.deb ... 1403s Unpacking libisl23:ppc64el (0.24-2build1) ... 1403s Selecting previously unselected package libmpc3:ppc64el. 1403s Preparing to unpack .../014-libmpc3_1.2.1-2build1_ppc64el.deb ... 1403s Unpacking libmpc3:ppc64el (1.2.1-2build1) ... 1403s Selecting previously unselected package cpp-11. 1403s Preparing to unpack .../015-cpp-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1403s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 1403s Selecting previously unselected package cpp. 1403s Preparing to unpack .../016-cpp_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 1403s Unpacking cpp (4:11.2.0-1ubuntu1) ... 1403s Selecting previously unselected package libcc1-0:ppc64el. 1403s Preparing to unpack .../017-libcc1-0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1403s Unpacking libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 1403s Selecting previously unselected package libgomp1:ppc64el. 1403s Preparing to unpack .../018-libgomp1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1403s Unpacking libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1403s Selecting previously unselected package libitm1:ppc64el. 1403s Preparing to unpack .../019-libitm1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1403s Unpacking libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1403s Selecting previously unselected package libatomic1:ppc64el. 1403s Preparing to unpack .../020-libatomic1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1403s Unpacking libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1403s Selecting previously unselected package libasan6:ppc64el. 1403s Preparing to unpack .../021-libasan6_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1403s Unpacking libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 1403s Selecting previously unselected package liblsan0:ppc64el. 1403s Preparing to unpack .../022-liblsan0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1403s Unpacking liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 1403s Selecting previously unselected package libtsan0:ppc64el. 1404s Preparing to unpack .../023-libtsan0_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1404s Unpacking libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 1404s Selecting previously unselected package libubsan1:ppc64el. 1404s Preparing to unpack .../024-libubsan1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1404s Unpacking libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1404s Selecting previously unselected package libquadmath0:ppc64el. 1404s Preparing to unpack .../025-libquadmath0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1404s Unpacking libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 1404s Selecting previously unselected package libgcc-11-dev:ppc64el. 1404s Preparing to unpack .../026-libgcc-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1404s Unpacking libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 1404s Selecting previously unselected package gcc-11. 1404s Preparing to unpack .../027-gcc-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1404s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 1404s Selecting previously unselected package gcc. 1404s Preparing to unpack .../028-gcc_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 1404s Unpacking gcc (4:11.2.0-1ubuntu1) ... 1404s Selecting previously unselected package libstdc++-11-dev:ppc64el. 1404s Preparing to unpack .../029-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1404s Unpacking libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 1404s Selecting previously unselected package g++-11. 1404s Preparing to unpack .../030-g++-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1404s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 1404s Selecting previously unselected package g++. 1404s Preparing to unpack .../031-g++_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 1404s Unpacking g++ (4:11.2.0-1ubuntu1) ... 1404s Selecting previously unselected package build-essential. 1404s Preparing to unpack .../032-build-essential_12.9ubuntu3_ppc64el.deb ... 1404s Unpacking build-essential (12.9ubuntu3) ... 1404s Selecting previously unselected package libdebhelper-perl. 1404s Preparing to unpack .../033-libdebhelper-perl_13.6ubuntu1_all.deb ... 1404s Unpacking libdebhelper-perl (13.6ubuntu1) ... 1404s Selecting previously unselected package libtool. 1404s Preparing to unpack .../034-libtool_2.4.6-15build2_all.deb ... 1404s Unpacking libtool (2.4.6-15build2) ... 1404s Selecting previously unselected package dh-autoreconf. 1404s Preparing to unpack .../035-dh-autoreconf_20_all.deb ... 1404s Unpacking dh-autoreconf (20) ... 1404s Selecting previously unselected package libarchive-zip-perl. 1404s Preparing to unpack .../036-libarchive-zip-perl_1.68-1_all.deb ... 1404s Unpacking libarchive-zip-perl (1.68-1) ... 1404s Selecting previously unselected package libsub-override-perl. 1404s Preparing to unpack .../037-libsub-override-perl_0.09-2_all.deb ... 1404s Unpacking libsub-override-perl (0.09-2) ... 1404s Selecting previously unselected package libfile-stripnondeterminism-perl. 1404s Preparing to unpack .../038-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 1404s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 1404s Selecting previously unselected package dh-strip-nondeterminism. 1404s Preparing to unpack .../039-dh-strip-nondeterminism_1.13.0-1_all.deb ... 1404s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 1404s Selecting previously unselected package debugedit. 1404s Preparing to unpack .../040-debugedit_1%3a5.0-4build1_ppc64el.deb ... 1404s Unpacking debugedit (1:5.0-4build1) ... 1404s Selecting previously unselected package dwz. 1405s Preparing to unpack .../041-dwz_0.14-1build2_ppc64el.deb ... 1405s Unpacking dwz (0.14-1build2) ... 1405s Selecting previously unselected package gettext. 1405s Preparing to unpack .../042-gettext_0.21-4ubuntu4_ppc64el.deb ... 1405s Unpacking gettext (0.21-4ubuntu4) ... 1405s Selecting previously unselected package intltool-debian. 1405s Preparing to unpack .../043-intltool-debian_0.35.0+20060710.5_all.deb ... 1405s Unpacking intltool-debian (0.35.0+20060710.5) ... 1405s Selecting previously unselected package po-debconf. 1405s Preparing to unpack .../044-po-debconf_1.0.21+nmu1_all.deb ... 1405s Unpacking po-debconf (1.0.21+nmu1) ... 1405s Selecting previously unselected package debhelper. 1405s Preparing to unpack .../045-debhelper_13.6ubuntu1_all.deb ... 1405s Unpacking debhelper (13.6ubuntu1) ... 1405s Selecting previously unselected package libfakeroot:ppc64el. 1405s Preparing to unpack .../046-libfakeroot_1.28-1ubuntu1_ppc64el.deb ... 1405s Unpacking libfakeroot:ppc64el (1.28-1ubuntu1) ... 1405s Selecting previously unselected package fakeroot. 1405s Preparing to unpack .../047-fakeroot_1.28-1ubuntu1_ppc64el.deb ... 1405s Unpacking fakeroot (1.28-1ubuntu1) ... 1405s Selecting previously unselected package libfile-dirlist-perl. 1405s Preparing to unpack .../048-libfile-dirlist-perl_0.05-2_all.deb ... 1405s Unpacking libfile-dirlist-perl (0.05-2) ... 1405s Selecting previously unselected package libfile-which-perl. 1405s Preparing to unpack .../049-libfile-which-perl_1.23-1_all.deb ... 1405s Unpacking libfile-which-perl (1.23-1) ... 1405s Selecting previously unselected package libfile-homedir-perl. 1405s Preparing to unpack .../050-libfile-homedir-perl_1.006-1_all.deb ... 1405s Unpacking libfile-homedir-perl (1.006-1) ... 1405s Selecting previously unselected package libfile-touch-perl. 1405s Preparing to unpack .../051-libfile-touch-perl_0.12-1_all.deb ... 1405s Unpacking libfile-touch-perl (0.12-1) ... 1405s Selecting previously unselected package libio-pty-perl. 1405s Preparing to unpack .../052-libio-pty-perl_1%3a1.15-2build2_ppc64el.deb ... 1405s Unpacking libio-pty-perl (1:1.15-2build2) ... 1405s Selecting previously unselected package libipc-run-perl. 1405s Preparing to unpack .../053-libipc-run-perl_20200505.0-1_all.deb ... 1405s Unpacking libipc-run-perl (20200505.0-1) ... 1405s Selecting previously unselected package libclass-method-modifiers-perl. 1405s Preparing to unpack .../054-libclass-method-modifiers-perl_2.13-1_all.deb ... 1405s Unpacking libclass-method-modifiers-perl (2.13-1) ... 1405s Selecting previously unselected package libclass-xsaccessor-perl. 1405s Preparing to unpack .../055-libclass-xsaccessor-perl_1.19-3build9_ppc64el.deb ... 1405s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 1405s Selecting previously unselected package libb-hooks-op-check-perl. 1405s Preparing to unpack .../056-libb-hooks-op-check-perl_0.22-1build5_ppc64el.deb ... 1405s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 1405s Selecting previously unselected package libdynaloader-functions-perl. 1405s Preparing to unpack .../057-libdynaloader-functions-perl_0.003-1.1_all.deb ... 1405s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 1405s Selecting previously unselected package libdevel-callchecker-perl. 1405s Preparing to unpack .../058-libdevel-callchecker-perl_0.008-1ubuntu4_ppc64el.deb ... 1405s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 1405s Selecting previously unselected package libparams-classify-perl. 1405s Preparing to unpack .../059-libparams-classify-perl_0.015-1build5_ppc64el.deb ... 1405s Unpacking libparams-classify-perl (0.015-1build5) ... 1405s Selecting previously unselected package libmodule-runtime-perl. 1405s Preparing to unpack .../060-libmodule-runtime-perl_0.016-1_all.deb ... 1405s Unpacking libmodule-runtime-perl (0.016-1) ... 1405s Selecting previously unselected package libimport-into-perl. 1405s Preparing to unpack .../061-libimport-into-perl_1.002005-1_all.deb ... 1405s Unpacking libimport-into-perl (1.002005-1) ... 1405s Selecting previously unselected package librole-tiny-perl. 1405s Preparing to unpack .../062-librole-tiny-perl_2.002004-1_all.deb ... 1405s Unpacking librole-tiny-perl (2.002004-1) ... 1405s Selecting previously unselected package libsub-quote-perl. 1405s Preparing to unpack .../063-libsub-quote-perl_2.006006-1_all.deb ... 1405s Unpacking libsub-quote-perl (2.006006-1) ... 1405s Selecting previously unselected package libmoo-perl. 1405s Preparing to unpack .../064-libmoo-perl_2.005004-3_all.deb ... 1405s Unpacking libmoo-perl (2.005004-3) ... 1405s Selecting previously unselected package libencode-locale-perl. 1405s Preparing to unpack .../065-libencode-locale-perl_1.05-1.1_all.deb ... 1405s Unpacking libencode-locale-perl (1.05-1.1) ... 1405s Selecting previously unselected package libtimedate-perl. 1405s Preparing to unpack .../066-libtimedate-perl_2.3300-2_all.deb ... 1405s Unpacking libtimedate-perl (2.3300-2) ... 1405s Selecting previously unselected package libhttp-date-perl. 1405s Preparing to unpack .../067-libhttp-date-perl_6.05-1_all.deb ... 1405s Unpacking libhttp-date-perl (6.05-1) ... 1405s Selecting previously unselected package libfile-listing-perl. 1405s Preparing to unpack .../068-libfile-listing-perl_6.14-1_all.deb ... 1405s Unpacking libfile-listing-perl (6.14-1) ... 1405s Selecting previously unselected package libhtml-tagset-perl. 1405s Preparing to unpack .../069-libhtml-tagset-perl_3.20-4_all.deb ... 1405s Unpacking libhtml-tagset-perl (3.20-4) ... 1405s Selecting previously unselected package liburi-perl. 1405s Preparing to unpack .../070-liburi-perl_5.10-1_all.deb ... 1405s Unpacking liburi-perl (5.10-1) ... 1405s Selecting previously unselected package libhtml-parser-perl:ppc64el. 1405s Preparing to unpack .../071-libhtml-parser-perl_3.76-1build2_ppc64el.deb ... 1405s Unpacking libhtml-parser-perl:ppc64el (3.76-1build2) ... 1405s Selecting previously unselected package libhtml-tree-perl. 1405s Preparing to unpack .../072-libhtml-tree-perl_5.07-2_all.deb ... 1405s Unpacking libhtml-tree-perl (5.07-2) ... 1405s Selecting previously unselected package libio-html-perl. 1405s Preparing to unpack .../073-libio-html-perl_1.004-2_all.deb ... 1405s Unpacking libio-html-perl (1.004-2) ... 1405s Selecting previously unselected package liblwp-mediatypes-perl. 1405s Preparing to unpack .../074-liblwp-mediatypes-perl_6.04-1_all.deb ... 1405s Unpacking liblwp-mediatypes-perl (6.04-1) ... 1405s Selecting previously unselected package libhttp-message-perl. 1405s Preparing to unpack .../075-libhttp-message-perl_6.36-1_all.deb ... 1405s Unpacking libhttp-message-perl (6.36-1) ... 1405s Selecting previously unselected package libhttp-cookies-perl. 1405s Preparing to unpack .../076-libhttp-cookies-perl_6.10-1_all.deb ... 1405s Unpacking libhttp-cookies-perl (6.10-1) ... 1405s Selecting previously unselected package libhttp-negotiate-perl. 1405s Preparing to unpack .../077-libhttp-negotiate-perl_6.01-1_all.deb ... 1405s Unpacking libhttp-negotiate-perl (6.01-1) ... 1405s Selecting previously unselected package perl-openssl-defaults:ppc64el. 1405s Preparing to unpack .../078-perl-openssl-defaults_5build2_ppc64el.deb ... 1405s Unpacking perl-openssl-defaults:ppc64el (5build2) ... 1405s Selecting previously unselected package libnet-ssleay-perl:ppc64el. 1405s Preparing to unpack .../079-libnet-ssleay-perl_1.92-1build2_ppc64el.deb ... 1405s Unpacking libnet-ssleay-perl:ppc64el (1.92-1build2) ... 1405s Selecting previously unselected package libio-socket-ssl-perl. 1405s Preparing to unpack .../080-libio-socket-ssl-perl_2.074-2_all.deb ... 1405s Unpacking libio-socket-ssl-perl (2.074-2) ... 1405s Selecting previously unselected package libnet-http-perl. 1405s Preparing to unpack .../081-libnet-http-perl_6.22-1_all.deb ... 1405s Unpacking libnet-http-perl (6.22-1) ... 1405s Selecting previously unselected package liblwp-protocol-https-perl. 1405s Preparing to unpack .../082-liblwp-protocol-https-perl_6.10-1_all.deb ... 1405s Unpacking liblwp-protocol-https-perl (6.10-1) ... 1405s Selecting previously unselected package libtry-tiny-perl. 1405s Preparing to unpack .../083-libtry-tiny-perl_0.31-1_all.deb ... 1405s Unpacking libtry-tiny-perl (0.31-1) ... 1406s Selecting previously unselected package libwww-robotrules-perl. 1406s Preparing to unpack .../084-libwww-robotrules-perl_6.02-1_all.deb ... 1406s Unpacking libwww-robotrules-perl (6.02-1) ... 1406s Selecting previously unselected package libwww-perl. 1406s Preparing to unpack .../085-libwww-perl_6.61-1_all.deb ... 1406s Unpacking libwww-perl (6.61-1) ... 1406s Selecting previously unselected package patchutils. 1406s Preparing to unpack .../086-patchutils_0.4.2-1build2_ppc64el.deb ... 1406s Unpacking patchutils (0.4.2-1build2) ... 1406s Selecting previously unselected package wdiff. 1406s Preparing to unpack .../087-wdiff_1.2.2-2build3_ppc64el.deb ... 1406s Unpacking wdiff (1.2.2-2build3) ... 1406s Selecting previously unselected package devscripts. 1406s Preparing to unpack .../088-devscripts_2.22.1ubuntu1_ppc64el.deb ... 1406s Unpacking devscripts (2.22.1ubuntu1) ... 1406s Selecting previously unselected package liberror-perl. 1406s Preparing to unpack .../089-liberror-perl_0.17029-1_all.deb ... 1406s Unpacking liberror-perl (0.17029-1) ... 1406s Selecting previously unselected package git-man. 1406s Preparing to unpack .../090-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 1406s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 1406s Selecting previously unselected package git. 1406s Preparing to unpack .../091-git_1%3a2.34.1-1ubuntu1.12_ppc64el.deb ... 1406s Unpacking git (1:2.34.1-1ubuntu1.12) ... 1406s Selecting previously unselected package python3-dateutil. 1406s Preparing to unpack .../092-python3-dateutil_2.8.1-6_all.deb ... 1406s Unpacking python3-dateutil (2.8.1-6) ... 1406s Selecting previously unselected package git-buildpackage. 1406s Preparing to unpack .../093-git-buildpackage_0.9.25_all.deb ... 1406s Unpacking git-buildpackage (0.9.25) ... 1406s Selecting previously unselected package libexporter-tiny-perl. 1406s Preparing to unpack .../094-libexporter-tiny-perl_1.002002-1_all.deb ... 1406s Unpacking libexporter-tiny-perl (1.002002-1) ... 1406s Selecting previously unselected package liblist-moreutils-xs-perl. 1406s Preparing to unpack .../095-liblist-moreutils-xs-perl_0.430-2build2_ppc64el.deb ... 1406s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 1406s Selecting previously unselected package liblist-moreutils-perl. 1406s Preparing to unpack .../096-liblist-moreutils-perl_0.430-2_all.deb ... 1406s Unpacking liblist-moreutils-perl (0.430-2) ... 1406s Selecting previously unselected package python3-debian. 1406s Preparing to unpack .../097-python3-debian_0.1.43ubuntu1.1_all.deb ... 1406s Unpacking python3-debian (0.1.43ubuntu1.1) ... 1406s Selecting previously unselected package python3-gpg. 1406s Preparing to unpack .../098-python3-gpg_1.16.0-1.2ubuntu4.2_ppc64el.deb ... 1406s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 1406s Selecting previously unselected package dput. 1406s Preparing to unpack .../099-dput_1.1.0ubuntu2.1_all.deb ... 1406s Unpacking dput (1.1.0ubuntu2.1) ... 1406s Selecting previously unselected package libjson-perl. 1406s Preparing to unpack .../100-libjson-perl_4.04000-1_all.deb ... 1406s Unpacking libjson-perl (4.04000-1) ... 1406s Selecting previously unselected package libtext-glob-perl. 1406s Preparing to unpack .../101-libtext-glob-perl_0.11-2_all.deb ... 1406s Unpacking libtext-glob-perl (0.11-2) ... 1406s Selecting previously unselected package libwww-curl-perl. 1406s Preparing to unpack .../102-libwww-curl-perl_4.17-7build2_ppc64el.deb ... 1406s Unpacking libwww-curl-perl (4.17-7build2) ... 1406s Selecting previously unselected package libtext-csv-perl. 1406s Preparing to unpack .../103-libtext-csv-perl_2.01-1_all.deb ... 1406s Unpacking libtext-csv-perl (2.01-1) ... 1406s Selecting previously unselected package dgit. 1406s Preparing to unpack .../104-dgit_9.15_all.deb ... 1406s Unpacking dgit (9.15) ... 1406s Selecting previously unselected package libfile-fnmatch-perl. 1406s Preparing to unpack .../105-libfile-fnmatch-perl_0.02-2build8_ppc64el.deb ... 1406s Unpacking libfile-fnmatch-perl (0.02-2build8) ... 1406s Selecting previously unselected package git-debrebase. 1406s Preparing to unpack .../106-git-debrebase_9.15_all.deb ... 1406s Unpacking git-debrebase (9.15) ... 1406s Selecting previously unselected package libdbi-perl:ppc64el. 1406s Preparing to unpack .../107-libdbi-perl_1.643-3build3_ppc64el.deb ... 1406s Unpacking libdbi-perl:ppc64el (1.643-3build3) ... 1406s Selecting previously unselected package libdbd-sqlite3-perl:ppc64el. 1406s Preparing to unpack .../108-libdbd-sqlite3-perl_1.70-3build1_ppc64el.deb ... 1406s Unpacking libdbd-sqlite3-perl:ppc64el (1.70-3build1) ... 1406s Selecting previously unselected package sqlite3. 1406s Preparing to unpack .../109-sqlite3_3.37.2-2ubuntu0.3_ppc64el.deb ... 1406s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 1407s Selecting previously unselected package chiark-utils-bin. 1407s Preparing to unpack .../110-chiark-utils-bin_6.1.2+nmu1_ppc64el.deb ... 1407s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 1407s Selecting previously unselected package dgit-infrastructure. 1407s Preparing to unpack .../111-dgit-infrastructure_9.15_all.deb ... 1407s Unpacking dgit-infrastructure (9.15) ... 1407s Selecting previously unselected package libfaketime:ppc64el. 1407s Preparing to unpack .../112-libfaketime_0.9.8-9_ppc64el.deb ... 1407s Unpacking libfaketime:ppc64el (0.9.8-9) ... 1407s Selecting previously unselected package faketime. 1407s Preparing to unpack .../113-faketime_0.9.8-9_ppc64el.deb ... 1407s Unpacking faketime (0.9.8-9) ... 1407s Setting up wdiff (1.2.2-2build3) ... 1407s Setting up gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 1407s Setting up libfile-which-perl (1.23-1) ... 1407s Setting up libdynaloader-functions-perl (0.003-1.1) ... 1407s Setting up libtext-glob-perl (0.11-2) ... 1407s Setting up libclass-method-modifiers-perl (2.13-1) ... 1407s Setting up libio-pty-perl (1:1.15-2build2) ... 1407s Setting up libarchive-zip-perl (1.68-1) ... 1407s Setting up libhtml-tagset-perl (3.20-4) ... 1407s Setting up libdebhelper-perl (13.6ubuntu1) ... 1407s Setting up liblwp-mediatypes-perl (6.04-1) ... 1407s Setting up libtry-tiny-perl (0.31-1) ... 1407s Setting up perl-openssl-defaults:ppc64el (5build2) ... 1407s Setting up linux-libc-dev:ppc64el (5.15.0-136.147) ... 1407s Setting up m4 (1.4.18-5ubuntu2) ... 1407s Setting up libwww-curl-perl (4.17-7build2) ... 1407s Setting up libencode-locale-perl (1.05-1.1) ... 1407s Setting up libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1407s Setting up libfakeroot:ppc64el (1.28-1ubuntu1) ... 1407s Setting up libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 1407s Setting up chiark-utils-bin (6.1.2+nmu1) ... 1407s Setting up fakeroot (1.28-1ubuntu1) ... 1407s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 1407s Setting up liberror-perl (0.17029-1) ... 1407s Setting up patchutils (0.4.2-1build2) ... 1407s Setting up autotools-dev (20220109.1) ... 1407s Setting up libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 1407s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 1407s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 1407s Setting up python3-debian (0.1.43ubuntu1.1) ... 1407s Setting up libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 1407s Setting up libmpc3:ppc64el (1.2.1-2build1) ... 1407s Setting up libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1407s Setting up libio-html-perl (1.004-2) ... 1407s Setting up autopoint (0.21-4ubuntu4) ... 1407s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 1407s Setting up libipc-run-perl (20200505.0-1) ... 1407s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 1407s Setting up autoconf (2.71-2) ... 1407s Setting up libfile-fnmatch-perl (0.02-2build8) ... 1407s Setting up libtimedate-perl (2.3300-2) ... 1407s Setting up libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1407s Setting up dwz (0.14-1build2) ... 1407s Setting up libnsl-dev:ppc64el (1.3.0-2build2) ... 1407s Setting up libcrypt-dev:ppc64el (1:4.4.27-1) ... 1407s Setting up libjson-perl (4.04000-1) ... 1407s Setting up librole-tiny-perl (2.002004-1) ... 1407s Setting up debugedit (1:5.0-4build1) ... 1407s Setting up libsub-override-perl (0.09-2) ... 1407s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 1407s Setting up python3-dateutil (2.8.1-6) ... 1407s Setting up libsub-quote-perl (2.006006-1) ... 1407s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 1407s Setting up libexporter-tiny-perl (1.002002-1) ... 1407s Setting up libfile-dirlist-perl (0.05-2) ... 1407s Setting up libisl23:ppc64el (0.24-2build1) ... 1407s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 1407s Setting up libfile-homedir-perl (1.006-1) ... 1407s Setting up libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 1407s Setting up liburi-perl (5.10-1) ... 1407s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 1407s Setting up libfile-touch-perl (0.12-1) ... 1407s Setting up libdbi-perl:ppc64el (1.643-3build3) ... 1407s Setting up liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 1407s Setting up libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1407s Setting up libfaketime:ppc64el (0.9.8-9) ... 1407s Setting up libtext-csv-perl (2.01-1) ... 1407s Setting up libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 1407s Setting up libnet-ssleay-perl:ppc64el (1.92-1build2) ... 1407s Setting up automake (1:1.16.5-1.3) ... 1407s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 1407s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 1407s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 1407s Setting up faketime (0.9.8-9) ... 1407s Setting up libhttp-date-perl (6.05-1) ... 1407s Setting up gettext (0.21-4ubuntu4) ... 1407s Setting up libfile-listing-perl (6.14-1) ... 1407s Setting up liblist-moreutils-perl (0.430-2) ... 1407s Setting up libnet-http-perl (6.22-1) ... 1407s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 1407s Setting up dput (1.1.0ubuntu2.1) ... 1407s Setting up intltool-debian (0.35.0+20060710.5) ... 1407s Setting up git (1:2.34.1-1ubuntu1.12) ... 1407s Setting up dh-strip-nondeterminism (1.13.0-1) ... 1407s Setting up libwww-robotrules-perl (6.02-1) ... 1407s Setting up libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 1407s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 1407s Setting up cpp (4:11.2.0-1ubuntu1) ... 1407s Setting up libhtml-parser-perl:ppc64el (3.76-1build2) ... 1407s Setting up libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 1407s Setting up libdbd-sqlite3-perl:ppc64el (1.70-3build1) ... 1407s Setting up libio-socket-ssl-perl (2.074-2) ... 1407s Setting up libhttp-message-perl (6.36-1) ... 1407s Setting up libhttp-negotiate-perl (6.01-1) ... 1407s Setting up libhttp-cookies-perl (6.10-1) ... 1407s Setting up libtool (2.4.6-15build2) ... 1407s Setting up po-debconf (1.0.21+nmu1) ... 1407s Setting up libhtml-tree-perl (5.07-2) ... 1407s Setting up libparams-classify-perl (0.015-1build5) ... 1407s Setting up gcc (4:11.2.0-1ubuntu1) ... 1407s Setting up dh-autoreconf (20) ... 1407s Setting up libmodule-runtime-perl (0.016-1) ... 1407s Setting up libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 1407s Setting up dgit-infrastructure (9.15) ... 1407s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 1407s Setting up libimport-into-perl (1.002005-1) ... 1407s Setting up libmoo-perl (2.005004-3) ... 1407s Setting up debhelper (13.6ubuntu1) ... 1407s Setting up g++ (4:11.2.0-1ubuntu1) ... 1407s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 1407s Setting up build-essential (12.9ubuntu3) ... 1407s Setting up liblwp-protocol-https-perl (6.10-1) ... 1407s Setting up libwww-perl (6.61-1) ... 1407s Setting up devscripts (2.22.1ubuntu1) ... 1408s Setting up git-buildpackage (0.9.25) ... 1408s Setting up git-debrebase (9.15) ... 1408s Setting up dgit (9.15) ... 1408s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 1408s Processing triggers for man-db (2.10.2-1) ... 1408s Processing triggers for install-info (6.8-4build1) ... 1412s autopkgtest [23:10:42]: test gdr-diverge-nmu: [----------------------- 1412s ++ set -o pipefail 1412s ++ . tests/lib-core 1412s ++ . tests/lib-restricts 1412s ++ trap ' 1412s rc=$? 1412s set +x 1412s test $rc = 0 || echo " 1412s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1412s 1412s Most relevant logs are just before assignment rc=$rc 1412s Will now do cleanup etc. 1412s " 1412s set -x 1412s set +e 1412s pwd 1412s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1412s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1412s set -e 1412s test $rc = 0 || t-report-failure 1412s ' EXIT 1412s ++ t-filter-out-git-hyphen-dir 1412s ++ local pathent 1412s +++ type -p git-rev-parse 1412s +++ : 1412s ++ pathent= 1412s ++ case "$pathent" in 1412s ++ return 1412s ++ t-set-intree 1412s ++ '[' x = x ']' 1412s ++ return 1412s ++ : -D 1412s ++ export DGIT_TEST_DEBUG 1412s ++ : x 1412s ++ export DGIT_TEST_DEBPUSH_DEBUG 1412s ++ : 1412s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1412s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1412s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1412s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1412s ++ export LC_CTYPE=C.UTF-8 1412s ++ LC_CTYPE=C.UTF-8 1412s ++ unset CDPATH 1412s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1412s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1412s +++ pwd 1412s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1412s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1412s ++ testname=gdr-diverge-nmu 1412s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1412s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1412s ++ bpd=.. 1412s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1412s ++ '[' x '!=' x ']' 1412s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s +++ pwd 1412s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ t-set-using-tmp 1412s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1412s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1412s ++ export 'DEBFULLNAME=dgit test git user' 1412s ++ DEBFULLNAME='dgit test git user' 1412s ++ git config --global user.email dgit-test@debian.example.net 1412s ++ git config --global user.name 'dgit test git user' 1412s ++ git config --global protocol.ext.allow always 1412s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1412s ++ env -0 1412s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1412s ++ export DEBCHANGE_VENDOR=dpkg 1412s ++ DEBCHANGE_VENDOR=dpkg 1412s ++ unset VISUAL 1412s ++ unset GIT_EDITOR 1412s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1412s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1412s ++ cat 1412s ++ schroot=build 1412s ++ : aq 1412s ++ : archive/test-dummy 1412s ++ : sid:unstable 1412s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1412s ++ git config --global dgit.default.old-dsc-distro test-dummy 1412s ++ for import in ${autoimport-gnupg} 1412s ++ case "$0" in 1412s ++ t-setup-import gnupg 1412s ++ local setupname=gnupg 1412s ++ local setupsrc 1412s ++ local lock 1412s ++ '[' x = x ']' 1412s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1412s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1412s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1412s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1412s cd "$1"; shift 1412s setupname="$1"; shift 1412s simport="$1"; shift 1412s if [ -e "$simport" ]; then exit 0; fi 1412s env - "$@" \ 1412s "tests/setup/$setupname" 1412s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1412s + cd /tmp/autopkgtest.XK8uun/build.980/src 1412s + shift 1412s + setupname=gnupg 1412s + shift 1412s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1412s + shift 1412s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1412s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-diverge-nmu-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-diverge-nmu-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-diverge-nmu-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-diverge-nmu -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-diverge-nmu' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-diverge-nmu-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1412s ++ set -o pipefail 1412s ++ . tests/lib-core 1412s ++ . tests/lib-restricts 1412s ++ trap ' 1412s rc=$? 1412s set +x 1412s test $rc = 0 || echo " 1412s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1412s 1412s Most relevant logs are just before assignment rc=$rc 1412s Will now do cleanup etc. 1412s " 1412s set -x 1412s set +e 1412s pwd 1412s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1412s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1412s set -e 1412s test $rc = 0 || t-report-failure 1412s ' EXIT 1412s ++ t-filter-out-git-hyphen-dir 1412s ++ local pathent 1412s +++ type -p git-rev-parse 1412s +++ : 1412s ++ pathent= 1412s ++ case "$pathent" in 1412s ++ return 1412s ++ t-set-intree 1412s ++ '[' x = x ']' 1412s ++ return 1412s ++ : -D 1412s ++ export DGIT_TEST_DEBUG 1412s ++ : x 1412s ++ export DGIT_TEST_DEBPUSH_DEBUG 1412s ++ : 1412s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1412s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1412s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1412s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1412s ++ export LC_CTYPE=C.UTF-8 1412s ++ LC_CTYPE=C.UTF-8 1412s ++ unset CDPATH 1412s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1412s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1412s +++ pwd 1412s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1412s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1412s ++ testname=gnupg 1412s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1412s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1412s ++ bpd=.. 1412s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1412s ++ '[' x '!=' x ']' 1412s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s +++ pwd 1412s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ t-set-using-tmp 1412s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1412s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1412s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1412s ++ export 'DEBFULLNAME=dgit test git user' 1412s ++ DEBFULLNAME='dgit test git user' 1412s ++ git config --global user.email dgit-test@debian.example.net 1412s ++ git config --global user.name 'dgit test git user' 1412s ++ git config --global protocol.ext.allow always 1412s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1412s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1412s ++ export DEBCHANGE_VENDOR=dpkg 1412s ++ DEBCHANGE_VENDOR=dpkg 1412s ++ unset VISUAL 1412s ++ unset GIT_EDITOR 1412s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1412s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1412s ++ cat 1412s ++ schroot=build 1412s ++ : aq 1412s ++ : archive/test-dummy 1412s ++ : sid:unstable 1412s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1412s ++ git config --global dgit.default.old-dsc-distro test-dummy 1412s ++ for import in ${autoimport-gnupg} 1412s ++ case "$0" in 1412s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1412s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1412s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1412s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1412s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1412s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1412s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1412s + setup=' 1412s export GNUPGHOME=$tmp/gnupg 1412s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1412s 1412s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1412s ssb rsa2048 2013-11-17 [E] 1412s 1412s sec rsa2048 2014-01-26 [SC] 1412s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1412s uid [ultimate] Populus Romanus (test key) 1412s ssb rsa2048 2014-01-26 [E] 1412s 1412s sec rsa2048 2014-01-26 [SC] 1412s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1412s uid [ unknown] Hannibal (test key) 1412s ssb rsa2048 2014-01-26 [E] 1412s 1412s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1412s export GNUPGHOME=$tmp/gnupg 1412s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1412s 1412s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 1412s delete mode 100644 debian/source/format 1412s + git tag v1.0 1412s + : 'fake up that our quilt-tip was descended from upstream' 1412s + git checkout quilt-tip 1412s Switched to branch 'quilt-tip' 1412s + git merge --no-edit -s ours upstream 1412s Merge made by the 'ours' strategy. 1412s + : 'fake up that our quilt-tip had the patch queue in it' 1412s + git checkout patch-queue/quilt-tip 1412s Switched to branch 'patch-queue/quilt-tip' 1412s + gbp pq export 1412s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1412s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1412s + git add debian/patches 1412s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 1413s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 1413s 4 files changed, 50 insertions(+) 1413s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1413s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1413s create mode 100644 debian/patches/series 1413s create mode 100644 debian/patches/subdir/addnewups 1413s + : 'make branch names more conventional' 1413s + git branch -D master 1413s Deleted branch master (was 17d67db). 1413s + git branch -m quilt-tip master 1413s + not-gdr-processable origin 1413s + git branch gdr-unprocessable/origin 1413s + t-git-debrebase analyse 1413s + local gdr=git-debrebase 1413s + : ' 1413s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1413s + grep 'Unknown Unprocessable' 1413s + git-debrebase --dgit=dgit -D analyse 1413s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 1413s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1413s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1413s git-debrebase = AddPatches {"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Type" => "AddPatches","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n"} 1413s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1413s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1413s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1413s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Msg" => "Merge branch 'upstream' into quilt-tip\n","Contributor" => {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0,"Ix" => 0},"Overwritten" => [{"Differs" => 48,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Ix" => 1}],"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1413s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1413s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1413s git-debrebase = Upstream {"Msg" => "Add *.o to .gitignore\n","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 1413s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1413s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1413s git-debrebase = Mixed {"Type" => "Mixed","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Parents" => [{"Ix" => 0,"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}],"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n"} 1413s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1413s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1413s git-debrebase = Packaging {"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}],"Msg" => "echo EXAMPLE RULES TARGET\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Type" => "Packaging"} 1413s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1413s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1413s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Ix" => 0}],"Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Type" => "Packaging"} 1413s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1413s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1413s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Msg" => "WIP\n","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32,"Ix" => 0}]} 1413s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1413s git-debrebase ** Unknown 1413s git-debrebase *** WALK BOMB unrecognised 1413s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1413s ' 1413s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1413s + : 'fake up an upstream 2.0' 1413s + git branch make-upstream upstream 1413s + t-make-new-upstream-tarball 2.0 1413s + local uv=2.0 1413s + git checkout make-upstream 1413s Switched to branch 'make-upstream' 1413s + echo 'upstream 2.0' 1413s + git commit -a -m 'upstream 2.0 tarball' 1413s [make-upstream 4db56a8] upstream 2.0 tarball 1413s 1 file changed, 1 insertion(+) 1413s + t-make-orig example 2.0 make-upstream 1413s + local p=example 1413s + local v=2.0 1413s + local tag=make-upstream 1413s + ust=example_2.0.orig.tar.gz 1413s + GZIP=-1 1413s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1413s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1413s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1413s + git branch -D quilt-tip-2 1413s Deleted branch quilt-tip-2 (was 99fcab4). 1413s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1413s + git branch -D gitish-only 1413s Deleted branch gitish-only (was 2b2ddc8). 1413s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1413s + git branch -D quilt-tip-1.1 1413s Deleted branch quilt-tip-1.1 (was 7fc34be). 1413s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1413s + git branch -D patch-queue/quilt-tip 1413s Deleted branch patch-queue/quilt-tip (was d843a68). 1413s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1413s + git branch -D indep-arch 1413s Deleted branch indep-arch (was e215729). 1413s + : 'see what gbp import-orig does' 1413s + git checkout master 1413s Switched to branch 'master' 1413s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1413s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1413s gbp:info: Source package is example 1413s gbp:info: Upstream version is 2.0 1413s gbp:info: Replacing upstream source on 'master' 1413s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1413s + not-gdr-processable merge 1413s + git branch gdr-unprocessable/merge 1413s + t-git-debrebase analyse 1413s + local gdr=git-debrebase 1413s + : ' 1413s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1413s + git-debrebase --dgit=dgit -D analyse 1413s + grep 'Unknown Unprocessable' 1413s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 1413s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1413s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1413s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1413s git-debrebase ** Unknown 1413s git-debrebase *** WALK BOMB unrecognised 1413s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1413s ' 1413s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 1413s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1413s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1413s + DEBEMAIL=dgit-tests@example.org 1413s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1413s + 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) 1413s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1413s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1413s 1 file changed, 6 insertions(+) 1413s + t-dch-commit-r 1413s + t-dch-r-rune t-dch-commit 1413s + local cmd=t-dch-commit 1413s + shift 1413s + local suite=unstable 1413s + t-dch-commit -r -D unstable '' 1413s + t-debchange -r -D unstable '' 1413s + DEBEMAIL=dgit-tests@example.org 1413s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1413s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1413s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1413s libdistro-info-perl is not installed, Debian release names are not known. 1413s libdistro-info-perl is not installed, Ubuntu release names are not known. 1413s + git commit -m 'dch -r -D unstable ' debian/changelog 1413s [master f31021f] dch -r -D unstable 1413s 1 file changed, 3 insertions(+), 2 deletions(-) 1413s + echo garbage 1413s + git add debian/patches/garbage 1413s + git commit -m 'add garbage' debian/patches/garbage 1413s [master eb10718] add garbage 1413s 1 file changed, 1 insertion(+) 1413s create mode 100644 debian/patches/garbage 1413s + t-archive-none example 1413s + t-select-package example 1413s + p=example 1413s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1413s + t-archive-none-aq 1413s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 1413s + : 1413s + local 'jsondelim=[' 1413s + local suitespec 1413s + for suitespec in $suitespecs 1413s + local suite=sid 1413s + local sname=unstable 1413s + t-aq-archive-updated sid example 1413s + local suite=sid 1413s + local p=example 1413s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1413s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1413s + perl -wne ' 1413s use JSON; 1413s use strict; 1413s our @v; 1413s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1413s push @v, { 1413s "version" => "$1", 1413s "sha256sum" => "$2", 1413s "component" => "$3", 1413s "filename" => "$4", 1413s }; 1413s END { 1413s my $json = JSON->new->canonical(); 1413s print $json->encode(\@v) or die $!; 1413s } 1413s ' 1413s + t-aq-archive-updated new example 1413s + local suite=new 1413s + local p=example 1413s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1413s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1413s + perl -wne ' 1413s use JSON; 1413s use strict; 1413s our @v; 1413s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1413s push @v, { 1413s "version" => "$1", 1413s "sha256sum" => "$2", 1413s "component" => "$3", 1413s "filename" => "$4", 1413s }; 1413s END { 1413s my $json = JSON->new->canonical(); 1413s print $json->encode(\@v) or die $!; 1413s } 1413s ' 1413s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1413s + cat 1413s + jsondelim=' },' 1413s + cat 1413s + t-git-none 1413s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1413s + set -e 1413s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1413s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1413s + t-dgit -wgf --gbp push-source --new 1413s + local dgit=dgit 1413s + pwd 1413s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1413s + : ' 1413s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1413s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 1414s | git rev-parse --show-toplevel 1414s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1414s | git config -z --get-regexp --local '.*' 1414s | git config -z --get-regexp --local '.*' 1414s | git config -z --get-regexp --global '.*' 1414s | git config -z --get-regexp --system '.*' 1414s format 3.0 (quilt), quilt mode gbp 1414s Format `3.0 (quilt)', need to check/update patch stack 1414s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1414s => `' 1414s + git diff --quiet HEAD 1414s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1414s canonical suite name for unstable is sid 1414s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1414s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1414s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1414s | git rev-parse 'HEAD~0' 1414s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1414s | git symbolic-ref -q HEAD 1414s => `refs/heads/master' 1414s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1414s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1414s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1414s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1414s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1414s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 75290d233580a05177cf28ed36b4cf0a43b4ee7a75b6da4a4c3e9eb6e7be14dd 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1414s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1414s >(no reflog) 1414s splitbrain cache miss 1414s CD work 1414s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1414s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1414s + git checkout -q -b dgit-view 1414s examining quilt state (multiple patches, gbp mode) 1414s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1414s CD fake 1414s | find -name .git -prune -print0 1414s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1414s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 1414s + git add -Af . 1414s | git write-tree 1414s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 1414s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1414s CD .. 1414s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1414s CD ../fake 1414s + git add -Af . 1414s | git write-tree 1414s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1414s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1414s CD ../work 1414s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 1414s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 1414s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 1414s => `' 1414s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 1414s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 1414s => `lib.c\x00new-upstream-file\x00src.c\x00' 1414s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1414s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 1414s => `lib.c\x00new-upstream-file\x00src.c\x00' 1414s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1414s differences @dl == ## ## == == ==. 1414s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 1414s dgit: quilt differences: src: == orig ## gitignores: == orig == 1414s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1414s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1414s => `1530000000 +0000' 1414s dgit view: creating patches-applied version using gbp pq 1414s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 1414s + git update-ref refs/heads/dgit-view HEAD 1414s + git checkout -q dgit-view 1414s | git rev-parse 'HEAD~0' 1414s => `45ea71a69fa522ce760afdab8a420200443753e9' 1414s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1414s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 1414s => `' 1414s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 75290d233580a05177cf28ed36b4cf0a43b4ee7a75b6da4a4c3e9eb6e7be14dd 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 1414s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 1414s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1414s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1414s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1414s | git rev-parse 'HEAD~0' 1414s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1414s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1414s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1414s dpkg-source: info: using source format '3.0 (quilt)' 1414s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1414s dpkg-source: info: using patch list from debian/patches/series 1414s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 1414s dpkg-source: info: building example in example_2.0-1.dsc 1414s CD work 1414s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1414s package seems new, not specifying -v 1414s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 1414s dpkg-genchanges: info: not including original source code in upload 1414s CD .. 1414s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1414s renaming (Files) example_2.0.orig.tar.gz 1414s renaming (Files) example_2.0-1.debian.tar.xz 1414s renaming (dsc) example_2.0-1.dsc 1414s renaming (changes) example_2.0-1_source.changes 1414s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1414s actually entering push 1414s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1414s => `0' 1414s + git config remote.dgit.skipdefaultupdate true 1414s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1414s get_archive_dsc: nothing in archive, returning undef 1414s no version available from the archive 1414s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1414s => `' 1414s previous reference hash= 1414s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1414s => `' 1414s fetch_from_archive: lastfetch= 1414s nothing found! 1415s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1415s + git check-ref-format archive/test-dummy/2.0-1 1415s | git symbolic-ref -q HEAD 1415s => `refs/heads/master' 1415s | git rev-parse 'HEAD~0' 1415s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1415s ffq_prev_branchinfo branch current refs/heads/master 1415s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1415s => `' 1415s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1415s => `' 1415s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1415s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1415s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1415s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1415s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1415s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 75290d233580a05177cf28ed36b4cf0a43b4ee7a75b6da4a4c3e9eb6e7be14dd 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1415s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1415s CD work 1415s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1415s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1415s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1415s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 1415s splitbrain_pseudomerge... 1415s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1415s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1415s => `' 1415s + git diff --quiet HEAD 1415s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 1415s => `' 1415s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1415s checking that example_2.0-1.dsc corresponds to HEAD 1415s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc 1415s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc) 1415s dpkg-source: info: extracting example in example-2.0 1415s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1415s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 1415s dpkg-source: info: using patch list from debian/patches/series 1415s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1415s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1415s dpkg-source: info: applying subdir/addnewups 1415s CD example-2.0 1415s | find -name .git -prune -print0 1415s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1415s + git add -Af . 1415s | git write-tree 1415s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1415s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1415s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1415s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1415s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1415s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 1415s files_compare_inputs example_2.0-1.dsc 1415s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 1415s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1415s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 1415s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 1415s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1415s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 1415s files_compare_inputs example_2.0-1.dsc Files 1415s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 1415s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 1415s files_compare_inputs example_2.0-1_source.changes 1415s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 1415s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 1415s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 1415s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 1415s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 1415s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 1415s files_compare_inputs example_2.0-1_source.changes Files 1415s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 1415s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 1415s checking origs needed (2.0)... 1415s checking origs needed placement 'devel extra'... 1415s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1415s origs example_2.0.orig.tar.gz is_orig 1415s -| sh -ec 'cd "$1"; shift 1415s 1415s find -name "$1" -print0 | 1415s xargs -0r sha256sum 1415s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1415s origs example_2.0.orig.tar.gz $#$have=-1 1415s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1415s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 1415s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1415s push_tagwants: $VAR1 = [ 1415s '2.0-1', 1415s '45ea71a69fa522ce760afdab8a420200443753e9', 1415s 'eb10718ab213ccfa83613ebbddefbffda941a548', 1415s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1415s ]; 1415s $VAR2 = [ 1415s { 1415s 'TfSuffix' => '', 1415s 'View' => 'dgit', 1415s 'TagFn' => sub { "DUMMY" }, 1415s 'Tfn' => sub { "DUMMY" }, 1415s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1415s 'Tag' => 'archive/test-dummy/2.0-1' 1415s }, 1415s { 1415s 'Tag' => 'test-dummy/2.0-1', 1415s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 1415s 'Tfn' => sub { "DUMMY" }, 1415s 'View' => 'maint', 1415s 'TagFn' => sub { "DUMMY" }, 1415s 'TfSuffix' => '-maintview' 1415s } 1415s ]; 1415s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1415s => `1530000000 +0000' 1415s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1415s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1415s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1415s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 1415s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1415s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 1415s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1415s => `aee9cd2e780c31d95c69374962a0b39eefe0cf8d' 1415s + git verify-tag aee9cd2e780c31d95c69374962a0b39eefe0cf8d 1415s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1415s gpg: Signature made Mon Mar 31 23:10:45 2025 UTC 1415s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1415s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1415s gpg: WARNING: This key is not certified with a trusted signature! 1415s gpg: There is no indication that the signature belongs to the owner. 1415s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1415s + git update-ref refs/tags/archive/test-dummy/2.0-1 aee9cd2e780c31d95c69374962a0b39eefe0cf8d 1415s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 1415s => `253c9f310535cafce28dfdf19f17f3504e21b9cd' 1415s + git verify-tag 253c9f310535cafce28dfdf19f17f3504e21b9cd 1415s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1415s gpg: Signature made Mon Mar 31 23:10:45 2025 UTC 1415s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1415s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1415s gpg: WARNING: This key is not certified with a trusted signature! 1415s gpg: There is no indication that the signature belongs to the owner. 1415s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1415s + git update-ref refs/tags/test-dummy/2.0-1 253c9f310535cafce28dfdf19f17f3504e21b9cd 1415s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1415s => `0' 1415s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 1415s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 1415s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1415s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 1415s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 1415s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 1415s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 1415s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 1415s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1415s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1415s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1415s 1415s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 1415s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1416s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1416s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1416s 1416s Successfully signed dsc, changes files 1416s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 1416s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1416s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1416s D: Setting host argument. 1416s Checking signature on .changes 1416s Checking signature on .dsc 1416s Uploading to test-dummy (via local to localhost): 1416s Successfully uploaded packages. 1416s dgit ok: pushed and uploaded 2.0-1 1416s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1416s del_lrfetchrefs... 1416s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1416s ' 1416s + t-salsa-add-remote 1416s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1416s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1416s + set -e 1416s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1416s + git init --bare 1416s hint: Using 'master' as the name for the initial branch. This default branch name 1416s hint: is subject to change. To configure the initial branch name to use in all 1416s hint: of your new repositories, which will suppress this warning, call: 1416s hint: 1416s hint: git config --global init.defaultBranch 1416s hint: 1416s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1416s hint: 'development'. The just-created branch can be renamed via this command: 1416s hint: 1416s hint: git branch -m 1416s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example/ 1416s + git remote add origin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1416s + git push --set-upstream origin master 1416s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1416s * [new branch] master -> master 1416s Branch 'master' set up to track remote branch 'master' from 'origin'. 1416s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1416s + local 'mpat=E:identical in upstream files' 1416s + shift 1416s + set +o pipefail 1416s + LC_MESSAGES=C 1416s + LANGUAGE=C 1416s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1416s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1416s + local gdr=git-debrebase 1416s + : ' 1416s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1416s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1416s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1416s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 1416s docs/README | 1 + 1416s 1 file changed, 1 insertion(+) 1416s 1416s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1416s git-debrebase: identical in upstream files. See diffstat above, or run 1416s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 1416s + local 'ps=255 0' 1416s + set -o pipefail 1416s + case $ps in 1416s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1416s + local 'mpat=E:identical in upstream files' 1416s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1416s + local grepper=fgrep 1416s + case "$mpat" in 1416s + case "$mpat" in 1416s + grepper=egrep 1416s + mpat='identical in upstream files' 1416s + egrep -e 'identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1416s git-debrebase: identical in upstream files. See diffstat above, or run 1416s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1416s + local 'mpat=E:Unused patch file garbage will be discarded' 1416s + shift 1416s + set +o pipefail 1416s + LC_MESSAGES=C 1416s + LANGUAGE=C 1416s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1416s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1416s + local gdr=git-debrebase 1416s + : ' 1416s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1416s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1416s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1416s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1416s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1416s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1416s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1416s $VAR2 = bless( do{\(my $o = { 1416s 'in_order' => [ 1416s 'Source', 1416s 'Version', 1416s 'Distribution', 1416s 'Urgency', 1416s 'Maintainer', 1416s 'Timestamp', 1416s 'Date', 1416s 'Changes' 1416s ], 1416s 'fields' => { 1416s 'Source' => 'example', 1416s 'Version' => '2.0-1', 1416s 'Distribution' => 'unstable', 1416s 'Urgency' => 'medium', 1416s 'Maintainer' => 'dgit test git user ', 1416s 'Timestamp' => '1530000000', 1416s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1416s 'Changes' => ' 1416s example (2.0-1) unstable; urgency=medium 1416s 1416s [ Ian Jackson ] 1416s * new upstream (did gbp import-orig)' 1416s }, 1416s 'name' => 'debian/changelog, entry no.1', 1416s 'out_order' => [], 1416s 'is_pgp_signed' => 0, 1416s 'keep_duplicate' => 0, 1416s 'allow_duplicate' => 0, 1416s 'allow_pgp' => 1, 1416s 'drop_empty' => 0 1416s })}, 'Dpkg::Control::Hash' ); 1416s last finished-looking changelog entry: (2.0-1) unstable 1416s will stitch in dgit view, archive/test-dummy/2.0-1 1416s git-debrebase: snags: 1 overriden by individual -f options 1416s 1416s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1416s + local 'ps=255 0' 1416s + set -o pipefail 1416s + case $ps in 1416s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1416s + local 'mpat=E:Unused patch file garbage will be discarded' 1416s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1416s + local grepper=fgrep 1416s + case "$mpat" in 1416s + case "$mpat" in 1416s + grepper=egrep 1416s + mpat='Unused patch file garbage will be discarded' 1416s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1416s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1416s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1416s + local gdr=git-debrebase 1416s + : ' 1416s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1416s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1417s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1417s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1417s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1417s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1417s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1417s $VAR2 = bless( do{\(my $o = { 1417s 'allow_pgp' => 1, 1417s 'allow_duplicate' => 0, 1417s 'drop_empty' => 0, 1417s 'keep_duplicate' => 0, 1417s 'in_order' => [ 1417s 'Source', 1417s 'Version', 1417s 'Distribution', 1417s 'Urgency', 1417s 'Maintainer', 1417s 'Timestamp', 1417s 'Date', 1417s 'Changes' 1417s ], 1417s 'is_pgp_signed' => 0, 1417s 'out_order' => [], 1417s 'name' => 'debian/changelog, entry no.1', 1417s 'fields' => { 1417s 'Source' => 'example', 1417s 'Version' => '2.0-1', 1417s 'Distribution' => 'unstable', 1417s 'Urgency' => 'medium', 1417s 'Maintainer' => 'dgit test git user ', 1417s 'Timestamp' => '1530000000', 1417s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1417s 'Changes' => ' 1417s example (2.0-1) unstable; urgency=medium 1417s 1417s [ Ian Jackson ] 1417s * new upstream (did gbp import-orig)' 1417s } 1417s })}, 'Dpkg::Control::Hash' ); 1417s last finished-looking changelog entry: (2.0-1) unstable 1417s will stitch in dgit view, archive/test-dummy/2.0-1 1417s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1417s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1417s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1417s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 1417s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1417s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1417s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1417s git-debrebase ffq check_specs * 1417s git-debrebase ffq merge master 1417s git-debrebase ffq check_remote origin remote fetch/merge branch 1417s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1417s OK, you are ahead of refs/remotes/origin/master 1417s git-debrebase ffq check_remote undef remote push branch 1417s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1417s OK, you are ahead of refs/remotes/dgit/dgit/sid 1417s git-debrebase: snags: 2 overriden by individual -f options 1417s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 1417s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 1417s git-debrebase >$ 1417s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 1417s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1417s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1417s ' 1417s + git branch converted-from-gbp 1417s + v=2.0-2 1417s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1417s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1417s + DEBEMAIL=dgit-tests@example.org 1417s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1417s + 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 1417s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1417s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1417s 1 file changed, 6 insertions(+) 1417s + t-dch-commit-r 1417s + t-dch-r-rune t-dch-commit 1417s + local cmd=t-dch-commit 1417s + shift 1417s + local suite=unstable 1417s + t-dch-commit -r -D unstable '' 1417s + t-debchange -r -D unstable '' 1417s + DEBEMAIL=dgit-tests@example.org 1417s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1417s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1417s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1417s libdistro-info-perl is not installed, Debian release names are not known. 1417s libdistro-info-perl is not installed, Ubuntu release names are not known. 1417s + git commit -m 'dch -r -D unstable ' debian/changelog 1417s [master 4af0243] dch -r -D unstable 1417s 1 file changed, 1 insertion(+), 1 deletion(-) 1417s + t-dgit -wgf push-source --new 1417s + local dgit=dgit 1417s + pwd 1417s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1417s + : ' 1417s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1417s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 1417s | git rev-parse --show-toplevel 1417s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1417s | git config -z --get-regexp --local '.*' 1417s | git config -z --get-regexp --local '.*' 1417s | git config -z --get-regexp --global '.*' 1417s | git config -z --get-regexp --system '.*' 1417s format 3.0 (quilt), quilt mode linear 1417s Format `3.0 (quilt)', need to check/update patch stack 1417s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1417s => `' 1417s + git diff --quiet HEAD 1417s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1417s canonical suite name for unstable is sid 1417s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1417s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1417s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1417s | git rev-parse 'HEAD~0' 1417s => `4af0243f9227b0d695fbff38df345aca23969e2e' 1417s | git symbolic-ref -q HEAD 1417s => `refs/heads/master' 1417s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1417s CD work 1417s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1417s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1417s examining quilt state (multiple patches, linear mode) 1417s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 1417s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 1417s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1417s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1418s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 1418s | git rev-parse 'HEAD~0' 1418s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1418s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1418s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1418s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1418s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1418s CD fake 1418s | find -name .git -prune -print0 1418s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1418s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 1418s + git add -Af . 1418s | git write-tree 1418s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 1418s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1418s CD .. 1418s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1418s CD ../fake 1418s + git add -Af . 1418s | git write-tree 1418s => `607612c46d7ea5b66697b830f1a50f069061d460' 1418s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1418s CD ../work 1418s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1418s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1418s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1418s => `: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' 1418s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 1418s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1418s => `' 1418s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1418s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 1418s => `lib.c\x00new-upstream-file\x00src.c\x00' 1418s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 1418s differences @dl ## ## == == == ==. 1418s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 1418s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1418s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1418s starting quiltify (multiple patches, linear mode) 1418s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 1418s => `debian/control'... 1418s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1418s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1418s => `' 1418s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1418s search finished hooray! 1418s quiltify linearisation planning successful, executing... 1418s + git checkout -q master 1418s | git status --ignored --porcelain 1418s => `?? .pc/' 1418s nothing quilty to commit, ok. 1418s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1418s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1418s | git rev-parse 'HEAD~0' 1418s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1418s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1418s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1418s CD work 1418s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1419s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1419s CD .. 1419s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1419s dpkg-source: info: using source format '3.0 (quilt)' 1419s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1419s dpkg-source: info: using patch list from debian/patches/series 1419s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 1419s dpkg-source: info: building example in example_2.0-2.dsc 1419s CD work 1419s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1419s package seems new, not specifying -v 1419s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 1419s dpkg-genchanges: info: not including original source code in upload 1419s CD .. 1419s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1419s renaming (Files) example_2.0.orig.tar.gz 1419s renaming (Files) example_2.0-2.debian.tar.xz 1419s renaming (dsc) example_2.0-2.dsc 1419s renaming (changes) example_2.0-2_source.changes 1419s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1419s actually entering push 1419s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1419s => `1' 1419s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1419s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1419s git_lrfetch_sane iteration 0 1419s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1419s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 1419s => aee9cd2e780c31d95c69374962a0b39eefe0cf8d refs/tags/archive/test-dummy/2.0-1 1419s => 253c9f310535cafce28dfdf19f17f3504e21b9cd refs/tags/test-dummy/2.0-1 1419s 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 1419s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1419s | git for-each-ref refs/dgit-fetch/test-dummy 1419s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 1419s |> aee9cd2e780c31d95c69374962a0b39eefe0cf8d tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1419s |> 253c9f310535cafce28dfdf19f17f3504e21b9cd tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1419s git_lrfetch_sane: tidying any old suite lrfetchrefs 1419s | git for-each-ref refs/dgit-fetch/sid 1419s git_lrfetch_sane: git fetch --no-insane emulation complete 1419s $VAR1 = { 1419s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '253c9f310535cafce28dfdf19f17f3504e21b9cd', 1419s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1419s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => 'aee9cd2e780c31d95c69374962a0b39eefe0cf8d' 1419s }; 1419s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1419s |> aee9cd2e780c31d95c69374962a0b39eefe0cf8d tag refs/tags/archive/test-dummy/2.0-1 1419s currently refs/tags/archive/test-dummy/2.0-1=aee9cd2e780c31d95c69374962a0b39eefe0cf8d 1419s |> 253c9f310535cafce28dfdf19f17f3504e21b9cd tag refs/tags/test-dummy/2.0-1 1419s currently refs/tags/test-dummy/2.0-1=253c9f310535cafce28dfdf19f17f3504e21b9cd 1419s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1419s |> aee9cd2e780c31d95c69374962a0b39eefe0cf8d tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1419s offered refs/tags/archive/test-dummy/2.0-1=aee9cd2e780c31d95c69374962a0b39eefe0cf8d 1419s |> 253c9f310535cafce28dfdf19f17f3504e21b9cd tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1419s offered refs/tags/test-dummy/2.0-1=253c9f310535cafce28dfdf19f17f3504e21b9cd 1419s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1419s get_archive_dsc: nothing in archive, returning undef 1419s no version available from the archive 1419s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 1419s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 1419s 1419s Package not found in the archive, but has allegedly been pushed using dgit. 1419s Perhaps the upload is stuck in incoming. Using the version from git. 1419s 1419s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s fetch mergeinfos: 1419s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 1419s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 1419s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 1419s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 1419s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 1419s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 1419s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1419s + git check-ref-format archive/test-dummy/2.0-2 1419s | git symbolic-ref -q HEAD 1419s => `refs/heads/master' 1419s | git rev-parse 'HEAD~0' 1419s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1419s ffq_prev_branchinfo branch current refs/heads/master 1419s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1419s => `' 1419s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1419s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1419s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1419s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1419s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1419s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1419s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1419s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1419s | git status --ignored --porcelain 1419s => `' 1419s nothing quilty to commit, ok. 1419s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1419s => `' 1419s + git diff --quiet HEAD 1419s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1419s => `45ea71a69fa522ce760afdab8a420200443753e9' 1419s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 1419s => `' 1419s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1419s checking that example_2.0-2.dsc corresponds to HEAD 1419s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc 1419s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc) 1419s dpkg-source: info: extracting example in example-2.0 1419s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1419s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 1419s dpkg-source: info: using patch list from debian/patches/series 1419s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1419s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1419s dpkg-source: info: applying subdir/addnewups 1419s CD example-2.0 1419s | find -name .git -prune -print0 1419s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1419s + git add -Af . 1419s | git write-tree 1419s => `607612c46d7ea5b66697b830f1a50f069061d460' 1419s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1419s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1419s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1419s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1419s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1419s files_compare_inputs example_2.0-2.dsc 1419s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 1419s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1419s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 1419s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 1419s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1419s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 1419s files_compare_inputs example_2.0-2.dsc Files 1419s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 1419s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 1419s files_compare_inputs example_2.0-2_source.changes 1419s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 1419s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 1419s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 1419s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 1419s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 1419s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 1419s files_compare_inputs example_2.0-2_source.changes Files 1419s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 1419s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 1419s checking origs needed (2.0)... 1419s checking origs needed placement 'devel extra'... 1419s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1419s origs example_2.0.orig.tar.gz is_orig 1419s -| sh -ec 'cd "$1"; shift 1419s 1419s find -name "$1" -print0 | 1419s xargs -0r sha256sum 1419s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1419s origs example_2.0.orig.tar.gz $#$have=-1 1419s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1419s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 1419s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1419s push_tagwants: $VAR1 = [ 1419s '2.0-2', 1419s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1419s undef, 1419s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1419s ]; 1419s $VAR2 = [ 1419s { 1419s 'TfSuffix' => '', 1419s 'Tag' => 'archive/test-dummy/2.0-2', 1419s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1419s 'View' => 'dgit', 1419s 'Tfn' => sub { "DUMMY" }, 1419s 'TagFn' => sub { "DUMMY" } 1419s }, 1419s { 1419s 'TfSuffix' => '-dgit', 1419s 'Tag' => 'test-dummy/2.0-2', 1419s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1419s 'View' => 'dgit', 1419s 'Tfn' => sub { "DUMMY" }, 1419s 'TagFn' => sub { "DUMMY" } 1419s } 1419s ]; 1419s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1419s => `1530000000 +0000' 1419s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1419s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1419s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1419s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1419s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1419s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1419s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1419s => `fdd2b5354468f458164fe3f4ae3e456b50f9f3af' 1419s + git verify-tag fdd2b5354468f458164fe3f4ae3e456b50f9f3af 1419s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1419s gpg: Signature made Mon Mar 31 23:10:49 2025 UTC 1419s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1419s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1419s gpg: WARNING: This key is not certified with a trusted signature! 1419s gpg: There is no indication that the signature belongs to the owner. 1419s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1419s + git update-ref refs/tags/archive/test-dummy/2.0-2 fdd2b5354468f458164fe3f4ae3e456b50f9f3af 1419s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1419s => `77743169dae72d62c842113d5cf79c3b1b68e12a' 1419s + git verify-tag 77743169dae72d62c842113d5cf79c3b1b68e12a 1420s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1420s gpg: Signature made Mon Mar 31 23:10:49 2025 UTC 1420s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1420s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1420s gpg: WARNING: This key is not certified with a trusted signature! 1420s gpg: There is no indication that the signature belongs to the owner. 1420s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1420s + git update-ref refs/tags/test-dummy/2.0-2 77743169dae72d62c842113d5cf79c3b1b68e12a 1420s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1420s => `1' 1420s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 1420s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1420s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 1420s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 1420s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 1420s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1420s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 1420s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1420s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1420s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1420s 1420s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 1420s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1420s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1420s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1420s 1420s Successfully signed dsc, changes files 1420s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 1420s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1420s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1420s D: Setting host argument. 1420s Checking signature on .changes 1420s Checking signature on .dsc 1420s Package includes an .orig.tar.gz file although the debian revision suggests 1420s that it might not be required. Multiple uploads of the .orig.tar.gz may be 1420s rejected by the upload queue management software. 1420s Uploading to test-dummy (via local to localhost): 1420s Successfully uploaded packages. 1420s dgit ok: pushed and uploaded 2.0-2 1420s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1420s del_lrfetchrefs... 1420s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 1420s del_lrfetchrefs: aee9cd2e780c31d95c69374962a0b39eefe0cf8d refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1420s del_lrfetchrefs: 253c9f310535cafce28dfdf19f17f3504e21b9cd refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1420s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1420s ' 1420s + git push 1420s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1420s eb10718..6b22dd5 master -> master 1420s + cd .. 1420s + t-archive-process-incoming sid 1420s + local suite=sid 1420s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1420s + t-archive-query sid 1420s + local suite=sid 1420s + local dscf=main/example_2.0-2.dsc 1420s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 1420s + local suite=sid 1420s + local p=example 1420s + local v=2.0-2 1420s + local dscf=main/example_2.0-2.dsc 1420s + local sha 1420s ++ sha256sum 1420s + sha='430eb679bfc19cfa716fc3cee87997da1ac37e43d011ccb51e473d3a5d70777b -' 1420s + echo '2.0-2 430eb679bfc19cfa716fc3cee87997da1ac37e43d011ccb51e473d3a5d70777b main/example_2.0-2.dsc' 1420s + t-aq-archive-updated sid example 1420s + local suite=sid 1420s + local p=example 1420s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1420s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1420s + perl -wne ' 1420s use JSON; 1420s use strict; 1420s our @v; 1420s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1420s push @v, { 1420s "version" => "$1", 1420s "sha256sum" => "$2", 1420s "component" => "$3", 1420s "filename" => "$4", 1420s }; 1420s END { 1420s my $json = JSON->new->canonical(); 1420s print $json->encode(\@v) or die $!; 1420s } 1420s ' 1420s ++ 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 1420s ++ echo git mirror aq 1420s + 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' ' 1420s . $troot/lib-gdr 1420s t-tstunt-parsechangelog 1420s p=example 1420s t-git-next-date 1420s ' 1420s + local savevars= 1420s + 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' 1420s + local 'importeval= 1420s . $troot/lib-gdr 1420s t-tstunt-parsechangelog 1420s p=example 1420s t-git-next-date 1420s ' 1420s + local import=IMPORT.gdr-convert-gbp 1420s + exec 1420s + local vn 1420s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1420s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1420s print STDERR "saving-exporting $vn\n"; 1420s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1420s or die $!; 1420s } 1420s ' 1420s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1420s saving-exporting DGIT_TEST_REAL_GPG 1420s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1420s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1420s + set -e 1420s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1420s + 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 1420s + printf '\n%s\n' ' 1420s . $troot/lib-gdr 1420s t-tstunt-parsechangelog 1420s p=example 1420s t-git-next-date 1420s ' 1420s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1420s + rc=0 1420s + set +x 1420s + set +e 1420s + pwd 1420s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1420s + '[' x '!=' x ']' 1420s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1420s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1420s + set -e 1420s + test 0 = 0 1420s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1420s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1420s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1420s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1420s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1420s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1420s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1420s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1420s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1420s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1420s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1420s ++ . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1420s +++ : -D 1420s +++ export GDR_TEST_DEBUG 1420s +++ t-tstunt debchange 1420s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1420s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1420s +++ local var=PATH 1420s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1420s +++ eval ' 1420s case "$PATH" in 1420s "$tstunt:"*) ;; 1420s *":$tstunt:"*) ;; 1420s "") PATH="$tstunt" ;; 1420s *) PATH="$tstunt:$PATH" ;; 1420s esac 1420s export PATH 1420s ' 1420s ++++ case "$PATH" in 1420s ++++ export PATH 1420s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1420s +++ local var=PERLLIB 1420s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1420s +++ eval ' 1420s case "$PERLLIB" in 1420s "$tstunt:"*) ;; 1420s *":$tstunt:"*) ;; 1420s "") PERLLIB="$tstunt" ;; 1420s *) PERLLIB="$tstunt:$PERLLIB" ;; 1420s esac 1420s export PERLLIB 1420s ' 1420s ++++ case "$PERLLIB" in 1420s ++++ export PERLLIB 1420s +++ local f 1420s +++ for f in "$@" 1420s +++ t-tstunt--save-real debchange 1420s +++ local f=debchange 1420s +++ case "$f" in 1420s +++ local rc 1420s +++ local real 1420s +++ set +e 1420s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1420s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1420s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1420s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1420s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1420s ++++ type -p debchange 1420s +++ real=/usr/bin/debchange 1420s +++ rc=0 1420s +++ set -e 1420s +++ case $rc in 1420s +++ local varname=debchange 1420s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1420s +++ eval ' 1420s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1420s export DGIT_TEST_REAL_DEBCHANGE 1420s ' 1420s ++++ : /usr/bin/debchange 1420s ++++ export DGIT_TEST_REAL_DEBCHANGE 1420s +++ f=./debchange 1420s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1420s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1420s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1420s ++ t-tstunt-parsechangelog 1420s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1420s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1420s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1420s ++ local var=PATH 1420s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1420s ++ eval ' 1420s case "$PATH" in 1420s "$tstunt:"*) ;; 1420s *":$tstunt:"*) ;; 1420s "") PATH="$tstunt" ;; 1420s *) PATH="$tstunt:$PATH" ;; 1420s esac 1420s export PATH 1420s ' 1420s +++ case "$PATH" in 1420s +++ export PATH 1420s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1420s ++ local var=PERLLIB 1420s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1420s ++ eval ' 1420s case "$PERLLIB" in 1420s "$tstunt:"*) ;; 1420s *":$tstunt:"*) ;; 1420s "") PERLLIB="$tstunt" ;; 1420s *) PERLLIB="$tstunt:$PERLLIB" ;; 1420s esac 1420s export PERLLIB 1420s ' 1420s +++ case "$PERLLIB" in 1420s +++ export PERLLIB 1420s ++ local f 1420s ++ for f in "$@" 1420s ++ t-tstunt--save-real dpkg-parsechangelog 1420s ++ local f=dpkg-parsechangelog 1420s ++ case "$f" in 1420s ++ local rc 1420s ++ local real 1420s ++ set +e 1420s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1420s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1420s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1420s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1420s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1420s +++ type -p dpkg-parsechangelog 1420s ++ real=/usr/bin/dpkg-parsechangelog 1420s ++ rc=0 1420s ++ set -e 1420s ++ case $rc in 1420s ++ local varname=dpkg_parsechangelog 1420s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1420s ++ eval ' 1420s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1420s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1420s ' 1420s +++ : /usr/bin/dpkg-parsechangelog 1420s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1420s ++ f=./dpkg-parsechangelog 1420s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1420s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1420s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1420s ++ for f in "$@" 1420s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1420s ++ local f=Dpkg/Changelog/Parse.pm 1420s ++ case "$f" in 1420s ++ return 1420s ++ f=./Dpkg/Changelog/Parse.pm 1420s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1420s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1420s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1420s ++ p=example 1420s ++ t-git-next-date 1420s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1420s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1420s + cd example 1420s + t-dgit setup-mergechangelogs 1420s + local dgit=dgit 1420s + pwd 1420s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1420s + : ' 1420s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1420s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-mergechangelogs 1421s | git rev-parse --show-toplevel 1421s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1421s | git config -z --get-regexp --local '.*' 1421s | git config -z --get-regexp --local '.*' 1421s | git config -z --get-regexp --global '.*' 1421s | git config -z --get-regexp --system '.*' 1421s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 1421s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 1421s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1421s ' 1421s + : maintainer 1421s + v=2.0-3 1421s + t-maintainer-commit-some-changes 1421s + t-dch-commit -v2.0-3 -m 'start 2.0-3' 1421s + t-debchange -v2.0-3 -m 'start 2.0-3' 1421s + DEBEMAIL=dgit-tests@example.org 1421s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v2.0-3 -m 'start 2.0-3' 1421s + 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 1421s + git commit -m 'dch -v2.0-3 -m start 2.0-3' debian/changelog 1421s [master 4dd98f7] dch -v2.0-3 -m start 2.0-3 1421s 1 file changed, 6 insertions(+) 1421s + t-some-changes 'maintainer 2.0-3' 1421s + local 'token=maintainer 2.0-3' 1421s + local which=dum 1421s + local fsuffix= 1421s + t-git-next-date 1421s + GIT_COMMITTER_DATE='1530000002 +0100' 1421s + GIT_AUTHOR_DATE='1530000002 +0100' 1421s + case "$which" in 1421s + echo '// debian maintainer 2.0-3' 1421s + git add debian/zorkmid 1421s + git commit -m 'DEBIAN add zorkmid (maintainer 2.0-3)' 1421s [master c5aeac0] DEBIAN add zorkmid (maintainer 2.0-3) 1421s 1 file changed, 1 insertion(+) 1421s create mode 100644 debian/zorkmid 1421s + case "$which" in 1421s + echo '// upstream maintainer 2.0-3' 1421s + git add src.c 1421s + git commit -m 'UPSTREAM edit src.c (maintainer 2.0-3)' 1421s [master 64946bb] UPSTREAM edit src.c (maintainer 2.0-3) 1421s 1 file changed, 1 insertion(+) 1421s + case "$which" in 1421s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1421s + echo '// both! maintainer 2.0-3' 1421s + git add debian/zorkmid 1421s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1421s + echo '// both! maintainer 2.0-3' 1421s + git add src.c 1421s + git commit -m 'MIXED add both() (maintainer 2.0-3)' 1421s [master 964ce93] MIXED add both() (maintainer 2.0-3) 1421s 2 files changed, 2 insertions(+) 1421s + t-git-next-date 1421s + GIT_COMMITTER_DATE='1530000003 +0100' 1421s + GIT_AUTHOR_DATE='1530000003 +0100' 1421s + t-git-debrebase 1421s + local gdr=git-debrebase 1421s + : ' 1421s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1421s + git-debrebase --dgit=dgit -D 1421s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1421s git-debrebase ffq check_specs * 1421s git-debrebase ffq merge master 1421s git-debrebase ffq check_remote origin remote fetch/merge branch 1421s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1421s OK, you are ahead of refs/remotes/origin/master 1421s git-debrebase ffq check_remote undef remote push branch 1421s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1421s OK, you are ahead of refs/remotes/dgit/dgit/sid 1421s git-debrebase *** WALK 964ce93fe0ce99ab711d1cb423537d236e0bbf20 0 - 1421s git-debrebase get_differs 64946bb029165d28437faddd24dd43a5ca319327 6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f = 0x22 1421s git-debrebase classify 964ce93fe0ce99ab711d1cb423537d236e0bbf20 $t=6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f @p 64946bb029165d28437faddd24dd43a5ca319327/0x22 1421s git-debrebase = Mixed {"Msg" => "MIXED add both() (maintainer 2.0-3)\n","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "64946bb029165d28437faddd24dd43a5ca319327"}],"Type" => "Mixed","Hdr" => "tree 6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f\nparent 64946bb029165d28437faddd24dd43a5ca319327\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "964ce93fe0ce99ab711d1cb423537d236e0bbf20","Tree" => "6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f"} 1421s git-debrebase get_differs c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c 75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537 = 0x2 1421s git-debrebase classify 64946bb029165d28437faddd24dd43a5ca319327 $t=75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537 @p c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c/0x2 1421s git-debrebase = Upstream {"CommitId" => "64946bb029165d28437faddd24dd43a5ca319327","Hdr" => "tree 75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537\nparent c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Tree" => "75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c"}],"Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n"} 1421s git-debrebase get_differs 4dd98f768a8f29a08011b04867832a40ef33e618 b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9 = 0x20 1421s git-debrebase classify c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c $t=b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9 @p 4dd98f768a8f29a08011b04867832a40ef33e618/0x20 1421s git-debrebase = Packaging {"Hdr" => "tree b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9\nparent 4dd98f768a8f29a08011b04867832a40ef33e618\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Tree" => "b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9","CommitId" => "c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Parents" => [{"CommitId" => "4dd98f768a8f29a08011b04867832a40ef33e618","Differs" => 32,"Ix" => 0}]} 1421s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 89b9b5a11fee7d2a1c974f30aa28172018b99c18 = 0x10 1421s git-debrebase classify 4dd98f768a8f29a08011b04867832a40ef33e618 $t=89b9b5a11fee7d2a1c974f30aa28172018b99c18 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 1421s git-debrebase = Changelog {"Hdr" => "tree 89b9b5a11fee7d2a1c974f30aa28172018b99c18\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","CommitId" => "4dd98f768a8f29a08011b04867832a40ef33e618","Tree" => "89b9b5a11fee7d2a1c974f30aa28172018b99c18","Type" => "Changelog","Msg" => "dch -v2.0-3 -m start 2.0-3\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"}]} 1421s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1421s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1421s git-debrebase = AddPatches {"Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Type" => "AddPatches","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460"} 1421s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1421s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1421s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0,"Differs" => 16}],"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"} 1421s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1421s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1421s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1421s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1421s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1421s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1421s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Contributor" => {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0,"Differs" => 0},"Parents" => [$VAR1->{"Contributor"},{"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8,"Ix" => 1}],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","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]],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n"} 1421s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1421s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1421s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","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","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Type" => "Upstream"} 1421s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1421s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1421s git-debrebase = Upstream {"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}]} 1421s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1421s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1421s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","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"} 1421s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1421s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1421s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1421s 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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]]} 1421s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 14 pm 0 1421s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1421s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1421s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 15 1421s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1421s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1421s git-debrebase WALK REWRITING NOW cl=HASH(0xd2c9780fe90) procd=HASH(0xd2c97835368) 1421s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1421s git-debrebase WALK BUILD 4dd98f768a8f29a08011b04867832a40ef33e618 Debian (rewriting=1) 1421s git-debrebase WALK BUILD c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c Debian (rewriting=1) 1421s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1421s git-debrebase WALK BUILD 964ce93fe0ce99ab711d1cb423537d236e0bbf20 Debian (rewriting=1) 1421s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1421s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1421s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1421s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1421s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1421s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1421s git-debrebase WALK BUILD 64946bb029165d28437faddd24dd43a5ca319327 Upstream (rewriting=1) 1421s git-debrebase WALK BUILD 964ce93fe0ce99ab711d1cb423537d236e0bbf20 Upstream (rewriting=1) 1421s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1421s git-debrebase get_differs 5b2d01d10ec62b3f25e6f7a22710468830e457fb 964ce93fe0ce99ab711d1cb423537d236e0bbf20 = 0x4 1421s git-debrebase *** WALK RETURN 5b2d01d10ec62b3f25e6f7a22710468830e457fb 274022edec808f75f2359551ecdc6de6b6390355 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1421s git-debrebase: laundered (head was 964ce93fe0ce99ab711d1cb423537d236e0bbf20) 1421s git-debrebase >= update refs/ffq-prev/heads/master 964ce93fe0ce99ab711d1cb423537d236e0bbf20 0000000000000000000000000000000000000000 1421s git-debrebase >= delete refs/debrebase-last/heads/master 1421s git-debrebase >= update HEAD 5b2d01d10ec62b3f25e6f7a22710468830e457fb 964ce93fe0ce99ab711d1cb423537d236e0bbf20 1421s git-debrebase >$ 1421s Recorded previous head for preservation 1421s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1421s ' 1421s + t-git-debrebase stitch 1421s + local gdr=git-debrebase 1421s + : ' 1421s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1421s + git-debrebase --dgit=dgit -D stitch 1421s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1421s git-debrebase get_differs b3c76885171009da1ef20071776aa9044fae8502 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x2 1421s git-debrebase classify 5b2d01d10ec62b3f25e6f7a22710468830e457fb $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p b3c76885171009da1ef20071776aa9044fae8502/0x2 1421s 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","Type" => "Upstream","Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae","Parents" => [{"Differs" => 2,"CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Ix" => 0}],"CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb"} 1421s git-debrebase get_differs 8139d3db657e3270633db038d311934dab9b5fa2 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 = 0x2 1421s git-debrebase classify b3c76885171009da1ef20071776aa9044fae8502 $t=5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 @p 8139d3db657e3270633db038d311934dab9b5fa2/0x2 1421s git-debrebase = Upstream {"Hdr" => "tree 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14\nparent 8139d3db657e3270633db038d311934dab9b5fa2\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Differs" => 2}],"Tree" => "5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","CommitId" => "b3c76885171009da1ef20071776aa9044fae8502"} 1421s git-debrebase get_differs f99dd01b94310ac6847d5bb66d530db52eceb9a7 1a9494a6c69d5574aa472ee96d6f641184e55cfa = 0x2 1421s git-debrebase classify 8139d3db657e3270633db038d311934dab9b5fa2 $t=1a9494a6c69d5574aa472ee96d6f641184e55cfa @p f99dd01b94310ac6847d5bb66d530db52eceb9a7/0x2 1421s git-debrebase = Upstream {"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "1a9494a6c69d5574aa472ee96d6f641184e55cfa","Hdr" => "tree 1a9494a6c69d5574aa472ee96d6f641184e55cfa\nparent f99dd01b94310ac6847d5bb66d530db52eceb9a7\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Differs" => 2,"Ix" => 0}]} 1421s git-debrebase get_differs 505316fe392571a9180b6df0d54ec25ffb40c9c7 a71937789bee6e5711ddc7f7e212948a45fedf59 = 0x2 1421s git-debrebase classify f99dd01b94310ac6847d5bb66d530db52eceb9a7 $t=a71937789bee6e5711ddc7f7e212948a45fedf59 @p 505316fe392571a9180b6df0d54ec25ffb40c9c7/0x2 1421s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "a71937789bee6e5711ddc7f7e212948a45fedf59","Hdr" => "tree a71937789bee6e5711ddc7f7e212948a45fedf59\nparent 505316fe392571a9180b6df0d54ec25ffb40c9c7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Ix" => 0}],"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7"} 1421s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 447f86ca9d4d65b8c1128528a4338c51733e127b = 0x2 1421s git-debrebase classify 505316fe392571a9180b6df0d54ec25ffb40c9c7 $t=447f86ca9d4d65b8c1128528a4338c51733e127b @p 274022edec808f75f2359551ecdc6de6b6390355/0x2 1421s git-debrebase = Upstream {"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Type" => "Upstream","Hdr" => "tree 447f86ca9d4d65b8c1128528a4338c51733e127b\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "447f86ca9d4d65b8c1128528a4338c51733e127b","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1421s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 1421s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 1421s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"}],"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","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355"} 1421s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 1421s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 1421s git-debrebase = Packaging {"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Type" => "Packaging","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","Parents" => [{"Differs" => 32,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Ix" => 0}],"Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n"} 1421s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 1421s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1421s git-debrebase = Changelog {"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "894ca54a967167e2bb994b82357d084539559075","Msg" => "dch -v2.0-3 -m start 2.0-3\n"} 1421s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1421s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1421s git-debrebase = Changelog {"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","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" => [{"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16}],"Msg" => "dch -r -D unstable\n"} 1421s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1421s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1421s git-debrebase = Changelog {"CommitId" => "9214201f528bae71f4647709e2357407746739d5","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 1530000003 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}]} 1421s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1421s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1421s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1421s 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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 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","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1421s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1421s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1421s git-debrebase >= delete refs/ffq-prev/heads/master 964ce93fe0ce99ab711d1cb423537d236e0bbf20 1421s git-debrebase >= update refs/debrebase-last/heads/master 74d5f586ed443ce47434f30fbbeff3eacb36748d 0000000000000000000000000000000000000000 1421s git-debrebase >= update HEAD 74d5f586ed443ce47434f30fbbeff3eacb36748d 5b2d01d10ec62b3f25e6f7a22710468830e457fb 1421s git-debrebase >$ 1421s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1421s ' 1421s + git branch did.maintainer 1422s + t-git-next-date 1422s + GIT_COMMITTER_DATE='1530000004 +0100' 1422s + GIT_AUTHOR_DATE='1530000004 +0100' 1422s + t-git-next-date 1422s + GIT_COMMITTER_DATE='1530000005 +0100' 1422s + GIT_AUTHOR_DATE='1530000005 +0100' 1422s + : 'non-dgit upload (but we prepare it with dgit anyway)' 1422s + t-git-next-date 1422s + GIT_COMMITTER_DATE='1530000006 +0100' 1422s + GIT_AUTHOR_DATE='1530000006 +0100' 1422s + git checkout origin/master 1422s Note: switching to 'origin/master'. 1422s 1422s You are in 'detached HEAD' state. You can look around, make experimental 1422s changes and commit them, and you can discard any commits you make in this 1422s state without impacting any branches by switching back to a branch. 1422s 1422s If you want to create a new branch to retain commits you create, you may 1422s do so (now or later) by using -c with the switch command. Example: 1422s 1422s git switch -c 1422s 1422s Or undo this operation with: 1422s 1422s git switch - 1422s 1422s Turn off this advice by setting config variable advice.detachedHead to false 1422s 1422s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 1422s + v=2.0-2+nmu1 1422s + t-nmu-upload-1 nmu 1422s + t-git-next-date 1422s + GIT_COMMITTER_DATE='1530000007 +0100' 1422s + GIT_AUTHOR_DATE='1530000007 +0100' 1422s + nmubranch=nmu 1422s + git checkout -f -b nmu 1422s Switched to a new branch 'nmu' 1422s + t-git-debrebase 1422s + local gdr=git-debrebase 1422s + : ' 1422s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1422s + git-debrebase --dgit=dgit -D 1422s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu 1422s git-debrebase ffq check_specs * 1422s git-debrebase *** WALK 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0 - 1422s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1422s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1422s git-debrebase = AddPatches {"Type" => "AddPatches","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Parents" => [{"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","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","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"} 1422s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1422s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1422s git-debrebase = Changelog {"Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0,"Differs" => 16}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Type" => "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","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"} 1422s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1422s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1422s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Ix" => 0}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","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"} 1422s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1422s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1422s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1422s git-debrebase = Pseudomerge {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"},{"Differs" => 8,"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"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","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"} 1422s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1422s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1422s git-debrebase = Upstream {"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","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 1422s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1422s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1422s git-debrebase = Upstream {"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream"} 1422s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1422s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1422s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2}],"Type" => "Upstream"} 1422s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1422s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1422s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1422s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Type" => "Anchor","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1422s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 4 proc 9 pm 0 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1422s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 10 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1422s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1422s git-debrebase WALK REWRITING NOW cl=HASH(0xa011a0ea6c8) procd=HASH(0xa011a1635a0) 1422s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1422s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1422s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1422s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1422s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1422s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1422s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1422s git-debrebase get_differs 4abc58ced56fe358e76a8cedaff3563b8f3bc073 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf = 0x4 1422s git-debrebase *** WALK RETURN 4abc58ced56fe358e76a8cedaff3563b8f3bc073 cdd388d460bc1f8215bafdb80bf92c245bd56f07 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1422s git-debrebase: laundered (head was 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf) 1422s git-debrebase >= update refs/ffq-prev/heads/nmu 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0000000000000000000000000000000000000000 1422s git-debrebase >= delete refs/debrebase-last/heads/nmu 1422s git-debrebase >= update HEAD 4abc58ced56fe358e76a8cedaff3563b8f3bc073 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1422s git-debrebase >$ 1422s Recorded previous head for preservation 1422s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1422s ' 1422s + t-git-debrebase convert-to-gbp 1422s + local gdr=git-debrebase 1422s + : ' 1422s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1422s + git-debrebase --dgit=dgit -D convert-to-gbp 1422s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu 1422s git-debrebase get_differs c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1422s git-debrebase classify 4abc58ced56fe358e76a8cedaff3563b8f3bc073 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d/0x2 1422s git-debrebase = Upstream {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000007 +0100\n","CommitId" => "4abc58ced56fe358e76a8cedaff3563b8f3bc073","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d"}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1422s git-debrebase get_differs e090ba2c462bfcddd669365407b02f300dad2c92 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1422s git-debrebase classify c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p e090ba2c462bfcddd669365407b02f300dad2c92/0x2 1422s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "e090ba2c462bfcddd669365407b02f300dad2c92","Ix" => 0}],"Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent e090ba2c462bfcddd669365407b02f300dad2c92\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000007 +0100\n","CommitId" => "c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56"} 1422s git-debrebase get_differs cdd388d460bc1f8215bafdb80bf92c245bd56f07 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1422s git-debrebase classify e090ba2c462bfcddd669365407b02f300dad2c92 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p cdd388d460bc1f8215bafdb80bf92c245bd56f07/0x2 1422s git-debrebase = Upstream {"CommitId" => "e090ba2c462bfcddd669365407b02f300dad2c92","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent cdd388d460bc1f8215bafdb80bf92c245bd56f07\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000007 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "cdd388d460bc1f8215bafdb80bf92c245bd56f07","Ix" => 0}],"Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1422s git-debrebase get_differs 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1422s git-debrebase classify cdd388d460bc1f8215bafdb80bf92c245bd56f07 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c/0x10 1422s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c"}],"CommitId" => "cdd388d460bc1f8215bafdb80bf92c245bd56f07","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000007 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1422s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1422s git-debrebase classify 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1422s git-debrebase = Changelog {"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}],"CommitId" => "5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000007 +0100\n"} 1422s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1422s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1422s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1422s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"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","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1422s git-debrebase *** WALK 4abc58ced56fe358e76a8cedaff3563b8f3bc073 0 - 1422s git-debrebase get_differs c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1422s git-debrebase classify 4abc58ced56fe358e76a8cedaff3563b8f3bc073 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d/0x2 1422s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d","Ix" => 0}],"CommitId" => "4abc58ced56fe358e76a8cedaff3563b8f3bc073","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000007 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 1422s git-debrebase get_differs e090ba2c462bfcddd669365407b02f300dad2c92 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1422s git-debrebase classify c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p e090ba2c462bfcddd669365407b02f300dad2c92/0x2 1422s git-debrebase = Upstream {"Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent e090ba2c462bfcddd669365407b02f300dad2c92\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000007 +0100\n","CommitId" => "c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d","Parents" => [{"Ix" => 0,"CommitId" => "e090ba2c462bfcddd669365407b02f300dad2c92","Differs" => 2}],"Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1422s git-debrebase get_differs cdd388d460bc1f8215bafdb80bf92c245bd56f07 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1422s git-debrebase classify e090ba2c462bfcddd669365407b02f300dad2c92 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p cdd388d460bc1f8215bafdb80bf92c245bd56f07/0x2 1422s git-debrebase = Upstream {"Type" => "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 cdd388d460bc1f8215bafdb80bf92c245bd56f07\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000007 +0100\n","CommitId" => "e090ba2c462bfcddd669365407b02f300dad2c92","Parents" => [{"CommitId" => "cdd388d460bc1f8215bafdb80bf92c245bd56f07","Ix" => 0,"Differs" => 2}]} 1422s git-debrebase get_differs 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1422s git-debrebase classify cdd388d460bc1f8215bafdb80bf92c245bd56f07 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c/0x10 1422s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"CommitId" => "5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c","Differs" => 16}],"CommitId" => "cdd388d460bc1f8215bafdb80bf92c245bd56f07","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000007 +0100\n"} 1422s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1422s git-debrebase classify 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1422s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000007 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1422s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1422s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1422s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1422s 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]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor"} 1422s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 2 proc 5 pm -1 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1422s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 6 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1422s git-debrebase WALK BUILD 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c Debian (rewriting=0) 1422s git-debrebase WALK BUILD cdd388d460bc1f8215bafdb80bf92c245bd56f07 Debian (rewriting=0) 1422s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1422s git-debrebase WALK BUILD e090ba2c462bfcddd669365407b02f300dad2c92 Upstream (rewriting=0) 1422s git-debrebase WALK BUILD c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d Upstream (rewriting=0) 1422s git-debrebase WALK BUILD 4abc58ced56fe358e76a8cedaff3563b8f3bc073 Upstream (rewriting=0) 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1422s git-debrebase get_differs 4abc58ced56fe358e76a8cedaff3563b8f3bc073 4abc58ced56fe358e76a8cedaff3563b8f3bc073 = 0 1422s git-debrebase *** WALK RETURN 4abc58ced56fe358e76a8cedaff3563b8f3bc073 cdd388d460bc1f8215bafdb80bf92c245bd56f07 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1422s git-debrebase gbp_pq_export bw cdd388d460bc1f8215bafdb80bf92c245bd56f07 4abc58ced56fe358e76a8cedaff3563b8f3bc073 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1422s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1422s git-debrebase >= delete refs/ffq-prev/heads/nmu 1422s git-debrebase >= delete refs/debrebase-last/heads/nmu 1422s git-debrebase >= update HEAD f73916f1a4b5bcd4c31ae456c6f392f41a743f01 4abc58ced56fe358e76a8cedaff3563b8f3bc073 1422s git-debrebase >$ 1422s HEAD is now at f73916f Commit patch queue (converted from git-debrebase format) 1422s git-debrebase: converted to git-buildpackage branch format 1422s git-debrebase: WARNING: do not now run "git-debrebase" any more 1422s git-debrebase: WARNING: doing so would drop all upstream patches! 1422s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1422s ' 1422s + t-git-next-date 1422s + GIT_COMMITTER_DATE='1530000008 +0100' 1422s + GIT_AUTHOR_DATE='1530000008 +0100' 1422s + gbp pq import 1422s gbp:info: Trying to apply patches at 'f73916f1a4b5bcd4c31ae456c6f392f41a743f01' 1422s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/nmu' 1422s + t-nmu-upload-2 1422s + t-git-next-date 1422s + GIT_COMMITTER_DATE='1530000009 +0100' 1422s + GIT_AUTHOR_DATE='1530000009 +0100' 1422s + t-dch-commit -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 1422s + t-debchange -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 1422s + DEBEMAIL=dgit-tests@example.org 1422s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 1422s + 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 1423s + git commit -m 'dch -v 2.0-2+nmu1 -m nmu nmu 2.0-2+nmu1' debian/changelog 1423s [patch-queue/nmu 02fb5d2] dch -v 2.0-2+nmu1 -m nmu nmu 2.0-2+nmu1 1423s 1 file changed, 6 insertions(+) 1423s + t-nmu-commit-an-upstream-change 1423s + echo '// more upstream' 1423s + git add newsrc.c 1423s + git commit -m 'UPSTREAM NMU' 1423s [patch-queue/nmu 4971fde] UPSTREAM NMU 1423s 1 file changed, 1 insertion(+) 1423s create mode 100644 newsrc.c 1423s + t-nmu-upload-3 1423s + t-dch-commit-r 1423s + t-dch-r-rune t-dch-commit 1423s + local cmd=t-dch-commit 1423s + shift 1423s + local suite=unstable 1423s + t-dch-commit -r -D unstable '' 1423s + t-debchange -r -D unstable '' 1423s + DEBEMAIL=dgit-tests@example.org 1423s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1423s + exec env TZ=UTC faketime -f 2018-06-26 08:00:09 env -u TZ /usr/bin/debchange -r -D unstable 1423s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1423s libdistro-info-perl is not installed, Debian release names are not known. 1423s libdistro-info-perl is not installed, Ubuntu release names are not known. 1423s + git commit -m 'dch -r -D unstable ' debian/changelog 1423s [patch-queue/nmu 6219d19] dch -r -D unstable 1423s 1 file changed, 1 insertion(+), 1 deletion(-) 1423s + t-non-dgit-upload 1423s + t-dgit -wgf build-source 1423s + local dgit=dgit 1423s + pwd 1423s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1423s + : ' 1423s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1423s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf build-source 1423s | git rev-parse --show-toplevel 1423s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1423s | git config -z --get-regexp --local '.*' 1423s | git config -z --get-regexp --local '.*' 1423s | git config -z --get-regexp --global '.*' 1423s | git config -z --get-regexp --system '.*' 1423s format 3.0 (quilt), quilt mode linear 1423s Format `3.0 (quilt)', need to check/update patch stack 1423s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1423s => `' 1423s + git diff --quiet HEAD 1423s | git clean -dn 1423s => `' 1423s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1423s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1423s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1423s | git rev-parse 'HEAD~0' 1423s => `6219d1942fbad06e72069683f1d92bc54c51f4f4' 1423s | git symbolic-ref -q HEAD 1423s => `refs/heads/patch-queue/nmu' 1423s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1423s CD work 1423s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1423s + git reset -q --hard 6219d1942fbad06e72069683f1d92bc54c51f4f4 1423s examining quilt state (multiple patches, linear mode) 1423s branch_is_gdr 6219d1942fbad06e72069683f1d92bc54c51f4f4... 1423s branch_is_gdr cdd388d460bc1f8215bafdb80bf92c245bd56f07 ?-patches NO 1423s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1423s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1423s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1423s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1423s CD fake 1423s | find -name .git -prune -print0 1423s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1423s + git checkout -f 6219d1942fbad06e72069683f1d92bc54c51f4f4 -- debian 1423s + git add -Af . 1423s | git write-tree 1423s => `84dc8ed851e54534e5a0db6b7fd7dd20758cee35' 1423s fake orig tree object 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 1423s CD .. 1423s + git reset -q --hard 6219d1942fbad06e72069683f1d92bc54c51f4f4 1423s CD ../fake 1423s + git add -Af . 1423s | git write-tree 1423s => `c43f4f26de484e2d7959293f06b0d5f963ab3550' 1423s fake o+d/p tree object 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 1423s CD ../work 1423s | git ls-tree --name-only -z 6219d1942fbad06e72069683f1d92bc54c51f4f4 1423s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 1423s | git diff-tree -z --no-renames -r 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 6219d1942fbad06e72069683f1d92bc54c51f4f4 1423s => `: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' 1423s quiltify_trees_differ 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 6219d1942fbad06e72069683f1d92bc54c51f4f4 => 1 1423s | git diff-tree -z --no-renames --name-only -r 6219d1942fbad06e72069683f1d92bc54c51f4f4 c43f4f26de484e2d7959293f06b0d5f963ab3550 1423s => `newsrc.c\x00' 1423s quiltify_trees_differ 6219d1942fbad06e72069683f1d92bc54c51f4f4 c43f4f26de484e2d7959293f06b0d5f963ab3550 => 1 1423s | git diff-tree -z --no-renames --name-only -r 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 c43f4f26de484e2d7959293f06b0d5f963ab3550 1423s => `lib.c\x00new-upstream-file\x00src.c\x00' 1423s quiltify_trees_differ 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 c43f4f26de484e2d7959293f06b0d5f963ab3550 => 1 1423s differences @dl ## ## ## == == ==. 1423s dgit: base trees orig=84dc8ed851e54534e5a0 o+d/p=c43f4f26de484e2d7959 1423s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1423s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1423s starting quiltify (multiple patches, linear mode) 1423s | git ls-tree --name-only 6219d1942fbad06e72069683f1d92bc54c51f4f4 -- debian/rules debian/control 1423s => `debian/control'... 1423s quiltify investigate 6219d1942fbad06e72069683f1d92bc54c51f4f4 1423s | git diff-tree -z --no-renames --name-only 6219d1942fbad06e72069683f1d92bc54c51f4f4 c43f4f26de484e2d7959293f06b0d5f963ab3550 1423s => `newsrc.c\x00' 1423s quiltify_trees_differ 6219d1942fbad06e72069683f1d92bc54c51f4f4 c43f4f26de484e2d7959293f06b0d5f963ab3550 => 1 1423s | git ls-tree --name-only 6219d1942fbad06e72069683f1d92bc54c51f4f4 -- debian/rules debian/control 1423s => `debian/control'... 1423s | git cat-file commit 6219d1942fbad06e72069683f1d92bc54c51f4f4 1423s => `tree b7f00f40735e99877eb161ec52f3d41f3132caef'... 1423s | git diff-tree -z --no-renames --name-only 4971fdebfdffec4078dddbd8a8b2c715142610e1 6219d1942fbad06e72069683f1d92bc54c51f4f4 1423s => `debian\x00' 1423s quiltify_trees_differ 4971fdebfdffec4078dddbd8a8b2c715142610e1 6219d1942fbad06e72069683f1d92bc54c51f4f4 => 0 1423s considering C=6219d1942fbad06e72069683f1d92bc54c51f4f4 P=4971fdebfdffec4078dddbd8a8b2c715142610e1 1423s | git diff-tree -r --name-only 4971fdebfdffec4078dddbd8a8b2c715142610e1 6219d1942fbad06e72069683f1d92bc54c51f4f4 -- debian/patches .pc debian/source/format 1423s => `' 1423s search queue P=4971fdebfdffec4078dddbd8a8b2c715142610e1 triv 1423s quiltify investigate 4971fdebfdffec4078dddbd8a8b2c715142610e1 1423s | git diff-tree -z --no-renames --name-only 4971fdebfdffec4078dddbd8a8b2c715142610e1 c43f4f26de484e2d7959293f06b0d5f963ab3550 1423s => `debian\x00newsrc.c\x00' 1423s quiltify_trees_differ 4971fdebfdffec4078dddbd8a8b2c715142610e1 c43f4f26de484e2d7959293f06b0d5f963ab3550 => 1 1423s | git ls-tree --name-only 4971fdebfdffec4078dddbd8a8b2c715142610e1 -- debian/rules debian/control 1423s => `debian/control'... 1423s | git cat-file commit 4971fdebfdffec4078dddbd8a8b2c715142610e1 1423s => `tree 0b3c14e300196928f6bb548f0a42db7b57ccbf7b'... 1423s | git diff-tree -z --no-renames --name-only 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 4971fdebfdffec4078dddbd8a8b2c715142610e1 1423s => `newsrc.c\x00' 1423s quiltify_trees_differ 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 4971fdebfdffec4078dddbd8a8b2c715142610e1 => 1 1423s considering C=4971fdebfdffec4078dddbd8a8b2c715142610e1 P=02fb5d2ca5687155bf8eea87c153b361a22ac3d9 1423s | git diff-tree -r --name-only 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 4971fdebfdffec4078dddbd8a8b2c715142610e1 -- debian/patches .pc debian/source/format 1423s => `' 1423s search queue P=02fb5d2ca5687155bf8eea87c153b361a22ac3d9 NT 1423s quiltify investigate 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 1423s | git diff-tree -z --no-renames --name-only 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 c43f4f26de484e2d7959293f06b0d5f963ab3550 1423s => `debian\x00' 1423s quiltify_trees_differ 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 c43f4f26de484e2d7959293f06b0d5f963ab3550 => 0 1423s search finished hooray! 1423s quiltify linearisation planning successful, executing... 1423s quiltify traverse 02fb5d2ca5687155bf8eea87c153b361a22ac3d9..4971fdebfdffec4078dddbd8a8b2c715142610e1 1423s | git cat-file commit 4971fdebfdffec4078dddbd8a8b2c715142610e1 1423s => `tree 0b3c14e300196928f6bb548f0a42db7b57ccbf7b'... 1423s | git log -n1 '--pretty=format:%aD' 4971fdebfdffec4078dddbd8a8b2c715142610e1 1423s => `Tue, 26 Jun 2018 09:00:09 +0100' 1423s + git checkout -q 4971fdebfdffec4078dddbd8a8b2c715142610e1 1423s + git checkout -q 6219d1942fbad06e72069683f1d92bc54c51f4f4 debian/changelog 1423s | realpath -- /usr/bin/dgit 1423s => `/usr/bin/dgit' 1423s | realpath -- .git/dgit/quilt-description.tmp 1423s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1423s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-nmu.patch 1423s dpkg-source: info: using patch list from debian/patches/series 1423s dpkg-source: info: local changes detected, the modified files are: 1423s work/newsrc.c 1424s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-nmu.patch 1424s + git checkout -q 4971fdebfdffec4078dddbd8a8b2c715142610e1 debian/changelog 1424s quiltify traverse 4971fdebfdffec4078dddbd8a8b2c715142610e1..6219d1942fbad06e72069683f1d92bc54c51f4f4 1424s + git checkout -q master 1424s | git status --ignored --porcelain 1424s => ` M debian/patches/series'... 1424s + git add -f debian/patches 1424s Commit Debian 3.0 (quilt) metadata 1424s 1424s [dgit (9.15) quilt-fixup] 1424s 1424s + git commit -m 'Commit Debian 3.0 (quilt) metadata 1424s 1424s [dgit (9.15) quilt-fixup] 1424s ' 1424s [master 218e6aa] Commit Debian 3.0 (quilt) metadata 1424s 2 files changed, 13 insertions(+) 1424s create mode 100644 debian/patches/upstream-nmu.patch 1424s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1424s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1424s | git rev-parse 'HEAD~0' 1424s => `218e6aa1ac166f88f00899f6edf5ab5f39c80440' 1424s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1424s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1424s CD work 1424s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1424s + git reset -q --hard 218e6aa1ac166f88f00899f6edf5ab5f39c80440 1424s CD .. 1424s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1424s dpkg-source: info: using source format '3.0 (quilt)' 1424s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1424s dpkg-source: info: using patch list from debian/patches/series 1424s dpkg-source: info: building example in example_2.0-2+nmu1.debian.tar.xz 1424s dpkg-source: info: building example in example_2.0-2+nmu1.dsc 1424s CD work 1424s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1424s changelog will contain changes since 2.0-2 1424s + sh -ec 'exec >../$1; shift; exec "$@"' x 'example_2.0-2+nmu1_source.changes' dpkg-genchanges -S -v2.0-2 1424s dpkg-genchanges: info: not including original source code in upload 1424s CD .. 1424s moving example_2.0-2+nmu1.dsc, example_2.0-2+nmu1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1424s renaming (Files) example_2.0.orig.tar.gz 1424s renaming (Files) example_2.0-2+nmu1.debian.tar.xz 1424s renaming (dsc) example_2.0-2+nmu1.dsc 1424s renaming (changes) example_2.0-2+nmu1_source.changes 1424s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1424s dgit ok: source built, results in example_2.0-2+nmu1.dsc and example_2.0-2+nmu1_source.changes 1424s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1424s ' 1424s + cd .. 1424s + c=example_2.0-2+nmu1_source.changes 1424s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A example_2.0-2+nmu1_source.changes 1424s signfile dsc example_2.0-2+nmu1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1424s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1424s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1424s 1424s fixup_changes dsc example_2.0-2+nmu1.dsc example_2.0-2+nmu1_source.changes 1424s signfile changes example_2.0-2+nmu1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1424s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1424s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1424s 1424s Successfully signed dsc, changes files 1424s + dput -c /tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy example_2.0-2+nmu1_source.changes 1425s gpg: /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example_2.0-2+nmu1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1425s gpg: /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example_2.0-2+nmu1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1425s D: Setting host argument. 1425s Checking signature on .changes 1425s Checking signature on .dsc 1425s Uploading to test-dummy (via local to localhost): 1425s Successfully uploaded packages. 1425s + t-archive-process-incoming sid 1425s + local suite=sid 1425s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2+nmu1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2+nmu1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2+nmu1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1425s + t-archive-query sid 1425s + local suite=sid 1425s + local dscf=main/example_2.0-2+nmu1.dsc 1425s + t-archive-query-aq sid example 2.0-2+nmu1 main/example_2.0-2+nmu1.dsc 1425s + local suite=sid 1425s + local p=example 1425s + local v=2.0-2+nmu1 1425s + local dscf=main/example_2.0-2+nmu1.dsc 1425s + local sha 1425s ++ sha256sum 1425s + sha='ace60b48fc4a5aabadafbdc8e45a4b96e5dcc14803cf8448d3cf82bd07cf68ed -' 1425s + echo '2.0-2+nmu1 ace60b48fc4a5aabadafbdc8e45a4b96e5dcc14803cf8448d3cf82bd07cf68ed main/example_2.0-2+nmu1.dsc' 1425s + t-aq-archive-updated sid example 1425s + local suite=sid 1425s + local p=example 1425s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1425s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1425s + perl -wne ' 1425s use JSON; 1425s use strict; 1425s our @v; 1425s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1425s push @v, { 1425s "version" => "$1", 1425s "sha256sum" => "$2", 1425s "component" => "$3", 1425s "filename" => "$4", 1425s }; 1425s END { 1425s my $json = JSON->new->canonical(); 1425s print $json->encode(\@v) or die $!; 1425s } 1425s ' 1425s + t-git-next-date 1425s + GIT_COMMITTER_DATE='1530000010 +0100' 1425s + GIT_AUTHOR_DATE='1530000010 +0100' 1425s + cd example 1425s + git checkout master 1425s Switched to branch 'master' 1425s Your branch is ahead of 'origin/master' by 15 commits. 1425s (use "git push" to publish your local commits) 1425s + : 'ad hocery' 1425s + t-git-next-date 1425s + GIT_COMMITTER_DATE='1530000011 +0100' 1425s + GIT_AUTHOR_DATE='1530000011 +0100' 1425s + git checkout master 1425s Already on 'master' 1425s Your branch is ahead of 'origin/master' by 15 commits. 1425s (use "git push" to publish your local commits) 1425s + t-nmu-causes-ff-fail 1425s + t-dgit fetch 1425s + local dgit=dgit 1425s + pwd 1425s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1425s + : ' 1425s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1425s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch 1425s | git rev-parse --show-toplevel 1425s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1425s | git config -z --get-regexp --local '.*' 1425s | git config -z --get-regexp --local '.*' 1425s | git config -z --get-regexp --global '.*' 1425s | git config -z --get-regexp --system '.*' 1425s | git symbolic-ref -q HEAD 1425s => `refs/heads/master' 1425s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1425s canonical suite name for unstable is sid 1425s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1425s => `1' 1425s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1425s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1425s git_lrfetch_sane iteration 0 1425s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1425s => 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit/sid 1425s => aee9cd2e780c31d95c69374962a0b39eefe0cf8d refs/tags/archive/test-dummy/2.0-1 1425s => fdd2b5354468f458164fe3f4ae3e456b50f9f3af refs/tags/archive/test-dummy/2.0-2 1425s => 253c9f310535cafce28dfdf19f17f3504e21b9cd refs/tags/test-dummy/2.0-1 1425s => 77743169dae72d62c842113d5cf79c3b1b68e12a refs/tags/test-dummy/2.0-2 1425s 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 1425s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1425s | git for-each-ref refs/dgit-fetch/test-dummy 1425s |> 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit refs/dgit-fetch/test-dummy/dgit/sid 1425s |> aee9cd2e780c31d95c69374962a0b39eefe0cf8d tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1425s |> fdd2b5354468f458164fe3f4ae3e456b50f9f3af tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1425s |> 253c9f310535cafce28dfdf19f17f3504e21b9cd tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1425s |> 77743169dae72d62c842113d5cf79c3b1b68e12a tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1425s git_lrfetch_sane: tidying any old suite lrfetchrefs 1425s | git for-each-ref refs/dgit-fetch/sid 1425s git_lrfetch_sane: git fetch --no-insane emulation complete 1425s $VAR1 = { 1425s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => 'aee9cd2e780c31d95c69374962a0b39eefe0cf8d', 1425s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => 'fdd2b5354468f458164fe3f4ae3e456b50f9f3af', 1425s 'refs/dgit-fetch/test-dummy/dgit/sid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1425s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '253c9f310535cafce28dfdf19f17f3504e21b9cd', 1425s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => '77743169dae72d62c842113d5cf79c3b1b68e12a' 1425s }; 1425s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1425s |> aee9cd2e780c31d95c69374962a0b39eefe0cf8d tag refs/tags/archive/test-dummy/2.0-1 1425s currently refs/tags/archive/test-dummy/2.0-1=aee9cd2e780c31d95c69374962a0b39eefe0cf8d 1425s |> fdd2b5354468f458164fe3f4ae3e456b50f9f3af tag refs/tags/archive/test-dummy/2.0-2 1425s currently refs/tags/archive/test-dummy/2.0-2=fdd2b5354468f458164fe3f4ae3e456b50f9f3af 1425s |> 253c9f310535cafce28dfdf19f17f3504e21b9cd tag refs/tags/test-dummy/2.0-1 1425s currently refs/tags/test-dummy/2.0-1=253c9f310535cafce28dfdf19f17f3504e21b9cd 1425s |> 77743169dae72d62c842113d5cf79c3b1b68e12a tag refs/tags/test-dummy/2.0-2 1425s currently refs/tags/test-dummy/2.0-2=77743169dae72d62c842113d5cf79c3b1b68e12a 1425s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1425s |> aee9cd2e780c31d95c69374962a0b39eefe0cf8d tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1425s offered refs/tags/archive/test-dummy/2.0-1=aee9cd2e780c31d95c69374962a0b39eefe0cf8d 1425s |> fdd2b5354468f458164fe3f4ae3e456b50f9f3af tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1425s offered refs/tags/archive/test-dummy/2.0-2=fdd2b5354468f458164fe3f4ae3e456b50f9f3af 1425s |> 253c9f310535cafce28dfdf19f17f3504e21b9cd tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1425s offered refs/tags/test-dummy/2.0-1=253c9f310535cafce28dfdf19f17f3504e21b9cd 1425s |> 77743169dae72d62c842113d5cf79c3b1b68e12a tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1425s offered refs/tags/test-dummy/2.0-2=77743169dae72d62c842113d5cf79c3b1b68e12a 1425s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1425s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.0-2+nmu1.dsc... 1425s get_archive_dsc: Version 2.0-2+nmu1 1425s last upload to archive: NO git hash 1425s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1425s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1425s previous reference hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1425s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1425s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1425s fetch_from_archive: lastfetch=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1425s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1425s considering reusing example_2.0.orig.tar.gz: (No such file or directory) linked. 1425s using existing example_2.0.orig.tar.gz 1425s considering saving example_2.0.orig.tar.gz: (File exists) no need. 1425s considering reusing example_2.0-2+nmu1.debian.tar.xz: (No such file or directory) linked. 1425s using existing example_2.0-2+nmu1.debian.tar.xz 1425s considering saving example_2.0-2+nmu1.debian.tar.xz: (File exists) no need. 1425s import considering example_2.0.orig.tar.gz Y .gz orig 1425s + chmod -R '+rwX' _unpack-tar 1425s CD _unpack-tar 1425s | find -name .git -prune -print0 1425s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1425s + git add -Af . 1425s | git write-tree 1425s => `e24142d5bb711d7b480f1e58dfc3e8c461c6e106' 1425s | git ls-tree -z e24142d5bb711d7b480f1e58dfc3e8c461c6e106 1425s => `040000 tree bdaae868b00952ee2af5782628959ae01469b2e3\x09example-2.0\x00' 1425s one subtree bdaae868b00952ee2af5782628959ae01469b2e3 1425s CD .. 1425s import considering example_2.0-2+nmu1.debian.tar.xz Y .xz (none) 1425s + chmod -R '+rwX' _unpack-tar 1425s CD _unpack-tar 1425s | find -name .git -prune -print0 1425s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1425s + git add -Af . 1425s | git write-tree 1425s => `23e971fe638bc162b531d732bb16219be595a43c' 1425s | git ls-tree -z 23e971fe638bc162b531d732bb16219be595a43c 1425s => `040000 tree 12f5ba668e35e4a47824cc6cda0e3098989e4312\x09debian\x00' 1425s one subtree 12f5ba668e35e4a47824cc6cda0e3098989e4312 1425s CD .. 1425s + dpkg-source --no-check --skip-patches -x -- example.dsc 1425s dpkg-source: info: extracting example in example-2.0 1425s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1425s dpkg-source: info: unpacking example_2.0-2+nmu1.debian.tar.xz 1425s CD example-2.0 1425s | find -name .git -prune -print0 1425s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1425s + git add -Af . 1425s | git write-tree 1425s => `95090028cc5026a9b5217d61a6c9f14ce0045ee1' 1425s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1425s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1425s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1425s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 1426s + git add -Af . 1426s | git write-tree 1426s => `1aabcedad6a8aa38371734ce42fe2aebc49d090c' 1426s import clog search... 1426s | dpkg-parsechangelog --format rfc822 --all 1426s import clog 2.0-2+nmu1 package changelog, entry no.1... 1426s import clog 2.0-2+nmu1 vs 2.0... 1426s import clog 2.0-2+nmu1 becomes r1 1426s import clog 2.0-2 package changelog, entry no.2... 1426s import clog 2.0-2 vs 2.0... 1426s import clog 2.0-2 becomes r1 1426s import clog 2.0-1 package changelog, entry no.3... 1426s import clog 2.0-1 vs 2.0... 1426s import clog 2.0-1 becomes r1 1426s import clog 1.0-1 package changelog, entry no.4... 1426s import clog 1.0-1 vs 2.0... 1426s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:09 +0000' 1426s => `1530000009 +0000' 1426s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1426s => `1530000000 +0000' 1426s import tartrees authline dgit test git user 1530000009 +0000 1426s import tartrees r1authline dgit test git user 1530000000 +0000 1426s import tartree example_2.0.orig.tar.gz bdaae868b00952ee2af5782628959ae01469b2e3 1426s | git hash-object -w -t commit --stdin 1426s => 6587c6c396e0002956dd3b151fe4b82e0bd7611c 1426s import tartree example_2.0-2+nmu1.debian.tar.xz 12f5ba668e35e4a47824cc6cda0e3098989e4312 1426s | git hash-object -w -t commit --stdin 1426s => 5aae5da550b90378be4cee7b8148dd10d247cca6 1426s import main commit 1426s | git hash-object -w -t commit ../commit.tmp 1426s => `968e0650fa96398f568331d7f9a52ae0ec8e2745' 1426s import apply patches... 1426s | git hash-object -w -t commit --stdin 1426s => f21fc372b44a946334b067f1e11e694b03bb8407 1426s + git checkout -q -b dapplied f21fc372b44a946334b067f1e11e694b03bb8407 1426s + git checkout -q -b unpa 968e0650fa96398f568331d7f9a52ae0ec8e2745 1426s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:09 +0000' 1426s => `1530000009 +0000' 1426s + git checkout -q unpa 1426s + git update-ref -d refs/heads/patch-queue/unpa 1426s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 1426s | git rev-parse 'HEAD~0' 1426s => `38d22bb4c9556793edd4a1d3617b56d318810b54' 1426s | git rev-parse HEAD: 1426s => `1aabcedad6a8aa38371734ce42fe2aebc49d090c' 1426s synthesised git commit from .dsc 2.0-2+nmu1 1426s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:debian/changelog 1426s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1426s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 38d22bb4c9556793edd4a1d3617b56d318810b54:debian/changelog 1426s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 38d22bb4c9556793edd4a1d3617b56d318810b54 1426s =>!256 1426s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1426s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1426s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1426s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1426s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1426s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1426s fetch mergeinfos: 1426s commit 38d22bb4c9556793edd4a1d3617b56d318810b54 Import of source package 1426s commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf dgit suite branch on dgit git server 1426s ReverseParents=1 Message=Record example (2.0-2+nmu1) in archive suite sid 1426s | git cat-file commit 38d22bb4c9556793edd4a1d3617b56d318810b54 1426s => `tree 1aabcedad6a8aa38371734ce42fe2aebc49d090c'... 1426s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:09 +0000' 1426s => `1530000009 +0000' 1426s | git hash-object -w -t commit /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/mergecommit 1426s => `d79025ae72ceb544a8c17eb58f17f7ac33e2835d' 1426s fetch hash=d79025ae72ceb544a8c17eb58f17f7ac33e2835d 1426s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf d79025ae72ceb544a8c17eb58f17f7ac33e2835d 1426s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1426s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1426s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1426s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1426s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1426s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf d79025ae72ceb544a8c17eb58f17f7ac33e2835d 1426s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1426s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1426s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1426s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1426s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1426s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE d79025ae72ceb544a8c17eb58f17f7ac33e2835d 1426s | git log -n2 d79025ae72ceb544a8c17eb58f17f7ac33e2835d 1426s => `commit d79025ae72ceb544a8c17eb58f17f7ac33e2835d'... 1426s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid d79025ae72ceb544a8c17eb58f17f7ac33e2835d 1426s => `' 1426s is_gitattrs_setup: found nothing 1426s | git ls-tree -lrz -- d79025ae72ceb544a8c17eb58f17f7ac33e2835d: 1426s dgit ok: fetched into refs/remotes/dgit/dgit/sid 1426s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1426s del_lrfetchrefs... 1426s del_lrfetchrefs: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit-fetch/test-dummy/dgit/sid 1426s del_lrfetchrefs: aee9cd2e780c31d95c69374962a0b39eefe0cf8d refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1426s del_lrfetchrefs: fdd2b5354468f458164fe3f4ae3e456b50f9f3af refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1426s del_lrfetchrefs: 253c9f310535cafce28dfdf19f17f3504e21b9cd refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1426s del_lrfetchrefs: 77743169dae72d62c842113d5cf79c3b1b68e12a refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1426s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1426s ' 1426s + t-expect-fail 'E:Not.*fast-forward' git merge --ff-only dgit/dgit/sid 1426s + local 'mpat=E:Not.*fast-forward' 1426s + shift 1426s + set +o pipefail 1426s + LC_MESSAGES=C 1426s + LANGUAGE=C 1426s + git merge --ff-only dgit/dgit/sid 1426s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s fatal: Not possible to fast-forward, aborting. 1426s + local 'ps=128 0' 1426s + set -o pipefail 1426s + case $ps in 1426s + t-grep-mpat 'E:Not.*fast-forward' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s + local 'mpat=E:Not.*fast-forward' 1426s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s + local grepper=fgrep 1426s + case "$mpat" in 1426s + case "$mpat" in 1426s + grepper=egrep 1426s + mpat='Not.*fast-forward' 1426s + egrep -e 'Not.*fast-forward' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s fatal: Not possible to fast-forward, aborting. 1426s + t-expect-fail 'E:-fdiverged.*refs/remotes/dgit/dgit/sid' t-git-debrebase 1426s + local 'mpat=E:-fdiverged.*refs/remotes/dgit/dgit/sid' 1426s + shift 1426s + set +o pipefail 1426s + LC_MESSAGES=C 1426s + LANGUAGE=C 1426s + t-git-debrebase 1426s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s + local gdr=git-debrebase 1426s + : ' 1426s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1426s + git-debrebase --dgit=dgit -D 1426s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1426s git-debrebase ffq check_specs * 1426s git-debrebase ffq merge master 1426s git-debrebase ffq check_remote origin remote fetch/merge branch 1426s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1426s OK, you are ahead of refs/remotes/origin/master 1426s git-debrebase ffq check_remote undef remote push branch 1426s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1426s git-debrebase: snag detected (-fdiverged): you have diverged from refs/remotes/dgit/dgit/sid 1426s 1426s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1426s + local 'ps=255 0' 1426s + set -o pipefail 1426s + case $ps in 1426s + t-grep-mpat 'E:-fdiverged.*refs/remotes/dgit/dgit/sid' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s + local 'mpat=E:-fdiverged.*refs/remotes/dgit/dgit/sid' 1426s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s + local grepper=fgrep 1426s + case "$mpat" in 1426s + case "$mpat" in 1426s + grepper=egrep 1426s + mpat='-fdiverged.*refs/remotes/dgit/dgit/sid' 1426s + egrep -e '-fdiverged.*refs/remotes/dgit/dgit/sid' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s git-debrebase: snag detected (-fdiverged): you have diverged from refs/remotes/dgit/dgit/sid 1426s + git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}' 1426s [master e1a2970] UPSTREAM NMU 1426s Date: Tue Jun 26 09:00:09 2018 +0100 1426s 1 file changed, 1 insertion(+) 1426s create mode 100644 newsrc.c 1426s + t-expect-fail 'Automatic merge failed; fix conflicts' git merge --squash -m 'Incorporate NMU' dgit/dgit/sid 1426s + local 'mpat=Automatic merge failed; fix conflicts' 1426s + shift 1426s + set +o pipefail 1426s + LC_MESSAGES=C 1426s + LANGUAGE=C 1426s + git merge --squash -m 'Incorporate NMU' dgit/dgit/sid 1426s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s Auto-merging debian/changelog 1426s 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. 1426s Squash commit -- not updating HEAD 1426s Automatic merge failed; fix conflicts and then commit the result. 1426s + local 'ps=1 0' 1426s + set -o pipefail 1426s + case $ps in 1426s + t-grep-mpat 'Automatic merge failed; fix conflicts' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s + local 'mpat=Automatic merge failed; fix conflicts' 1426s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s + local grepper=fgrep 1426s + case "$mpat" in 1426s + fgrep -e 'Automatic merge failed; fix conflicts' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1426s Automatic merge failed; fix conflicts and then commit the result. 1426s + git rm -rf debian/patches 1426s rm 'debian/patches/series' 1426s rm 'debian/patches/series' 1426s rm 'debian/patches/upstream-nmu.patch' 1426s + git commit -m 'Incorporate NMU' 1426s [master 7a836f5] Incorporate NMU 1426s 1 file changed, 6 insertions(+) 1426s + git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid 1426s Merge made by the 'ours' strategy. 1426s + : 'right, how are we' 1426s + t-git-next-date 1426s + GIT_COMMITTER_DATE='1530000012 +0100' 1426s + GIT_AUTHOR_DATE='1530000012 +0100' 1426s + t-git-debrebase 1426s + local gdr=git-debrebase 1426s + : ' 1426s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1426s + git-debrebase --dgit=dgit -D 1426s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1426s git-debrebase ffq check_specs * 1426s git-debrebase ffq merge master 1426s git-debrebase ffq check_remote origin remote fetch/merge branch 1426s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1426s OK, you are ahead of refs/remotes/origin/master 1426s git-debrebase ffq check_remote undef remote push branch 1426s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1426s OK, you are ahead of refs/remotes/dgit/dgit/sid 1426s git-debrebase *** WALK 932654abddf0eb7ebe550193fb0ba398ba364e49 0 - 1426s git-debrebase get_differs 7a836f53fdcff187d439fc6bb6768aa012e3bd06 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 1426s git-debrebase get_differs d79025ae72ceb544a8c17eb58f17f7ac33e2835d f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x3a 1426s git-debrebase classify 932654abddf0eb7ebe550193fb0ba398ba364e49 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p 7a836f53fdcff187d439fc6bb6768aa012e3bd06/0 d79025ae72ceb544a8c17eb58f17f7ac33e2835d/0x3a 1426s git-debrebase = Pseudomerge {"CommitId" => "932654abddf0eb7ebe550193fb0ba398ba364e49","Contributor" => {"CommitId" => "7a836f53fdcff187d439fc6bb6768aa012e3bd06","Differs" => 0,"Ix" => 0},"Parents" => [$VAR1->{"Contributor"},{"Ix" => 1,"Differs" => 58,"CommitId" => "d79025ae72ceb544a8c17eb58f17f7ac33e2835d"}],"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Overwritten" => [$VAR1->{"Parents"}[1]],"Msg" => "Declare incorporate NMU\n","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent 7a836f53fdcff187d439fc6bb6768aa012e3bd06\nparent d79025ae72ceb544a8c17eb58f17f7ac33e2835d\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Pseudomerge"} 1426s git-debrebase get_differs e1a29702bc09f17e805417c4625c85ff524a08ec f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x10 1426s git-debrebase classify 7a836f53fdcff187d439fc6bb6768aa012e3bd06 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p e1a29702bc09f17e805417c4625c85ff524a08ec/0x10 1426s git-debrebase = Changelog {"Parents" => [{"CommitId" => "e1a29702bc09f17e805417c4625c85ff524a08ec","Ix" => 0,"Differs" => 16}],"CommitId" => "7a836f53fdcff187d439fc6bb6768aa012e3bd06","Msg" => "Incorporate NMU\n","Type" => "Changelog","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent e1a29702bc09f17e805417c4625c85ff524a08ec\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1426s git-debrebase get_differs 74d5f586ed443ce47434f30fbbeff3eacb36748d 1d2249b1ed867c28303679a982049ff643d56028 = 0x2 1426s git-debrebase classify e1a29702bc09f17e805417c4625c85ff524a08ec $t=1d2249b1ed867c28303679a982049ff643d56028 @p 74d5f586ed443ce47434f30fbbeff3eacb36748d/0x2 1426s git-debrebase = Upstream {"Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","Type" => "Upstream","Tree" => "1d2249b1ed867c28303679a982049ff643d56028","Hdr" => "tree 1d2249b1ed867c28303679a982049ff643d56028\nparent 74d5f586ed443ce47434f30fbbeff3eacb36748d\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "74d5f586ed443ce47434f30fbbeff3eacb36748d","Ix" => 0,"Differs" => 2}],"CommitId" => "e1a29702bc09f17e805417c4625c85ff524a08ec"} 1426s git-debrebase get_differs 5b2d01d10ec62b3f25e6f7a22710468830e457fb 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0 1426s git-debrebase get_differs 964ce93fe0ce99ab711d1cb423537d236e0bbf20 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x8 1426s git-debrebase classify 74d5f586ed443ce47434f30fbbeff3eacb36748d $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p 5b2d01d10ec62b3f25e6f7a22710468830e457fb/0 964ce93fe0ce99ab711d1cb423537d236e0bbf20/0x8 1426s git-debrebase = Pseudomerge {"Hdr" => "tree 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae\nparent 5b2d01d10ec62b3f25e6f7a22710468830e457fb\nparent 964ce93fe0ce99ab711d1cb423537d236e0bbf20\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Pseudomerge","Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Overwritten" => [{"Differs" => 8,"Ix" => 1,"CommitId" => "964ce93fe0ce99ab711d1cb423537d236e0bbf20"}],"Contributor" => {"CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb","Differs" => 0,"Ix" => 0},"CommitId" => "74d5f586ed443ce47434f30fbbeff3eacb36748d","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 1426s git-debrebase get_differs b3c76885171009da1ef20071776aa9044fae8502 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x2 1426s git-debrebase classify 5b2d01d10ec62b3f25e6f7a22710468830e457fb $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p b3c76885171009da1ef20071776aa9044fae8502/0x2 1426s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Differs" => 2,"Ix" => 0}],"CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae","Hdr" => "tree 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae\nparent b3c76885171009da1ef20071776aa9044fae8502\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1426s git-debrebase get_differs 8139d3db657e3270633db038d311934dab9b5fa2 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 = 0x2 1426s git-debrebase classify b3c76885171009da1ef20071776aa9044fae8502 $t=5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 @p 8139d3db657e3270633db038d311934dab9b5fa2/0x2 1426s 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","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Type" => "Upstream","CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Parents" => [{"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Differs" => 2,"Ix" => 0}]} 1426s git-debrebase get_differs f99dd01b94310ac6847d5bb66d530db52eceb9a7 1a9494a6c69d5574aa472ee96d6f641184e55cfa = 0x2 1426s git-debrebase classify 8139d3db657e3270633db038d311934dab9b5fa2 $t=1a9494a6c69d5574aa472ee96d6f641184e55cfa @p f99dd01b94310ac6847d5bb66d530db52eceb9a7/0x2 1426s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7"}],"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 1a9494a6c69d5574aa472ee96d6f641184e55cfa\nparent f99dd01b94310ac6847d5bb66d530db52eceb9a7\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "1a9494a6c69d5574aa472ee96d6f641184e55cfa"} 1426s git-debrebase get_differs 505316fe392571a9180b6df0d54ec25ffb40c9c7 a71937789bee6e5711ddc7f7e212948a45fedf59 = 0x2 1426s git-debrebase classify f99dd01b94310ac6847d5bb66d530db52eceb9a7 $t=a71937789bee6e5711ddc7f7e212948a45fedf59 @p 505316fe392571a9180b6df0d54ec25ffb40c9c7/0x2 1426s git-debrebase = Upstream {"Parents" => [{"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Differs" => 2,"Ix" => 0}],"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Type" => "Upstream","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","Tree" => "a71937789bee6e5711ddc7f7e212948a45fedf59"} 1426s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 447f86ca9d4d65b8c1128528a4338c51733e127b = 0x2 1426s git-debrebase classify 505316fe392571a9180b6df0d54ec25ffb40c9c7 $t=447f86ca9d4d65b8c1128528a4338c51733e127b @p 274022edec808f75f2359551ecdc6de6b6390355/0x2 1426s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 447f86ca9d4d65b8c1128528a4338c51733e127b\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "447f86ca9d4d65b8c1128528a4338c51733e127b","Parents" => [{"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Ix" => 0,"Differs" => 2}],"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7"} 1426s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 1426s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 1426s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"}],"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1426s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 1426s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 1426s 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","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Parents" => [{"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Differs" => 32,"Ix" => 0}]} 1426s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 1426s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1426s git-debrebase = Changelog {"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","Tree" => "894ca54a967167e2bb994b82357d084539559075","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16,"Ix" => 0}],"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a"} 1426s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1426s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1426s git-debrebase = Changelog {"Parents" => [{"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Ix" => 0,"Differs" => 16}],"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","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1426s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1426s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1426s git-debrebase = Changelog {"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"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"} 1426s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1426s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1426s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1426s git-debrebase = Anchor {"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},{"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","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]]} 1426s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 16 pm 1 1426s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1426s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1426s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 17 1426s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1426s git-debrebase WALK BUILD 9214201f528bae71f4647709e2357407746739d5 Debian (rewriting=0) 1426s git-debrebase WALK BUILD 32b1b8f0bdc575561b14de2ec9711d768a12d928 Debian (rewriting=0) 1426s git-debrebase WALK BUILD d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a Debian (rewriting=0) 1426s git-debrebase WALK BUILD 66623ad57ce32197ca515cfa520eaf7d7746889d Debian (rewriting=0) 1426s git-debrebase WALK BUILD 274022edec808f75f2359551ecdc6de6b6390355 Debian (rewriting=0) 1426s git-debrebase WALK BUILD 7a836f53fdcff187d439fc6bb6768aa012e3bd06 Debian (rewriting=0) 1426s git-debrebase WALK REWRITING NOW cl=HASH(0xf64ef78ba48) procd=HASH(0xf64ef84f5a8) 1426s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1426s git-debrebase WALK BUILD 505316fe392571a9180b6df0d54ec25ffb40c9c7 Upstream (rewriting=1) 1426s git-debrebase WALK BUILD f99dd01b94310ac6847d5bb66d530db52eceb9a7 Upstream (rewriting=1) 1426s git-debrebase WALK BUILD 8139d3db657e3270633db038d311934dab9b5fa2 Upstream (rewriting=1) 1427s git-debrebase WALK BUILD b3c76885171009da1ef20071776aa9044fae8502 Upstream (rewriting=1) 1427s git-debrebase WALK BUILD 5b2d01d10ec62b3f25e6f7a22710468830e457fb Upstream (rewriting=1) 1427s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1427s git-debrebase WALK BUILD e1a29702bc09f17e805417c4625c85ff524a08ec Upstream (rewriting=1) 1427s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1427s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1427s git-debrebase get_differs 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49 = 0 1427s git-debrebase *** WALK RETURN 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 8269bff5f8f41256a597bb494347f4bd8fc81fba 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1427s git-debrebase: laundered (head was 932654abddf0eb7ebe550193fb0ba398ba364e49) 1427s git-debrebase >= update refs/ffq-prev/heads/master 932654abddf0eb7ebe550193fb0ba398ba364e49 0000000000000000000000000000000000000000 1427s git-debrebase >= delete refs/debrebase-last/heads/master 1427s git-debrebase >= update HEAD 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49 1427s git-debrebase >$ 1427s Recorded previous head for preservation 1427s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1427s ' 1427s + t-gdr-good laundered 1427s + local state=laundered 1427s + local beforetag= 1427s + case $state in 1427s + git diff --quiet -- :. ':!debian/patches' 1427s + LC_MESSAGES=C 1427s + t-git-debrebase status 1427s + local gdr=git-debrebase 1427s + : ' 1427s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1427s + git-debrebase --dgit=dgit -D status 1427s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 1427s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 1427s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9"}],"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Type" => "Upstream","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent c59f39e5ca05d33181b7ea7f243a95d529283eb9\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea"} 1427s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 1427s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 1427s git-debrebase = Upstream {"Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38"}],"Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733"} 1427s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 1427s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 1427s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72"}],"Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c","Type" => "Upstream","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","CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38"} 1427s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 1427s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 1427s git-debrebase = Upstream {"Hdr" => "tree 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf\nparent 582e04de6ba12ec6c2a7957216152c3d4bb5b68f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000012 +0100\n","CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"}],"Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","Type" => "Upstream"} 1427s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 1427s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 1427s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9","Parents" => [{"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Ix" => 0,"Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Hdr" => "tree 385e14c491a1bb795f0e2f956f62e730d263ceb9\nparent 4003fef7726798715307fd023578bd022f3c34a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000012 +0100\n"} 1427s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 1427s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 1427s git-debrebase = 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","Type" => "Upstream","Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","Parents" => [{"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Ix" => 0,"Differs" => 2}]} 1427s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 1427s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 1427s 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","Parents" => [{"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Ix" => 0,"Differs" => 16}],"Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd","Type" => "Changelog"} 1427s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 1427s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 1427s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Parents" => [{"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Differs" => 32,"Ix" => 0}],"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","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"} 1427s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 1427s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 1427s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","Parents" => [{"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Ix" => 0,"Differs" => 32}],"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","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"} 1427s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 1427s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1427s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "894ca54a967167e2bb994b82357d084539559075","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Msg" => "dch -v2.0-3 -m start 2.0-3\n","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1427s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1427s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1427s 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","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog"} 1427s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1427s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1427s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 1427s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1427s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1427s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1427s 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"},{"Differs" => 48,"Ix" => 1,"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"} 1427s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1427s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1427s ' 1427s + case $state in 1427s + egrep '^ *branch is laundered' ../status.check 1427s branch is laundered 1427s + t-gdr-good-analyse HEAD laundered 1427s + local head=HEAD 1427s + local state=laundered 1427s + local wsfx= 1427s + local etypes bwtip 1427s + case $state in 1427s + etypes=Upstream 1427s ++ t-git-debrebase breakwater 1427s ++ local gdr=git-debrebase 1427s ++ : ' 1427s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1427s ++ git-debrebase --dgit=dgit -D breakwater 1427s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 1427s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 1427s git-debrebase = Upstream {"Parents" => [{"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Ix" => 0,"Differs" => 2}],"CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","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","Type" => "Upstream","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b"} 1427s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 1427s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 1427s git-debrebase = Upstream {"Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733","Type" => "Upstream","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","CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Parents" => [{"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Ix" => 0,"Differs" => 2}]} 1427s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 1427s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 1427s git-debrebase = Upstream {"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72"}],"Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c","Type" => "Upstream","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"} 1427s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 1427s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 1427s git-debrebase = Upstream {"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","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"}],"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72"} 1427s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 1427s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 1427s 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","CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4"}]} 1427s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 1427s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 1427s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba"}],"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","Type" => "Upstream","Hdr" => "tree 6654af700482e5111ccb9bcdc47ec2800589cc2f\nparent 8269bff5f8f41256a597bb494347f4bd8fc81fba\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000012 +0100\n"} 1427s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 1427s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 1427s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355"}],"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd","Type" => "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"} 1427s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 1427s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 1427s git-debrebase = Packaging {"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"}],"Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","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"} 1427s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 1427s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 1427s git-debrebase = Packaging {"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Parents" => [{"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging"} 1427s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 1427s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1427s 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","Tree" => "894ca54a967167e2bb994b82357d084539559075","Msg" => "dch -v2.0-3 -m start 2.0-3\n","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}]} 1427s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1427s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1427s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1427s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1427s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1427s git-debrebase = Changelog {"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 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5"} 1427s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1427s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1427s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1427s git-debrebase = Anchor {"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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 1427s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1427s ' 1427s + bwtip=Y:8269bff5f8f41256a597bb494347f4bd8fc81fba 1427s + anal=../anal 1427s + t-git-debrebase analyse HEAD 1427s + local gdr=git-debrebase 1427s + : ' 1427s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1427s + git-debrebase --dgit=dgit -D analyse HEAD 1427s git-debrebase *** WALK 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1 *main::STDOUT 1427s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 1427s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 1427s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","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"} 1427s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 1427s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 1427s git-debrebase = Upstream {"Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38"}],"Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream","CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9"} 1427s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 1427s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 1427s git-debrebase = Upstream {"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Type" => "Upstream","Hdr" => "tree 467bd6c6ee0833811c04dac8591511b32de3110c\nparent fc2ef95aff332f63d93b2025328fafa4a47a6f72\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Parents" => [{"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Differs" => 2,"Ix" => 0}],"Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n"} 1427s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 1427s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 1427s git-debrebase = Upstream {"Hdr" => "tree 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf\nparent 582e04de6ba12ec6c2a7957216152c3d4bb5b68f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000012 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"}],"Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Type" => "Upstream"} 1427s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 1427s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 1427s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4"}],"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","Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9","CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Type" => "Upstream"} 1427s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 1427s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 1427s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba"}],"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","Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Type" => "Upstream"} 1427s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 1427s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 1427s git-debrebase = Changelog {"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Type" => "Changelog","Hdr" => "tree 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000012 +0100\n","Parents" => [{"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Ix" => 0,"Differs" => 16}],"Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd","Msg" => "Incorporate NMU\n"} 1427s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 1427s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 1427s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","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"} 1427s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 1427s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 1427s 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","Parents" => [{"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"} 1427s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 1427s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1427s git-debrebase = Changelog {"Msg" => "dch -v2.0-3 -m start 2.0-3\n","Tree" => "894ca54a967167e2bb994b82357d084539559075","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Ix" => 0,"Differs" => 16}],"Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a"} 1427s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1427s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1427s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","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","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}]} 1427s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1427s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1427s 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","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Type" => "Changelog","CommitId" => "9214201f528bae71f4647709e2357407746739d5"} 1427s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1427s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1427s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1427s git-debrebase = Anchor {"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","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"} 1427s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 5 proc 12 pm -1 1427s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1427s ' 1427s ++ git rev-parse HEAD 1427s + expect=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1427s + exec 1427s + local cid ctype info nparents 1427s + read cid ctype info 1427s + : ===== 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea Upstream ===== 1427s + test 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea = 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1427s + local cetype=Upstream 1427s + '[' xUpstream = xUpstream ']' 1427s + cetype=SAME 1427s ++ git log -n1 --pretty=format:%P 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1427s + local parents=c59f39e5ca05d33181b7ea7f243a95d529283eb9 1427s + expect=c59f39e5ca05d33181b7ea7f243a95d529283eb9 1427s + enparents=1 1427s + : Upstream/SAME c59f39e5ca05d33181b7ea7f243a95d529283eb9 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s ++ printf %s c59f39e5ca05d33181b7ea7f243a95d529283eb9 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo c59f39e5ca05d33181b7ea7f243a95d529283eb9 1427s ++ wc -w 1427s ++ t-sort -u 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== c59f39e5ca05d33181b7ea7f243a95d529283eb9 Upstream ===== 1427s + test c59f39e5ca05d33181b7ea7f243a95d529283eb9 = c59f39e5ca05d33181b7ea7f243a95d529283eb9 1427s + local cetype=Upstream 1427s + '[' xUpstream = xUpstream ']' 1427s + cetype=SAME 1427s ++ git log -n1 --pretty=format:%P c59f39e5ca05d33181b7ea7f243a95d529283eb9 1427s + local parents=4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1427s + expect=4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1427s + enparents=1 1427s + : Upstream/SAME 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s ++ printf %s 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1427s ++ wc -w 1427s ++ t-sort -u 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 Upstream ===== 1427s + test 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 = 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1427s + local cetype=Upstream 1427s + '[' xUpstream = xUpstream ']' 1427s + cetype=SAME 1427s ++ git log -n1 --pretty=format:%P 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1427s + local parents=fc2ef95aff332f63d93b2025328fafa4a47a6f72 1427s + expect=fc2ef95aff332f63d93b2025328fafa4a47a6f72 1427s + enparents=1 1427s + : Upstream/SAME fc2ef95aff332f63d93b2025328fafa4a47a6f72 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s ++ printf %s fc2ef95aff332f63d93b2025328fafa4a47a6f72 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo fc2ef95aff332f63d93b2025328fafa4a47a6f72 1427s ++ t-sort -u 1427s ++ wc -w 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== fc2ef95aff332f63d93b2025328fafa4a47a6f72 Upstream ===== 1427s + test fc2ef95aff332f63d93b2025328fafa4a47a6f72 = fc2ef95aff332f63d93b2025328fafa4a47a6f72 1427s + local cetype=Upstream 1427s + '[' xUpstream = xUpstream ']' 1427s + cetype=SAME 1427s ++ git log -n1 --pretty=format:%P fc2ef95aff332f63d93b2025328fafa4a47a6f72 1427s + local parents=582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1427s + expect=582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1427s + enparents=1 1427s + : Upstream/SAME 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s ++ printf %s 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1427s ++ t-sort -u 1427s ++ LC_COLLATE=C 1427s ++ wc -w 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== 582e04de6ba12ec6c2a7957216152c3d4bb5b68f Upstream ===== 1427s + test 582e04de6ba12ec6c2a7957216152c3d4bb5b68f = 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1427s + local cetype=Upstream 1427s + '[' xUpstream = xUpstream ']' 1427s + cetype=SAME 1427s ++ git log -n1 --pretty=format:%P 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1427s + local parents=4003fef7726798715307fd023578bd022f3c34a4 1427s + expect=4003fef7726798715307fd023578bd022f3c34a4 1427s + enparents=1 1427s + : Upstream/SAME 4003fef7726798715307fd023578bd022f3c34a4 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s ++ printf %s 4003fef7726798715307fd023578bd022f3c34a4 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo 4003fef7726798715307fd023578bd022f3c34a4 1427s ++ t-sort -u 1427s ++ wc -w 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== 4003fef7726798715307fd023578bd022f3c34a4 Upstream ===== 1427s + test 4003fef7726798715307fd023578bd022f3c34a4 = 4003fef7726798715307fd023578bd022f3c34a4 1427s + local cetype=Upstream 1427s + '[' xUpstream = xUpstream ']' 1427s + cetype=SAME 1427s ++ git log -n1 --pretty=format:%P 4003fef7726798715307fd023578bd022f3c34a4 1427s + local parents=8269bff5f8f41256a597bb494347f4bd8fc81fba 1427s + expect=8269bff5f8f41256a597bb494347f4bd8fc81fba 1427s + enparents=1 1427s + : Upstream/SAME 8269bff5f8f41256a597bb494347f4bd8fc81fba 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s ++ printf %s 8269bff5f8f41256a597bb494347f4bd8fc81fba 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo 8269bff5f8f41256a597bb494347f4bd8fc81fba 1427s ++ t-sort -u 1427s ++ wc -w 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== 8269bff5f8f41256a597bb494347f4bd8fc81fba Changelog ===== 1427s + test 8269bff5f8f41256a597bb494347f4bd8fc81fba = 8269bff5f8f41256a597bb494347f4bd8fc81fba 1427s + local cetype=Upstream 1427s + '[' xChangelog = xUpstream ']' 1427s ++ git log -n1 --pretty=format:%P 8269bff5f8f41256a597bb494347f4bd8fc81fba 1427s + local parents=274022edec808f75f2359551ecdc6de6b6390355 1427s + expect=274022edec808f75f2359551ecdc6de6b6390355 1427s + enparents=1 1427s + : Changelog/Upstream 274022edec808f75f2359551ecdc6de6b6390355 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + '[' xY:8269bff5f8f41256a597bb494347f4bd8fc81fba '!=' x ']' 1427s + test Y:8269bff5f8f41256a597bb494347f4bd8fc81fba = Y:8269bff5f8f41256a597bb494347f4bd8fc81fba 1427s + bwtip= 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s + git diff --quiet 274022edec808f75f2359551ecdc6de6b6390355..8269bff5f8f41256a597bb494347f4bd8fc81fba -- :. ':!debian/changelog' 1427s + etypes=Packaging 1427s ++ printf %s 274022edec808f75f2359551ecdc6de6b6390355 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo 274022edec808f75f2359551ecdc6de6b6390355 1427s ++ wc -w 1427s ++ t-sort -u 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== 274022edec808f75f2359551ecdc6de6b6390355 Packaging ===== 1427s + test 274022edec808f75f2359551ecdc6de6b6390355 = 274022edec808f75f2359551ecdc6de6b6390355 1427s + local cetype=Packaging 1427s + '[' xPackaging = xPackaging ']' 1427s + cetype=SAME 1427s ++ git log -n1 --pretty=format:%P 274022edec808f75f2359551ecdc6de6b6390355 1427s + local parents=66623ad57ce32197ca515cfa520eaf7d7746889d 1427s + expect=66623ad57ce32197ca515cfa520eaf7d7746889d 1427s + enparents=1 1427s + : Packaging/SAME 66623ad57ce32197ca515cfa520eaf7d7746889d 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s + git diff --quiet 66623ad57ce32197ca515cfa520eaf7d7746889d..274022edec808f75f2359551ecdc6de6b6390355 -- :. ':!debian' 1427s + git diff --quiet 66623ad57ce32197ca515cfa520eaf7d7746889d..274022edec808f75f2359551ecdc6de6b6390355 -- :debian/patches 1427s + etypes=Packaging 1427s ++ printf %s 66623ad57ce32197ca515cfa520eaf7d7746889d 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo 66623ad57ce32197ca515cfa520eaf7d7746889d 1427s ++ wc -w 1427s ++ t-sort -u 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== 66623ad57ce32197ca515cfa520eaf7d7746889d Packaging ===== 1427s + test 66623ad57ce32197ca515cfa520eaf7d7746889d = 66623ad57ce32197ca515cfa520eaf7d7746889d 1427s + local cetype=Packaging 1427s + '[' xPackaging = xPackaging ']' 1427s + cetype=SAME 1427s ++ git log -n1 --pretty=format:%P 66623ad57ce32197ca515cfa520eaf7d7746889d 1427s + local parents=d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1427s + expect=d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1427s + enparents=1 1427s + : Packaging/SAME d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s + git diff --quiet d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a..66623ad57ce32197ca515cfa520eaf7d7746889d -- :. ':!debian' 1427s + git diff --quiet d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a..66623ad57ce32197ca515cfa520eaf7d7746889d -- :debian/patches 1427s + etypes=Packaging 1427s ++ printf %s d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1427s ++ wc -w 1427s ++ t-sort -u 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a Changelog ===== 1427s + test d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a = d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1427s + local cetype=Packaging 1427s + '[' xChangelog = xPackaging ']' 1427s ++ git log -n1 --pretty=format:%P d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1427s + local parents=32b1b8f0bdc575561b14de2ec9711d768a12d928 1427s + expect=32b1b8f0bdc575561b14de2ec9711d768a12d928 1427s + enparents=1 1427s + : Changelog/Packaging 32b1b8f0bdc575561b14de2ec9711d768a12d928 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s + git diff --quiet 32b1b8f0bdc575561b14de2ec9711d768a12d928..d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a -- :. ':!debian/changelog' 1427s + etypes=Packaging 1427s ++ wc -w 1427s ++ printf %s 32b1b8f0bdc575561b14de2ec9711d768a12d928 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo 32b1b8f0bdc575561b14de2ec9711d768a12d928 1427s ++ wc -w 1427s ++ t-sort -u 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== 32b1b8f0bdc575561b14de2ec9711d768a12d928 Changelog ===== 1427s + test 32b1b8f0bdc575561b14de2ec9711d768a12d928 = 32b1b8f0bdc575561b14de2ec9711d768a12d928 1427s + local cetype=Packaging 1427s + '[' xChangelog = xPackaging ']' 1427s ++ git log -n1 --pretty=format:%P 32b1b8f0bdc575561b14de2ec9711d768a12d928 1427s + local parents=9214201f528bae71f4647709e2357407746739d5 1427s + expect=9214201f528bae71f4647709e2357407746739d5 1427s + enparents=1 1427s + : Changelog/Packaging 9214201f528bae71f4647709e2357407746739d5 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s + git diff --quiet 9214201f528bae71f4647709e2357407746739d5..32b1b8f0bdc575561b14de2ec9711d768a12d928 -- :. ':!debian/changelog' 1427s + etypes=Packaging 1427s ++ printf %s 9214201f528bae71f4647709e2357407746739d5 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ for f in $parents 1427s ++ echo 9214201f528bae71f4647709e2357407746739d5 1427s ++ wc -w 1427s ++ t-sort -u 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== 9214201f528bae71f4647709e2357407746739d5 Changelog ===== 1427s + test 9214201f528bae71f4647709e2357407746739d5 = 9214201f528bae71f4647709e2357407746739d5 1427s + local cetype=Packaging 1427s + '[' xChangelog = xPackaging ']' 1427s ++ git log -n1 --pretty=format:%P 9214201f528bae71f4647709e2357407746739d5 1427s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1427s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1427s + enparents=1 1427s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..9214201f528bae71f4647709e2357407746739d5 -- :. ':!debian/changelog' 1427s + etypes=Packaging 1427s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1427s ++ wc -w 1427s + local cnparents=1 1427s + test 1 = 1 1427s ++ wc -w 1427s ++ for f in $parents 1427s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1427s ++ t-sort -u 1427s ++ LC_COLLATE=C 1427s ++ sort -u 1427s + local cndparents=1 1427s + test 1 = 1 1427s + case "$parents" in 1427s + case "$ctype" in 1427s + read cid ctype info 1427s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1427s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1427s + local cetype=Packaging 1427s + '[' xAnchor = xPackaging ']' 1427s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1427s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1427s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1427s + enparents=1 1427s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1427s + case "$ctype/$cetype" in 1427s + case "$ctype/$etypes" in 1427s + case "$cetype" in 1427s + case "$ctype" in 1427s + break 1427s + t-git-debrebase stitch 1427s + local gdr=git-debrebase 1427s + : ' 1427s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1427s + git-debrebase --dgit=dgit -D stitch 1427s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1427s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 1427s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 1427s git-debrebase = Upstream {"Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent c59f39e5ca05d33181b7ea7f243a95d529283eb9\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9"}],"CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea"} 1427s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 1427s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 1427s git-debrebase = Upstream {"Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Parents" => [{"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 1427s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 1427s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 1427s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Parents" => [{"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Ix" => 0,"Differs" => 2}],"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","Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c"} 1427s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 1427s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 1427s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"}],"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","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"} 1427s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 1427s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 1427s git-debrebase = Upstream {"Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9","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","CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Parents" => [{"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1427s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 1427s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 1427s git-debrebase = Upstream {"Parents" => [{"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Differs" => 2,"Ix" => 0}],"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Type" => "Upstream","Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","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"} 1427s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 1427s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 1427s git-debrebase = Changelog {"Hdr" => "tree 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd","Msg" => "Incorporate NMU\n","Type" => "Changelog","CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Parents" => [{"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Differs" => 16,"Ix" => 0}]} 1427s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 1427s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 1427s 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","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"}],"Type" => "Packaging"} 1427s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 1427s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 1427s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a"}],"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","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"} 1427s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 1427s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1427s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16,"Ix" => 0}],"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","Tree" => "894ca54a967167e2bb994b82357d084539559075"} 1427s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1427s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1427s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Parents" => [{"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Ix" => 0,"Differs" => 16}],"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"} 1427s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1427s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1427s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5","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"} 1428s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1428s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1428s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1428s 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","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 1428s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1428s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1428s git-debrebase >= delete refs/ffq-prev/heads/master 932654abddf0eb7ebe550193fb0ba398ba364e49 1428s git-debrebase >= update refs/debrebase-last/heads/master 7deba4224559390e54e9ff106aa4430e0cfdb7f5 0000000000000000000000000000000000000000 1428s git-debrebase >= update HEAD 7deba4224559390e54e9ff106aa4430e0cfdb7f5 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1428s git-debrebase >$ 1428s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1428s ' 1428s + t-gdr-good stitched 1428s + local state=stitched 1428s + local beforetag= 1428s + case $state in 1428s + git diff --quiet -- :. ':!debian/patches' 1428s + LC_MESSAGES=C 1428s + t-git-debrebase status 1428s + local gdr=git-debrebase 1428s + : ' 1428s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1428s + git-debrebase --dgit=dgit -D status 1428s git-debrebase get_differs 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 1428s git-debrebase get_differs 932654abddf0eb7ebe550193fb0ba398ba364e49 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 1428s git-debrebase classify 7deba4224559390e54e9ff106aa4430e0cfdb7f5 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea/0 932654abddf0eb7ebe550193fb0ba398ba364e49/0 1428s git-debrebase = Pseudomerge {"Overwritten" => [{"CommitId" => "932654abddf0eb7ebe550193fb0ba398ba364e49","Differs" => 0,"Ix" => 1}],"Parents" => [{"Differs" => 0,"CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Ix" => 0},$VAR1->{"Overwritten"}[0]],"SubType" => "Ambiguous","Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","CommitId" => "7deba4224559390e54e9ff106aa4430e0cfdb7f5","Contributor" => $VAR1->{"Parents"}[0],"Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea\nparent 932654abddf0eb7ebe550193fb0ba398ba364e49\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 1428s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 1428s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 1428s git-debrebase = Upstream {"Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent c59f39e5ca05d33181b7ea7f243a95d529283eb9\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","Type" => "Upstream","CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Parents" => [{"Ix" => 0,"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Differs" => 2}]} 1428s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 1428s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 1428s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Differs" => 2,"Ix" => 0}],"Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733","CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 1428s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 1428s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 1428s git-debrebase = Upstream {"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c","Parents" => [{"Differs" => 2,"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Ix" => 0}],"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"} 1428s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 1428s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 1428s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"}],"Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf\nparent 582e04de6ba12ec6c2a7957216152c3d4bb5b68f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 1428s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 1428s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 1428s git-debrebase = Upstream {"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","Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9","Parents" => [{"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Differs" => 2,"Ix" => 0}],"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"} 1428s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 1428s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 1428s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba"}],"Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 6654af700482e5111ccb9bcdc47ec2800589cc2f\nparent 8269bff5f8f41256a597bb494347f4bd8fc81fba\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000012 +0100\n"} 1428s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 1428s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 1428s git-debrebase = Changelog {"Msg" => "Incorporate NMU\n","Type" => "Changelog","CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd","Parents" => [{"Ix" => 0,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Differs" => 16}],"Hdr" => "tree 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 1428s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 1428s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 1428s git-debrebase = Packaging {"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}],"Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Type" => "Packaging","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1428s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 1428s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 1428s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Type" => "Packaging","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Parents" => [{"Differs" => 32,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Ix" => 0}],"Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1428s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 1428s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1428s git-debrebase = Changelog {"Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Tree" => "894ca54a967167e2bb994b82357d084539559075","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v2.0-3 -m start 2.0-3\n","Type" => "Changelog"} 1428s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1428s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1428s git-debrebase = 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","Parents" => [{"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n","Type" => "Changelog"} 1428s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1428s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1428s 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","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 1428s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1428s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1428s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1428s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "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","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]]} 1428s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1428s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1428s ' 1428s + case $state in 1428s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 1428s branch contains furniture (not laundered) 1428s + egrep '^ stitched$' ../status.check 1428s stitched 1428s + t-gdr-good-analyse HEAD stitched 1428s + local head=HEAD 1428s + local state=stitched 1428s + local wsfx= 1428s + local etypes bwtip 1428s + case $state in 1428s + etypes=Pseudomerge-Upstream 1428s + anal=../anal 1428s + t-git-debrebase analyse HEAD 1428s + local gdr=git-debrebase 1428s + : ' 1428s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1428s + git-debrebase --dgit=dgit -D analyse HEAD 1428s git-debrebase *** WALK 7deba4224559390e54e9ff106aa4430e0cfdb7f5 1 *main::STDOUT 1428s git-debrebase get_differs 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 1428s git-debrebase get_differs 932654abddf0eb7ebe550193fb0ba398ba364e49 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 1428s git-debrebase classify 7deba4224559390e54e9ff106aa4430e0cfdb7f5 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea/0 932654abddf0eb7ebe550193fb0ba398ba364e49/0 1428s git-debrebase = Pseudomerge {"Overwritten" => [{"Ix" => 1,"CommitId" => "932654abddf0eb7ebe550193fb0ba398ba364e49","Differs" => 0}],"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Parents" => [{"Ix" => 0,"CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Differs" => 0},$VAR1->{"Overwritten"}[0]],"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","SubType" => "Ambiguous","Contributor" => $VAR1->{"Parents"}[0],"CommitId" => "7deba4224559390e54e9ff106aa4430e0cfdb7f5","Type" => "Pseudomerge"} 1428s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 1428s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 1428s git-debrebase = Upstream {"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9"}],"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","Type" => "Upstream"} 1428s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 1428s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 1428s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","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","Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733"} 1428s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 1428s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 1428s git-debrebase = Upstream {"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c","Hdr" => "tree 467bd6c6ee0833811c04dac8591511b32de3110c\nparent fc2ef95aff332f63d93b2025328fafa4a47a6f72\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 1428s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 1428s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 1428s git-debrebase = Upstream {"Hdr" => "tree 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf\nparent 582e04de6ba12ec6c2a7957216152c3d4bb5b68f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000012 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","Type" => "Upstream","CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72"} 1428s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 1428s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 1428s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Hdr" => "tree 385e14c491a1bb795f0e2f956f62e730d263ceb9\nparent 4003fef7726798715307fd023578bd022f3c34a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Ix" => 0,"Differs" => 2}]} 1428s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 1428s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 1428s git-debrebase = Upstream {"Hdr" => "tree 6654af700482e5111ccb9bcdc47ec2800589cc2f\nparent 8269bff5f8f41256a597bb494347f4bd8fc81fba\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000012 +0100\n","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","Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","Type" => "Upstream","CommitId" => "4003fef7726798715307fd023578bd022f3c34a4"} 1428s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 1428s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 1428s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Hdr" => "tree 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd","Msg" => "Incorporate NMU\n","Parents" => [{"Ix" => 0,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Differs" => 16}]} 1428s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 1428s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 1428s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","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"}],"Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd"} 1428s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 1428s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 1428s 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","Parents" => [{"Ix" => 0,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Differs" => 32}],"Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","Type" => "Packaging","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"} 1428s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 1428s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1428s git-debrebase = Changelog {"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Type" => "Changelog","Msg" => "dch -v2.0-3 -m start 2.0-3\n","Parents" => [{"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Ix" => 0}],"Tree" => "894ca54a967167e2bb994b82357d084539559075","Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1428s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1428s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1428s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Msg" => "dch -r -D unstable\n","Type" => "Changelog","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"} 1428s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1428s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1428s 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"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Type" => "Changelog"} 1428s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1428s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1428s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1428s 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","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" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 1428s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 14 pm 0 1428s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1428s ' 1428s ++ git rev-parse HEAD 1428s + expect=7deba4224559390e54e9ff106aa4430e0cfdb7f5 1428s + exec 1428s + local cid ctype info nparents 1428s + read cid ctype info 1428s + : ===== 7deba4224559390e54e9ff106aa4430e0cfdb7f5 Pseudomerge Contributor=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea ===== 1428s + test 7deba4224559390e54e9ff106aa4430e0cfdb7f5 = 7deba4224559390e54e9ff106aa4430e0cfdb7f5 1428s + local cetype=Pseudomerge 1428s + '[' xPseudomerge = xPseudomerge ']' 1428s + cetype=SAME 1428s ++ git log -n1 --pretty=format:%P 7deba4224559390e54e9ff106aa4430e0cfdb7f5 1428s + local 'parents=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49' 1428s + expect='8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49' 1428s + enparents=1 1428s + : Pseudomerge/SAME '8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49' 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s + expect=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1428s + expect=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1428s + enparents=2 1428s + git diff --quiet 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea..7deba4224559390e54e9ff106aa4430e0cfdb7f5 1428s + etypes=Upstream 1428s + : 'reject pointless pseudomerges' 1428s + local 'overwritten= 932654abddf0eb7ebe550193fb0ba398ba364e49' 1428s + overwritten=932654abddf0eb7ebe550193fb0ba398ba364e49 1428s + t-git-debrebase analyse 932654abddf0eb7ebe550193fb0ba398ba364e49 1428s + local gdr=git-debrebase 1428s + : ' 1428s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1428s + git-debrebase --dgit=dgit -D analyse 932654abddf0eb7ebe550193fb0ba398ba364e49 1428s git-debrebase *** WALK 932654abddf0eb7ebe550193fb0ba398ba364e49 1 *main::STDOUT 1428s git-debrebase get_differs 7a836f53fdcff187d439fc6bb6768aa012e3bd06 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 1428s git-debrebase get_differs d79025ae72ceb544a8c17eb58f17f7ac33e2835d f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x3a 1428s git-debrebase classify 932654abddf0eb7ebe550193fb0ba398ba364e49 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p 7a836f53fdcff187d439fc6bb6768aa012e3bd06/0 d79025ae72ceb544a8c17eb58f17f7ac33e2835d/0x3a 1428s git-debrebase = Pseudomerge {"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Type" => "Pseudomerge","Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "7a836f53fdcff187d439fc6bb6768aa012e3bd06"},"Msg" => "Declare incorporate NMU\n","Overwritten" => [{"CommitId" => "d79025ae72ceb544a8c17eb58f17f7ac33e2835d","Differs" => 58,"Ix" => 1}],"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"CommitId" => "932654abddf0eb7ebe550193fb0ba398ba364e49","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent 7a836f53fdcff187d439fc6bb6768aa012e3bd06\nparent d79025ae72ceb544a8c17eb58f17f7ac33e2835d\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1428s git-debrebase get_differs e1a29702bc09f17e805417c4625c85ff524a08ec f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x10 1428s git-debrebase classify 7a836f53fdcff187d439fc6bb6768aa012e3bd06 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p e1a29702bc09f17e805417c4625c85ff524a08ec/0x10 1428s git-debrebase = Changelog {"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Type" => "Changelog","Msg" => "Incorporate NMU\n","CommitId" => "7a836f53fdcff187d439fc6bb6768aa012e3bd06","Parents" => [{"CommitId" => "e1a29702bc09f17e805417c4625c85ff524a08ec","Differs" => 16,"Ix" => 0}],"Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent e1a29702bc09f17e805417c4625c85ff524a08ec\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1428s git-debrebase get_differs 74d5f586ed443ce47434f30fbbeff3eacb36748d 1d2249b1ed867c28303679a982049ff643d56028 = 0x2 1428s git-debrebase classify e1a29702bc09f17e805417c4625c85ff524a08ec $t=1d2249b1ed867c28303679a982049ff643d56028 @p 74d5f586ed443ce47434f30fbbeff3eacb36748d/0x2 1428s git-debrebase = Upstream {"Hdr" => "tree 1d2249b1ed867c28303679a982049ff643d56028\nparent 74d5f586ed443ce47434f30fbbeff3eacb36748d\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "e1a29702bc09f17e805417c4625c85ff524a08ec","Parents" => [{"CommitId" => "74d5f586ed443ce47434f30fbbeff3eacb36748d","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","Tree" => "1d2249b1ed867c28303679a982049ff643d56028","Type" => "Upstream"} 1428s git-debrebase get_differs 5b2d01d10ec62b3f25e6f7a22710468830e457fb 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0 1428s git-debrebase get_differs 964ce93fe0ce99ab711d1cb423537d236e0bbf20 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x8 1428s git-debrebase classify 74d5f586ed443ce47434f30fbbeff3eacb36748d $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p 5b2d01d10ec62b3f25e6f7a22710468830e457fb/0 964ce93fe0ce99ab711d1cb423537d236e0bbf20/0x8 1428s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb"},"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Overwritten" => [{"Ix" => 1,"CommitId" => "964ce93fe0ce99ab711d1cb423537d236e0bbf20","Differs" => 8}],"Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae","Type" => "Pseudomerge","Hdr" => "tree 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae\nparent 5b2d01d10ec62b3f25e6f7a22710468830e457fb\nparent 964ce93fe0ce99ab711d1cb423537d236e0bbf20\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "74d5f586ed443ce47434f30fbbeff3eacb36748d","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 1428s git-debrebase get_differs b3c76885171009da1ef20071776aa9044fae8502 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x2 1428s git-debrebase classify 5b2d01d10ec62b3f25e6f7a22710468830e457fb $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p b3c76885171009da1ef20071776aa9044fae8502/0x2 1428s git-debrebase = 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","Type" => "Upstream","Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1428s git-debrebase get_differs 8139d3db657e3270633db038d311934dab9b5fa2 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 = 0x2 1428s git-debrebase classify b3c76885171009da1ef20071776aa9044fae8502 $t=5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 @p 8139d3db657e3270633db038d311934dab9b5fa2/0x2 1428s git-debrebase = Upstream {"CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Parents" => [{"Ix" => 0,"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Differs" => 2}],"Hdr" => "tree 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14\nparent 8139d3db657e3270633db038d311934dab9b5fa2\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n"} 1428s git-debrebase get_differs f99dd01b94310ac6847d5bb66d530db52eceb9a7 1a9494a6c69d5574aa472ee96d6f641184e55cfa = 0x2 1428s git-debrebase classify 8139d3db657e3270633db038d311934dab9b5fa2 $t=1a9494a6c69d5574aa472ee96d6f641184e55cfa @p f99dd01b94310ac6847d5bb66d530db52eceb9a7/0x2 1428s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Ix" => 0}],"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Hdr" => "tree 1a9494a6c69d5574aa472ee96d6f641184e55cfa\nparent f99dd01b94310ac6847d5bb66d530db52eceb9a7\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "1a9494a6c69d5574aa472ee96d6f641184e55cfa","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1428s git-debrebase get_differs 505316fe392571a9180b6df0d54ec25ffb40c9c7 a71937789bee6e5711ddc7f7e212948a45fedf59 = 0x2 1428s git-debrebase classify f99dd01b94310ac6847d5bb66d530db52eceb9a7 $t=a71937789bee6e5711ddc7f7e212948a45fedf59 @p 505316fe392571a9180b6df0d54ec25ffb40c9c7/0x2 1428s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Differs" => 2}],"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Hdr" => "tree a71937789bee6e5711ddc7f7e212948a45fedf59\nparent 505316fe392571a9180b6df0d54ec25ffb40c9c7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "a71937789bee6e5711ddc7f7e212948a45fedf59","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1428s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 447f86ca9d4d65b8c1128528a4338c51733e127b = 0x2 1428s git-debrebase classify 505316fe392571a9180b6df0d54ec25ffb40c9c7 $t=447f86ca9d4d65b8c1128528a4338c51733e127b @p 274022edec808f75f2359551ecdc6de6b6390355/0x2 1428s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Differs" => 2}],"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Hdr" => "tree 447f86ca9d4d65b8c1128528a4338c51733e127b\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "447f86ca9d4d65b8c1128528a4338c51733e127b","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1428s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 1428s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 1428s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Ix" => 0}],"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1428s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 1428s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 1428s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a"}],"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n"} 1428s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 1428s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1428s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "894ca54a967167e2bb994b82357d084539559075","Msg" => "dch -v2.0-3 -m start 2.0-3\n","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1428s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1428s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1428s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog"} 1428s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1428s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1428s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5","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"} 1428s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1428s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1428s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1428s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1428s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 16 pm 1 1428s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1428s ' 1428s + local ocid otype oinfo 1428s + read ocid otype oinfo 1428s + case "$otype" in 1428s + test xContributor=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea '!=' xContributor=7a836f53fdcff187d439fc6bb6768aa012e3bd06 1428s ++ printf %s '8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49' 1428s ++ wc -w 1428s + local cnparents=2 1428s + test 2 = 2 1428s ++ for f in $parents 1428s ++ echo 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1428s ++ for f in $parents 1428s ++ echo 932654abddf0eb7ebe550193fb0ba398ba364e49 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s ++ wc -w 1428s + local cndparents=2 1428s + test 2 = 2 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea Upstream ===== 1428s + test 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea = 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1428s + local cetype=Upstream 1428s + '[' xUpstream = xUpstream ']' 1428s + cetype=SAME 1428s ++ git log -n1 --pretty=format:%P 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1428s + local parents=c59f39e5ca05d33181b7ea7f243a95d529283eb9 1428s + expect=c59f39e5ca05d33181b7ea7f243a95d529283eb9 1428s + enparents=1 1428s + : Upstream/SAME c59f39e5ca05d33181b7ea7f243a95d529283eb9 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s ++ printf %s c59f39e5ca05d33181b7ea7f243a95d529283eb9 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo c59f39e5ca05d33181b7ea7f243a95d529283eb9 1428s ++ wc -w 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== c59f39e5ca05d33181b7ea7f243a95d529283eb9 Upstream ===== 1428s + test c59f39e5ca05d33181b7ea7f243a95d529283eb9 = c59f39e5ca05d33181b7ea7f243a95d529283eb9 1428s + local cetype=Upstream 1428s + '[' xUpstream = xUpstream ']' 1428s + cetype=SAME 1428s ++ git log -n1 --pretty=format:%P c59f39e5ca05d33181b7ea7f243a95d529283eb9 1428s + local parents=4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1428s + expect=4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1428s + enparents=1 1428s + : Upstream/SAME 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s ++ printf %s 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s ++ wc -w 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 Upstream ===== 1428s + test 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 = 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1428s + local cetype=Upstream 1428s + '[' xUpstream = xUpstream ']' 1428s + cetype=SAME 1428s ++ git log -n1 --pretty=format:%P 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 1428s + local parents=fc2ef95aff332f63d93b2025328fafa4a47a6f72 1428s + expect=fc2ef95aff332f63d93b2025328fafa4a47a6f72 1428s + enparents=1 1428s + : Upstream/SAME fc2ef95aff332f63d93b2025328fafa4a47a6f72 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s ++ printf %s fc2ef95aff332f63d93b2025328fafa4a47a6f72 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo fc2ef95aff332f63d93b2025328fafa4a47a6f72 1428s ++ wc -w 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== fc2ef95aff332f63d93b2025328fafa4a47a6f72 Upstream ===== 1428s + test fc2ef95aff332f63d93b2025328fafa4a47a6f72 = fc2ef95aff332f63d93b2025328fafa4a47a6f72 1428s + local cetype=Upstream 1428s + '[' xUpstream = xUpstream ']' 1428s + cetype=SAME 1428s ++ git log -n1 --pretty=format:%P fc2ef95aff332f63d93b2025328fafa4a47a6f72 1428s + local parents=582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1428s + expect=582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1428s + enparents=1 1428s + : Upstream/SAME 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s ++ printf %s 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1428s ++ wc -w 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== 582e04de6ba12ec6c2a7957216152c3d4bb5b68f Upstream ===== 1428s + test 582e04de6ba12ec6c2a7957216152c3d4bb5b68f = 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1428s + local cetype=Upstream 1428s + '[' xUpstream = xUpstream ']' 1428s + cetype=SAME 1428s ++ git log -n1 --pretty=format:%P 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 1428s + local parents=4003fef7726798715307fd023578bd022f3c34a4 1428s + expect=4003fef7726798715307fd023578bd022f3c34a4 1428s + enparents=1 1428s + : Upstream/SAME 4003fef7726798715307fd023578bd022f3c34a4 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s ++ printf %s 4003fef7726798715307fd023578bd022f3c34a4 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo 4003fef7726798715307fd023578bd022f3c34a4 1428s ++ wc -w 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== 4003fef7726798715307fd023578bd022f3c34a4 Upstream ===== 1428s + test 4003fef7726798715307fd023578bd022f3c34a4 = 4003fef7726798715307fd023578bd022f3c34a4 1428s + local cetype=Upstream 1428s + '[' xUpstream = xUpstream ']' 1428s + cetype=SAME 1428s ++ git log -n1 --pretty=format:%P 4003fef7726798715307fd023578bd022f3c34a4 1428s + local parents=8269bff5f8f41256a597bb494347f4bd8fc81fba 1428s + expect=8269bff5f8f41256a597bb494347f4bd8fc81fba 1428s + enparents=1 1428s + : Upstream/SAME 8269bff5f8f41256a597bb494347f4bd8fc81fba 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s ++ printf %s 8269bff5f8f41256a597bb494347f4bd8fc81fba 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo 8269bff5f8f41256a597bb494347f4bd8fc81fba 1428s ++ wc -w 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== 8269bff5f8f41256a597bb494347f4bd8fc81fba Changelog ===== 1428s + test 8269bff5f8f41256a597bb494347f4bd8fc81fba = 8269bff5f8f41256a597bb494347f4bd8fc81fba 1428s + local cetype=Upstream 1428s + '[' xChangelog = xUpstream ']' 1428s ++ git log -n1 --pretty=format:%P 8269bff5f8f41256a597bb494347f4bd8fc81fba 1428s + local parents=274022edec808f75f2359551ecdc6de6b6390355 1428s + expect=274022edec808f75f2359551ecdc6de6b6390355 1428s + enparents=1 1428s + : Changelog/Upstream 274022edec808f75f2359551ecdc6de6b6390355 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + '[' x '!=' x ']' 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s + git diff --quiet 274022edec808f75f2359551ecdc6de6b6390355..8269bff5f8f41256a597bb494347f4bd8fc81fba -- :. ':!debian/changelog' 1428s + etypes=Packaging 1428s ++ printf %s 274022edec808f75f2359551ecdc6de6b6390355 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo 274022edec808f75f2359551ecdc6de6b6390355 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s ++ wc -w 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== 274022edec808f75f2359551ecdc6de6b6390355 Packaging ===== 1428s + test 274022edec808f75f2359551ecdc6de6b6390355 = 274022edec808f75f2359551ecdc6de6b6390355 1428s + local cetype=Packaging 1428s + '[' xPackaging = xPackaging ']' 1428s + cetype=SAME 1428s ++ git log -n1 --pretty=format:%P 274022edec808f75f2359551ecdc6de6b6390355 1428s + local parents=66623ad57ce32197ca515cfa520eaf7d7746889d 1428s + expect=66623ad57ce32197ca515cfa520eaf7d7746889d 1428s + enparents=1 1428s + : Packaging/SAME 66623ad57ce32197ca515cfa520eaf7d7746889d 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s + git diff --quiet 66623ad57ce32197ca515cfa520eaf7d7746889d..274022edec808f75f2359551ecdc6de6b6390355 -- :. ':!debian' 1428s + git diff --quiet 66623ad57ce32197ca515cfa520eaf7d7746889d..274022edec808f75f2359551ecdc6de6b6390355 -- :debian/patches 1428s + etypes=Packaging 1428s ++ printf %s 66623ad57ce32197ca515cfa520eaf7d7746889d 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo 66623ad57ce32197ca515cfa520eaf7d7746889d 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s ++ wc -w 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== 66623ad57ce32197ca515cfa520eaf7d7746889d Packaging ===== 1428s + test 66623ad57ce32197ca515cfa520eaf7d7746889d = 66623ad57ce32197ca515cfa520eaf7d7746889d 1428s + local cetype=Packaging 1428s + '[' xPackaging = xPackaging ']' 1428s + cetype=SAME 1428s ++ git log -n1 --pretty=format:%P 66623ad57ce32197ca515cfa520eaf7d7746889d 1428s + local parents=d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1428s + expect=d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1428s + enparents=1 1428s + : Packaging/SAME d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s + git diff --quiet d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a..66623ad57ce32197ca515cfa520eaf7d7746889d -- :. ':!debian' 1428s + git diff --quiet d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a..66623ad57ce32197ca515cfa520eaf7d7746889d -- :debian/patches 1428s + etypes=Packaging 1428s ++ printf %s d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1428s ++ wc -w 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a Changelog ===== 1428s + test d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a = d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1428s + local cetype=Packaging 1428s + '[' xChangelog = xPackaging ']' 1428s ++ git log -n1 --pretty=format:%P d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 1428s + local parents=32b1b8f0bdc575561b14de2ec9711d768a12d928 1428s + expect=32b1b8f0bdc575561b14de2ec9711d768a12d928 1428s + enparents=1 1428s + : Changelog/Packaging 32b1b8f0bdc575561b14de2ec9711d768a12d928 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s + git diff --quiet 32b1b8f0bdc575561b14de2ec9711d768a12d928..d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a -- :. ':!debian/changelog' 1428s + etypes=Packaging 1428s ++ printf %s 32b1b8f0bdc575561b14de2ec9711d768a12d928 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo 32b1b8f0bdc575561b14de2ec9711d768a12d928 1428s ++ wc -w 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== 32b1b8f0bdc575561b14de2ec9711d768a12d928 Changelog ===== 1428s + test 32b1b8f0bdc575561b14de2ec9711d768a12d928 = 32b1b8f0bdc575561b14de2ec9711d768a12d928 1428s + local cetype=Packaging 1428s + '[' xChangelog = xPackaging ']' 1428s ++ git log -n1 --pretty=format:%P 32b1b8f0bdc575561b14de2ec9711d768a12d928 1428s + local parents=9214201f528bae71f4647709e2357407746739d5 1428s + expect=9214201f528bae71f4647709e2357407746739d5 1428s + enparents=1 1428s + : Changelog/Packaging 9214201f528bae71f4647709e2357407746739d5 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s + git diff --quiet 9214201f528bae71f4647709e2357407746739d5..32b1b8f0bdc575561b14de2ec9711d768a12d928 -- :. ':!debian/changelog' 1428s + etypes=Packaging 1428s ++ printf %s 9214201f528bae71f4647709e2357407746739d5 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo 9214201f528bae71f4647709e2357407746739d5 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s ++ wc -w 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== 9214201f528bae71f4647709e2357407746739d5 Changelog ===== 1428s + test 9214201f528bae71f4647709e2357407746739d5 = 9214201f528bae71f4647709e2357407746739d5 1428s + local cetype=Packaging 1428s + '[' xChangelog = xPackaging ']' 1428s ++ git log -n1 --pretty=format:%P 9214201f528bae71f4647709e2357407746739d5 1428s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1428s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1428s + enparents=1 1428s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..9214201f528bae71f4647709e2357407746739d5 -- :. ':!debian/changelog' 1428s + etypes=Packaging 1428s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1428s ++ wc -w 1428s + local cnparents=1 1428s + test 1 = 1 1428s ++ for f in $parents 1428s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1428s ++ t-sort -u 1428s ++ LC_COLLATE=C 1428s ++ sort -u 1428s ++ wc -w 1428s + local cndparents=1 1428s + test 1 = 1 1428s + case "$parents" in 1428s + case "$ctype" in 1428s + read cid ctype info 1428s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1428s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1428s + local cetype=Packaging 1428s + '[' xAnchor = xPackaging ']' 1428s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1428s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1428s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1428s + enparents=1 1428s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1428s + case "$ctype/$cetype" in 1428s + case "$ctype/$etypes" in 1428s + case "$cetype" in 1428s + case "$ctype" in 1428s + break 1428s + t-nmu-reconciled-good patch-queue/nmu 1428s + local nmutree=patch-queue/nmu 1428s + : 'check that what we have is what is expected' 1428s + git checkout -b compare.nmu origin/master~0 1428s Switched to a new branch 'compare.nmu' 1428s + git checkout patch-queue/nmu . 1428s Updated 4 paths from 1aabced 1428s + git rm -rf debian/patches 1428s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 1428s rm 'debian/patches/0002-Edit-the-.c-file.patch' 1428s rm 'debian/patches/series' 1428s rm 'debian/patches/subdir/addnewups' 1428s rm 'debian/patches/upstream-nmu.patch' 1428s + git commit -m 'rm patches nmu' 1428s [compare.nmu 6caba01] rm patches nmu 1428s 6 files changed, 7 insertions(+), 50 deletions(-) 1428s delete mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1428s delete mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1428s delete mode 100644 debian/patches/series 1428s delete mode 100644 debian/patches/subdir/addnewups 1428s create mode 100644 newsrc.c 1428s + git checkout -b compare.maintainer origin/master~0 1428s Switched to a new branch 'compare.maintainer' 1428s + git checkout did.maintainer . 1428s Updated 3 paths from 27ebb24 1428s + git rm -rf --ignore-unmatch debian/patches 1428s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 1428s rm 'debian/patches/0002-Edit-the-.c-file.patch' 1428s rm 'debian/patches/series' 1428s rm 'debian/patches/subdir/addnewups' 1428s + git commit --allow-empty -m 'rm patches maintainer' 1428s [compare.maintainer c88a69a] rm patches maintainer 1428s 7 files changed, 10 insertions(+), 50 deletions(-) 1428s delete mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1428s delete mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1428s delete mode 100644 debian/patches/series 1428s delete mode 100644 debian/patches/subdir/addnewups 1428s create mode 100644 debian/zorkmid 1428s + git merge compare.nmu 1428s Auto-merging debian/changelog 1428s Merge made by the 'ort' strategy. 1428s debian/changelog | 6 ++++++ 1428s newsrc.c | 1 + 1428s 2 files changed, 7 insertions(+) 1428s create mode 100644 newsrc.c 1428s + git diff --quiet master 1428s + : 'check that dgit still likes it' 1428s + git checkout master 1428s Switched to branch 'master' 1428s Your branch is ahead of 'origin/master' by 34 commits. 1428s (use "git push" to publish your local commits) 1428s + t-dgit -wgf quilt-fixup 1428s + local dgit=dgit 1428s + pwd 1428s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1428s + : ' 1428s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1428s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf quilt-fixup 1429s | git rev-parse --show-toplevel 1429s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1429s | git config -z --get-regexp --local '.*' 1429s | git config -z --get-regexp --local '.*' 1429s | git config -z --get-regexp --global '.*' 1429s | git config -z --get-regexp --system '.*' 1429s format 3.0 (quilt), quilt mode linear 1429s Format `3.0 (quilt)', need to check/update patch stack 1429s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1429s => `' 1429s + git diff --quiet HEAD 1429s + git clean -xdff 1429s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1429s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1429s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1429s | git rev-parse 'HEAD~0' 1429s => `7deba4224559390e54e9ff106aa4430e0cfdb7f5' 1429s | git symbolic-ref -q HEAD 1429s => `refs/heads/master' 1429s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1429s CD work 1429s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1429s + git reset -q --hard 7deba4224559390e54e9ff106aa4430e0cfdb7f5 1429s examining quilt state (multiple patches, linear mode) 1429s branch_is_gdr 7deba4224559390e54e9ff106aa4430e0cfdb7f5... 1429s branch_is_gdr 7deba4224559390e54e9ff106aa4430e0cfdb7f5 gdr pseudomerge YES 1429s + git reset -q --hard 7deba4224559390e54e9ff106aa4430e0cfdb7f5 1429s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1429s HEAD is now at 091cf23 Commit patch queue (exported by git-debrebase) 1429s | git rev-parse 'HEAD~0' 1429s => `091cf23aab21aa2a8354372e5d3a8ac55110b6cf' 1429s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1429s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1429s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1429s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1429s CD fake 1429s | find -name .git -prune -print0 1429s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1429s + git checkout -f 091cf23aab21aa2a8354372e5d3a8ac55110b6cf -- debian 1429s + git add -Af . 1429s | git write-tree 1429s => `0b28429abd365b6b1dc4894b505211f99ac804dc' 1429s fake orig tree object 0b28429abd365b6b1dc4894b505211f99ac804dc 1430s CD .. 1430s + git reset -q --hard 091cf23aab21aa2a8354372e5d3a8ac55110b6cf 1430s CD ../fake 1430s + git add -Af . 1430s | git write-tree 1430s => `bf3cc2d56f9816f228473395e6195b49676a47f4' 1430s fake o+d/p tree object 0b28429abd365b6b1dc4894b505211f99ac804dc 1430s CD ../work 1430s | git ls-tree --name-only -z 091cf23aab21aa2a8354372e5d3a8ac55110b6cf 1430s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 1430s | git diff-tree -z --no-renames -r 0b28429abd365b6b1dc4894b505211f99ac804dc 091cf23aab21aa2a8354372e5d3a8ac55110b6cf 1430s => `: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' 1430s quiltify_trees_differ 0b28429abd365b6b1dc4894b505211f99ac804dc 091cf23aab21aa2a8354372e5d3a8ac55110b6cf => 1 1430s | git diff-tree -z --no-renames --name-only -r 091cf23aab21aa2a8354372e5d3a8ac55110b6cf bf3cc2d56f9816f228473395e6195b49676a47f4 1430s => `' 1430s quiltify_trees_differ 091cf23aab21aa2a8354372e5d3a8ac55110b6cf bf3cc2d56f9816f228473395e6195b49676a47f4 => 0 1430s | git diff-tree -z --no-renames --name-only -r 0b28429abd365b6b1dc4894b505211f99ac804dc bf3cc2d56f9816f228473395e6195b49676a47f4 1430s => `lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 1430s quiltify_trees_differ 0b28429abd365b6b1dc4894b505211f99ac804dc bf3cc2d56f9816f228473395e6195b49676a47f4 => 1 1430s differences @dl ## ## == == == ==. 1430s dgit: base trees orig=0b28429abd365b6b1dc4 o+d/p=bf3cc2d56f9816f22847 1430s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1430s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1430s starting quiltify (multiple patches, linear mode) 1430s | git ls-tree --name-only 091cf23aab21aa2a8354372e5d3a8ac55110b6cf -- debian/rules debian/control 1430s => `debian/control'... 1430s quiltify investigate 091cf23aab21aa2a8354372e5d3a8ac55110b6cf 1430s | git diff-tree -z --no-renames --name-only 091cf23aab21aa2a8354372e5d3a8ac55110b6cf bf3cc2d56f9816f228473395e6195b49676a47f4 1430s => `' 1430s quiltify_trees_differ 091cf23aab21aa2a8354372e5d3a8ac55110b6cf bf3cc2d56f9816f228473395e6195b49676a47f4 => 0 1430s search finished hooray! 1430s quiltify linearisation planning successful, executing... 1430s + git checkout -q master 1430s | git status --ignored --porcelain 1430s => `?? .pc/' 1430s nothing quilty to commit, ok. 1430s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1430s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1430s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1430s ' 1430s + t-ok 1430s + : ======================================== 1430s + t-check-only-bpd 1430s + '[' .. = .. ']' 1430s + return 1430s + t-fscks 1430s + shopt -s nullglob 1430s + for d in $tmp/*/.git $tmp/git/*.git 1430s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1430s + t-git-fsck 1430s ++ git rev-parse --git-dir 1430s + local fsckerrs=.git/dgit-test-fsck.errs 1430s + set +e 1430s + LC_MESSAGES=C 1430s + git fsck --no-dangling --strict 1430s + tee .git/dgit-test-fsck.errs 1430s + ps='0 0' 1430s + set -e 1430s + local pats 1430s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1430s + test '0 0' = '0 0' 1430s + pats+=(-e 'notice: HEAD points to an unborn branch') 1430s + pats+=(-e 'notice: No default references') 1430s + set +e 1430s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1430s + rc=1 1430s + set -e 1430s + case $rc in 1430s + for d in $tmp/*/.git $tmp/git/*.git 1430s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1430s + t-git-fsck 1430s ++ git rev-parse --git-dir 1430s + local fsckerrs=./dgit-test-fsck.errs 1430s + set +e 1430s + LC_MESSAGES=C 1430s + git fsck --no-dangling --strict 1430s + tee ./dgit-test-fsck.errs 1430s notice: HEAD points to an unborn branch (master) 1430s + ps='0 0' 1430s + set -e 1430s + local pats 1430s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1430s + test '0 0' = '0 0' 1430s + pats+=(-e 'notice: HEAD points to an unborn branch') 1430s + pats+=(-e 'notice: No default references') 1430s + set +e 1430s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1430s + rc=1 1430s + set -e 1430s + case $rc in 1430s + t-save-artifacts 1430s + artifacts=/tmp/autopkgtest.XK8uun/gdr-diverge-nmu-artifacts 1430s + '[' x/tmp/autopkgtest.XK8uun/gdr-diverge-nmu-artifacts = x ']' 1430s + '[' xtmp = x ']' 1430s + GZIP=-1v 1430s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-diverge-nmu-artifacts/gdr-diverge-nmu.tar.gz '--exclude=*.tar' . 1430s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1430s 80.8% 1430s + echo ok. 1430s ok. 1430s + rc=0 1430s + set +x 1430s + set +e 1430s + pwd 1430s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1430s + '[' x '!=' x ']' 1430s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1430s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1430s + set -e 1430s + test 0 = 0 1430s autopkgtest [23:11:00]: test gdr-diverge-nmu: -----------------------] 1431s gdr-diverge-nmu PASS 1431s autopkgtest [23:11:01]: test gdr-diverge-nmu: - - - - - - - - - - results - - - - - - - - - - 1431s autopkgtest [23:11:01]: test gdr-diverge-nmu-dgit: preparing testbed 1431s Reading package lists... 1432s Building dependency tree... 1432s Reading state information... 1432s Starting pkgProblemResolver with broken count: 0 1432s Starting 2 pkgProblemResolver with broken count: 0 1432s Done 1432s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1433s autopkgtest [23:11:03]: test gdr-diverge-nmu-dgit: [----------------------- 1433s ++ set -o pipefail 1433s ++ . tests/lib-core 1433s ++ . tests/lib-restricts 1433s ++ trap ' 1433s rc=$? 1433s set +x 1433s test $rc = 0 || echo " 1433s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1433s 1433s Most relevant logs are just before assignment rc=$rc 1433s Will now do cleanup etc. 1433s " 1433s set -x 1433s set +e 1433s pwd 1433s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1433s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1433s set -e 1433s test $rc = 0 || t-report-failure 1433s ' EXIT 1433s ++ t-filter-out-git-hyphen-dir 1433s ++ local pathent 1433s +++ type -p git-rev-parse 1433s +++ : 1433s ++ pathent= 1433s ++ case "$pathent" in 1433s ++ return 1433s ++ t-set-intree 1433s ++ '[' x = x ']' 1433s ++ return 1433s ++ : -D 1433s ++ export DGIT_TEST_DEBUG 1433s ++ : x 1433s ++ export DGIT_TEST_DEBPUSH_DEBUG 1433s ++ : 1433s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1433s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1433s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1433s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1433s ++ export LC_CTYPE=C.UTF-8 1433s ++ LC_CTYPE=C.UTF-8 1433s ++ unset CDPATH 1433s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1433s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1433s +++ pwd 1433s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1433s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1433s ++ testname=gdr-diverge-nmu-dgit 1433s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1433s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1433s ++ bpd=.. 1433s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1433s ++ '[' x '!=' x ']' 1433s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s +++ pwd 1433s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ t-set-using-tmp 1433s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1433s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1433s ++ export 'DEBFULLNAME=dgit test git user' 1433s ++ DEBFULLNAME='dgit test git user' 1433s ++ git config --global user.email dgit-test@debian.example.net 1433s ++ git config --global user.name 'dgit test git user' 1433s ++ git config --global protocol.ext.allow always 1433s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1433s ++ env -0 1433s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1433s ++ export DEBCHANGE_VENDOR=dpkg 1433s ++ DEBCHANGE_VENDOR=dpkg 1433s ++ unset VISUAL 1433s ++ unset GIT_EDITOR 1433s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1433s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1433s ++ cat 1433s ++ schroot=build 1433s ++ : aq 1433s ++ : archive/test-dummy 1433s ++ : sid:unstable 1433s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1433s ++ git config --global dgit.default.old-dsc-distro test-dummy 1433s ++ for import in ${autoimport-gnupg} 1433s ++ case "$0" in 1433s ++ t-setup-import gnupg 1433s ++ local setupname=gnupg 1433s ++ local setupsrc 1433s ++ local lock 1433s ++ '[' x = x ']' 1433s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1433s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1433s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1433s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1433s cd "$1"; shift 1433s setupname="$1"; shift 1433s simport="$1"; shift 1433s if [ -e "$simport" ]; then exit 0; fi 1433s env - "$@" \ 1433s "tests/setup/$setupname" 1433s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1433s + cd /tmp/autopkgtest.XK8uun/build.980/src 1433s + shift 1433s + setupname=gnupg 1433s + shift 1433s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1433s + shift 1433s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1433s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-diverge-nmu-dgit-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-diverge-nmu-dgit-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-diverge-nmu-dgit-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-diverge-nmu-dgit -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-diverge-nmu-dgit' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-diverge-nmu-dgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1433s ++ set -o pipefail 1433s ++ . tests/lib-core 1433s ++ . tests/lib-restricts 1433s ++ trap ' 1433s rc=$? 1433s set +x 1433s test $rc = 0 || echo " 1433s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1433s 1433s Most relevant logs are just before assignment rc=$rc 1433s Will now do cleanup etc. 1433s " 1433s set -x 1433s set +e 1433s pwd 1433s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1433s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1433s set -e 1433s test $rc = 0 || t-report-failure 1433s ' EXIT 1433s ++ t-filter-out-git-hyphen-dir 1433s ++ local pathent 1433s +++ type -p git-rev-parse 1433s +++ : 1433s ++ pathent= 1433s ++ case "$pathent" in 1433s ++ return 1433s ++ t-set-intree 1433s ++ '[' x = x ']' 1433s ++ return 1433s ++ : -D 1433s ++ export DGIT_TEST_DEBUG 1433s ++ : x 1433s ++ export DGIT_TEST_DEBPUSH_DEBUG 1433s ++ : 1433s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1433s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1433s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1433s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1433s ++ export LC_CTYPE=C.UTF-8 1433s ++ LC_CTYPE=C.UTF-8 1433s ++ unset CDPATH 1433s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1433s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1433s +++ pwd 1433s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1433s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1433s ++ testname=gnupg 1433s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1433s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1433s ++ bpd=.. 1433s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1433s ++ '[' x '!=' x ']' 1433s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s +++ pwd 1433s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ t-set-using-tmp 1433s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1433s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1433s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1433s ++ export 'DEBFULLNAME=dgit test git user' 1433s ++ DEBFULLNAME='dgit test git user' 1433s ++ git config --global user.email dgit-test@debian.example.net 1433s ++ git config --global user.name 'dgit test git user' 1433s ++ git config --global protocol.ext.allow always 1433s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1433s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1433s ++ export DEBCHANGE_VENDOR=dpkg 1433s ++ DEBCHANGE_VENDOR=dpkg 1433s ++ unset VISUAL 1433s ++ unset GIT_EDITOR 1433s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1433s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1433s ++ cat 1433s ++ schroot=build 1433s ++ : aq 1433s ++ : archive/test-dummy 1433s ++ : sid:unstable 1433s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1433s ++ git config --global dgit.default.old-dsc-distro test-dummy 1433s ++ for import in ${autoimport-gnupg} 1433s ++ case "$0" in 1433s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1433s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1433s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1433s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1433s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1433s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1433s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1433s + setup=' 1433s export GNUPGHOME=$tmp/gnupg 1433s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1433s 1433s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1434s ssb rsa2048 2013-11-17 [E] 1434s 1434s sec rsa2048 2014-01-26 [SC] 1434s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1434s uid [ultimate] Populus Romanus (test key) 1434s ssb rsa2048 2014-01-26 [E] 1434s 1434s sec rsa2048 2014-01-26 [SC] 1434s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1434s uid [ unknown] Hannibal (test key) 1434s ssb rsa2048 2014-01-26 [E] 1434s 1434s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1434s export GNUPGHOME=$tmp/gnupg 1434s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1434s 1434s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 1434s delete mode 100644 debian/source/format 1434s + git tag v1.0 1434s + : 'fake up that our quilt-tip was descended from upstream' 1434s + git checkout quilt-tip 1434s Switched to branch 'quilt-tip' 1434s + git merge --no-edit -s ours upstream 1434s Merge made by the 'ours' strategy. 1434s + : 'fake up that our quilt-tip had the patch queue in it' 1434s + git checkout patch-queue/quilt-tip 1434s Switched to branch 'patch-queue/quilt-tip' 1434s + gbp pq export 1434s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1434s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1434s + git add debian/patches 1434s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 1434s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 1434s 4 files changed, 50 insertions(+) 1434s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1434s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1434s create mode 100644 debian/patches/series 1434s create mode 100644 debian/patches/subdir/addnewups 1434s + : 'make branch names more conventional' 1434s + git branch -D master 1434s Deleted branch master (was 17d67db). 1434s + git branch -m quilt-tip master 1434s + not-gdr-processable origin 1434s + git branch gdr-unprocessable/origin 1434s + t-git-debrebase analyse 1434s + local gdr=git-debrebase 1434s + grep 'Unknown Unprocessable' 1434s + : ' 1434s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1434s + git-debrebase --dgit=dgit -D analyse 1434s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 1434s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1434s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1434s git-debrebase = AddPatches {"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "AddPatches","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445"} 1434s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1434s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1434s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1434s git-debrebase = Pseudomerge {"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},{"Ix" => 1,"Differs" => 48,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Contributor" => $VAR1->{"Parents"}[0],"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"} 1434s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1434s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1434s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n"} 1434s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1434s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1434s git-debrebase = Mixed {"Type" => "Mixed","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Parents" => [{"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50}],"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n"} 1434s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1434s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1434s git-debrebase = Packaging {"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Type" => "Packaging","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Msg" => "echo EXAMPLE RULES TARGET\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}],"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"} 1434s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1434s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1434s git-debrebase = Packaging {"Msg" => "WIP\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Type" => "Packaging","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 1434s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1434s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1434s git-debrebase = Packaging {"Type" => "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"} 1434s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1434s git-debrebase ** Unknown 1434s git-debrebase *** WALK BOMB unrecognised 1434s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1434s ' 1434s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1434s + : 'fake up an upstream 2.0' 1434s + git branch make-upstream upstream 1434s + t-make-new-upstream-tarball 2.0 1434s + local uv=2.0 1434s + git checkout make-upstream 1434s Switched to branch 'make-upstream' 1434s + echo 'upstream 2.0' 1434s + git commit -a -m 'upstream 2.0 tarball' 1434s [make-upstream 4db56a8] upstream 2.0 tarball 1434s 1 file changed, 1 insertion(+) 1434s + t-make-orig example 2.0 make-upstream 1434s + local p=example 1434s + local v=2.0 1434s + local tag=make-upstream 1434s + ust=example_2.0.orig.tar.gz 1434s + GZIP=-1 1434s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1434s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1434s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1434s + git branch -D quilt-tip-2 1434s Deleted branch quilt-tip-2 (was 99fcab4). 1434s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1434s + git branch -D gitish-only 1434s Deleted branch gitish-only (was 2b2ddc8). 1434s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1434s + git branch -D quilt-tip-1.1 1434s Deleted branch quilt-tip-1.1 (was 7fc34be). 1434s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1434s + git branch -D patch-queue/quilt-tip 1434s Deleted branch patch-queue/quilt-tip (was d843a68). 1434s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1434s + git branch -D indep-arch 1434s Deleted branch indep-arch (was e215729). 1434s + : 'see what gbp import-orig does' 1434s + git checkout master 1434s Switched to branch 'master' 1434s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1434s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1434s gbp:info: Source package is example 1434s gbp:info: Upstream version is 2.0 1434s gbp:info: Replacing upstream source on 'master' 1434s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1434s + not-gdr-processable merge 1434s + git branch gdr-unprocessable/merge 1434s + t-git-debrebase analyse 1434s + grep 'Unknown Unprocessable' 1434s + local gdr=git-debrebase 1434s + : ' 1434s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1434s + git-debrebase --dgit=dgit -D analyse 1434s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 1434s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1434s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1434s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1434s git-debrebase ** Unknown 1434s git-debrebase *** WALK BOMB unrecognised 1434s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1434s ' 1434s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 1434s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1434s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1434s + DEBEMAIL=dgit-tests@example.org 1434s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1434s + 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) 1435s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1435s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1435s 1 file changed, 6 insertions(+) 1435s + t-dch-commit-r 1435s + t-dch-r-rune t-dch-commit 1435s + local cmd=t-dch-commit 1435s + shift 1435s + local suite=unstable 1435s + t-dch-commit -r -D unstable '' 1435s + t-debchange -r -D unstable '' 1435s + DEBEMAIL=dgit-tests@example.org 1435s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1435s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1435s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1435s libdistro-info-perl is not installed, Debian release names are not known. 1435s libdistro-info-perl is not installed, Ubuntu release names are not known. 1435s + git commit -m 'dch -r -D unstable ' debian/changelog 1435s [master f31021f] dch -r -D unstable 1435s 1 file changed, 3 insertions(+), 2 deletions(-) 1435s + echo garbage 1435s + git add debian/patches/garbage 1435s + git commit -m 'add garbage' debian/patches/garbage 1435s [master eb10718] add garbage 1435s 1 file changed, 1 insertion(+) 1435s create mode 100644 debian/patches/garbage 1435s + t-archive-none example 1435s + t-select-package example 1435s + p=example 1435s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1435s + t-archive-none-aq 1435s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 1435s + : 1435s + local 'jsondelim=[' 1435s + local suitespec 1435s + for suitespec in $suitespecs 1435s + local suite=sid 1435s + local sname=unstable 1435s + t-aq-archive-updated sid example 1435s + local suite=sid 1435s + local p=example 1435s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1435s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1435s + perl -wne ' 1435s use JSON; 1435s use strict; 1435s our @v; 1435s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1435s push @v, { 1435s "version" => "$1", 1435s "sha256sum" => "$2", 1435s "component" => "$3", 1435s "filename" => "$4", 1435s }; 1435s END { 1435s my $json = JSON->new->canonical(); 1435s print $json->encode(\@v) or die $!; 1435s } 1435s ' 1435s + t-aq-archive-updated new example 1435s + local suite=new 1435s + local p=example 1435s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1435s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1435s + perl -wne ' 1435s use JSON; 1435s use strict; 1435s our @v; 1435s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1435s push @v, { 1435s "version" => "$1", 1435s "sha256sum" => "$2", 1435s "component" => "$3", 1435s "filename" => "$4", 1435s }; 1435s END { 1435s my $json = JSON->new->canonical(); 1435s print $json->encode(\@v) or die $!; 1435s } 1435s ' 1435s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1435s + cat 1435s + jsondelim=' },' 1435s + cat 1435s + t-git-none 1435s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1435s + set -e 1435s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1435s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1435s + t-dgit -wgf --gbp push-source --new 1435s + local dgit=dgit 1435s + pwd 1435s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1435s + : ' 1435s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1435s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 1435s | git rev-parse --show-toplevel 1435s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1435s | git config -z --get-regexp --local '.*' 1435s | git config -z --get-regexp --local '.*' 1435s | git config -z --get-regexp --global '.*' 1435s | git config -z --get-regexp --system '.*' 1435s format 3.0 (quilt), quilt mode gbp 1435s Format `3.0 (quilt)', need to check/update patch stack 1435s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1435s => `' 1435s + git diff --quiet HEAD 1435s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1435s canonical suite name for unstable is sid 1435s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1435s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1435s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1435s | git rev-parse 'HEAD~0' 1435s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1435s | git symbolic-ref -q HEAD 1435s => `refs/heads/master' 1435s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1435s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1435s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1435s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1435s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1435s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 7941dfb5429575e71b1a56467b9a9735926f65cdad2116ab64ec1b1e7aa173a5 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1435s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1435s >(no reflog) 1435s splitbrain cache miss 1435s CD work 1435s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1435s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1435s + git checkout -q -b dgit-view 1435s examining quilt state (multiple patches, gbp mode) 1435s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1435s CD fake 1435s | find -name .git -prune -print0 1435s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1435s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 1435s + git add -Af . 1435s | git write-tree 1435s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 1435s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1435s CD .. 1435s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1435s CD ../fake 1435s + git add -Af . 1435s | git write-tree 1435s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1435s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1435s CD ../work 1435s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 1435s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 1435s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 1435s => `' 1435s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 1435s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 1435s => `lib.c\x00new-upstream-file\x00src.c\x00' 1435s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1435s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 1435s => `lib.c\x00new-upstream-file\x00src.c\x00' 1435s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1435s differences @dl == ## ## == == ==. 1435s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 1435s dgit: quilt differences: src: == orig ## gitignores: == orig == 1435s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1435s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1435s => `1530000000 +0000' 1435s dgit view: creating patches-applied version using gbp pq 1435s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 1436s + git update-ref refs/heads/dgit-view HEAD 1436s + git checkout -q dgit-view 1436s | git rev-parse 'HEAD~0' 1436s => `45ea71a69fa522ce760afdab8a420200443753e9' 1436s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1436s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 1436s => `' 1436s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 7941dfb5429575e71b1a56467b9a9735926f65cdad2116ab64ec1b1e7aa173a5 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 1436s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 1436s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1436s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1436s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1436s | git rev-parse 'HEAD~0' 1436s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1436s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1436s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1436s dpkg-source: info: using source format '3.0 (quilt)' 1436s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1436s dpkg-source: info: using patch list from debian/patches/series 1436s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 1436s dpkg-source: info: building example in example_2.0-1.dsc 1436s CD work 1436s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1436s package seems new, not specifying -v 1436s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 1436s dpkg-genchanges: info: not including original source code in upload 1436s CD .. 1436s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1436s renaming (Files) example_2.0.orig.tar.gz 1436s renaming (Files) example_2.0-1.debian.tar.xz 1436s renaming (dsc) example_2.0-1.dsc 1436s renaming (changes) example_2.0-1_source.changes 1436s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1436s actually entering push 1436s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1436s => `0' 1436s + git config remote.dgit.skipdefaultupdate true 1436s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1436s get_archive_dsc: nothing in archive, returning undef 1436s no version available from the archive 1436s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1436s => `' 1436s previous reference hash= 1436s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1436s => `' 1436s fetch_from_archive: lastfetch= 1436s nothing found! 1436s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1436s + git check-ref-format archive/test-dummy/2.0-1 1436s | git symbolic-ref -q HEAD 1436s => `refs/heads/master' 1436s | git rev-parse 'HEAD~0' 1436s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1436s ffq_prev_branchinfo branch current refs/heads/master 1436s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1436s => `' 1436s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1436s => `' 1436s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1436s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1436s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1436s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1436s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1436s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 7941dfb5429575e71b1a56467b9a9735926f65cdad2116ab64ec1b1e7aa173a5 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1436s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1436s CD work 1436s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1436s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1436s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1436s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 1436s splitbrain_pseudomerge... 1436s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1436s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1436s => `' 1436s + git diff --quiet HEAD 1436s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 1436s => `' 1436s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1436s checking that example_2.0-1.dsc corresponds to HEAD 1436s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc 1436s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc) 1436s dpkg-source: info: extracting example in example-2.0 1436s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1436s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 1436s dpkg-source: info: using patch list from debian/patches/series 1436s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1436s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1436s dpkg-source: info: applying subdir/addnewups 1436s CD example-2.0 1436s | find -name .git -prune -print0 1436s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1436s + git add -Af . 1436s | git write-tree 1436s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1436s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1436s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1436s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1436s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1436s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 1436s files_compare_inputs example_2.0-1.dsc 1436s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 1436s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1436s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 1436s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 1436s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1436s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 1436s files_compare_inputs example_2.0-1.dsc Files 1436s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 1436s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 1436s files_compare_inputs example_2.0-1_source.changes 1436s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 1436s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 1436s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 1436s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 1436s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 1436s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 1436s files_compare_inputs example_2.0-1_source.changes Files 1436s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 1436s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 1436s checking origs needed (2.0)... 1436s checking origs needed placement 'devel extra'... 1436s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1436s origs example_2.0.orig.tar.gz is_orig 1436s -| sh -ec 'cd "$1"; shift 1436s 1436s find -name "$1" -print0 | 1436s xargs -0r sha256sum 1436s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1436s origs example_2.0.orig.tar.gz $#$have=-1 1436s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1436s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 1436s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1436s push_tagwants: $VAR1 = [ 1436s '2.0-1', 1436s '45ea71a69fa522ce760afdab8a420200443753e9', 1436s 'eb10718ab213ccfa83613ebbddefbffda941a548', 1436s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1436s ]; 1436s $VAR2 = [ 1436s { 1436s 'Tfn' => sub { "DUMMY" }, 1436s 'TfSuffix' => '', 1436s 'View' => 'dgit', 1436s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1436s 'TagFn' => sub { "DUMMY" }, 1436s 'Tag' => 'archive/test-dummy/2.0-1' 1436s }, 1436s { 1436s 'Tfn' => sub { "DUMMY" }, 1436s 'Tag' => 'test-dummy/2.0-1', 1436s 'TagFn' => sub { "DUMMY" }, 1436s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 1436s 'View' => 'maint', 1436s 'TfSuffix' => '-maintview' 1436s } 1436s ]; 1436s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1436s => `1530000000 +0000' 1436s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1436s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1436s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1436s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 1436s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1436s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 1436s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1436s => `c7fbdf01d5593245424491530f0b2ea0a11f4209' 1436s + git verify-tag c7fbdf01d5593245424491530f0b2ea0a11f4209 1436s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1436s gpg: Signature made Mon Mar 31 23:11:06 2025 UTC 1436s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1436s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1436s gpg: WARNING: This key is not certified with a trusted signature! 1436s gpg: There is no indication that the signature belongs to the owner. 1436s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1436s + git update-ref refs/tags/archive/test-dummy/2.0-1 c7fbdf01d5593245424491530f0b2ea0a11f4209 1436s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 1436s => `449e30781112d560bc7b97962e396c421e5fc32f' 1436s + git verify-tag 449e30781112d560bc7b97962e396c421e5fc32f 1437s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1437s gpg: Signature made Mon Mar 31 23:11:06 2025 UTC 1437s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1437s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1437s gpg: WARNING: This key is not certified with a trusted signature! 1437s gpg: There is no indication that the signature belongs to the owner. 1437s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1437s + git update-ref refs/tags/test-dummy/2.0-1 449e30781112d560bc7b97962e396c421e5fc32f 1437s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1437s => `0' 1437s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 1437s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 1437s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1437s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 1437s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 1437s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 1437s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 1437s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 1437s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1437s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1437s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1437s 1437s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 1437s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1437s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1437s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1437s 1437s Successfully signed dsc, changes files 1437s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 1437s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1437s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1437s D: Setting host argument. 1437s Checking signature on .changes 1437s Checking signature on .dsc 1437s Uploading to test-dummy (via local to localhost): 1437s Successfully uploaded packages. 1437s dgit ok: pushed and uploaded 2.0-1 1437s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1437s del_lrfetchrefs... 1437s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1437s ' 1437s + t-salsa-add-remote 1437s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1437s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1437s + set -e 1437s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1437s + git init --bare 1437s hint: Using 'master' as the name for the initial branch. This default branch name 1437s hint: is subject to change. To configure the initial branch name to use in all 1437s hint: of your new repositories, which will suppress this warning, call: 1437s hint: 1437s hint: git config --global init.defaultBranch 1437s hint: 1437s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1437s hint: 'development'. The just-created branch can be renamed via this command: 1437s hint: 1437s hint: git branch -m 1437s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example/ 1437s + git remote add origin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1437s + git push --set-upstream origin master 1437s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1437s * [new branch] master -> master 1437s Branch 'master' set up to track remote branch 'master' from 'origin'. 1437s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1437s + local 'mpat=E:identical in upstream files' 1437s + shift 1437s + set +o pipefail 1437s + LC_MESSAGES=C 1437s + LANGUAGE=C 1437s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1437s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1437s + local gdr=git-debrebase 1437s + : ' 1437s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1437s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1437s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1437s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 1437s docs/README | 1 + 1437s 1 file changed, 1 insertion(+) 1437s 1437s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1437s git-debrebase: identical in upstream files. See diffstat above, or run 1437s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 1437s + local 'ps=255 0' 1437s + set -o pipefail 1437s + case $ps in 1437s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1437s + local 'mpat=E:identical in upstream files' 1437s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1437s + local grepper=fgrep 1437s + case "$mpat" in 1437s + case "$mpat" in 1437s + grepper=egrep 1437s + mpat='identical in upstream files' 1437s + egrep -e 'identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1437s git-debrebase: identical in upstream files. See diffstat above, or run 1437s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1437s + local 'mpat=E:Unused patch file garbage will be discarded' 1437s + shift 1437s + set +o pipefail 1437s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1437s + LC_MESSAGES=C 1437s + LANGUAGE=C 1437s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1437s + local gdr=git-debrebase 1437s + : ' 1437s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1437s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1438s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1438s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1438s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1438s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1438s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1438s $VAR2 = bless( do{\(my $o = { 1438s 'name' => 'debian/changelog, entry no.1', 1438s 'keep_duplicate' => 0, 1438s 'is_pgp_signed' => 0, 1438s 'in_order' => [ 1438s 'Source', 1438s 'Version', 1438s 'Distribution', 1438s 'Urgency', 1438s 'Maintainer', 1438s 'Timestamp', 1438s 'Date', 1438s 'Changes' 1438s ], 1438s 'drop_empty' => 0, 1438s 'out_order' => [], 1438s 'allow_duplicate' => 0, 1438s 'fields' => { 1438s 'Source' => 'example', 1438s 'Version' => '2.0-1', 1438s 'Distribution' => 'unstable', 1438s 'Urgency' => 'medium', 1438s 'Maintainer' => 'dgit test git user ', 1438s 'Timestamp' => '1530000000', 1438s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1438s 'Changes' => ' 1438s example (2.0-1) unstable; urgency=medium 1438s 1438s [ Ian Jackson ] 1438s * new upstream (did gbp import-orig)' 1438s }, 1438s 'allow_pgp' => 1 1438s })}, 'Dpkg::Control::Hash' ); 1438s last finished-looking changelog entry: (2.0-1) unstable 1438s will stitch in dgit view, archive/test-dummy/2.0-1 1438s git-debrebase: snags: 1 overriden by individual -f options 1438s 1438s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1438s + local 'ps=255 0' 1438s + set -o pipefail 1438s + case $ps in 1438s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1438s + local 'mpat=E:Unused patch file garbage will be discarded' 1438s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1438s + local grepper=fgrep 1438s + case "$mpat" in 1438s + case "$mpat" in 1438s + grepper=egrep 1438s + mpat='Unused patch file garbage will be discarded' 1438s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1438s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1438s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1438s + local gdr=git-debrebase 1438s + : ' 1438s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1438s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1438s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1438s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1438s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1438s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1438s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1438s $VAR2 = bless( do{\(my $o = { 1438s 'allow_duplicate' => 0, 1438s 'allow_pgp' => 1, 1438s 'fields' => { 1438s 'Source' => 'example', 1438s 'Version' => '2.0-1', 1438s 'Distribution' => 'unstable', 1438s 'Urgency' => 'medium', 1438s 'Maintainer' => 'dgit test git user ', 1438s 'Timestamp' => '1530000000', 1438s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1438s 'Changes' => ' 1438s example (2.0-1) unstable; urgency=medium 1438s 1438s [ Ian Jackson ] 1438s * new upstream (did gbp import-orig)' 1438s }, 1438s 'is_pgp_signed' => 0, 1438s 'in_order' => [ 1438s 'Source', 1438s 'Version', 1438s 'Distribution', 1438s 'Urgency', 1438s 'Maintainer', 1438s 'Timestamp', 1438s 'Date', 1438s 'Changes' 1438s ], 1438s 'drop_empty' => 0, 1438s 'keep_duplicate' => 0, 1438s 'name' => 'debian/changelog, entry no.1', 1438s 'out_order' => [] 1438s })}, 'Dpkg::Control::Hash' ); 1438s last finished-looking changelog entry: (2.0-1) unstable 1438s will stitch in dgit view, archive/test-dummy/2.0-1 1438s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1438s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1438s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1438s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 1438s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1438s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1438s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1438s git-debrebase ffq check_specs * 1438s git-debrebase ffq merge master 1438s git-debrebase ffq check_remote origin remote fetch/merge branch 1438s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1438s OK, you are ahead of refs/remotes/origin/master 1438s git-debrebase ffq check_remote undef remote push branch 1438s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1438s OK, you are ahead of refs/remotes/dgit/dgit/sid 1438s git-debrebase: snags: 2 overriden by individual -f options 1438s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 1438s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 1438s git-debrebase >$ 1438s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 1438s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1438s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1438s ' 1438s + git branch converted-from-gbp 1438s + v=2.0-2 1438s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1438s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1438s + DEBEMAIL=dgit-tests@example.org 1438s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1438s + 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 1438s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1438s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1438s 1 file changed, 6 insertions(+) 1438s + t-dch-commit-r 1438s + t-dch-r-rune t-dch-commit 1438s + local cmd=t-dch-commit 1438s + shift 1438s + local suite=unstable 1438s + t-dch-commit -r -D unstable '' 1438s + t-debchange -r -D unstable '' 1438s + DEBEMAIL=dgit-tests@example.org 1438s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1438s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1438s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1438s libdistro-info-perl is not installed, Debian release names are not known. 1438s libdistro-info-perl is not installed, Ubuntu release names are not known. 1438s + git commit -m 'dch -r -D unstable ' debian/changelog 1438s [master 4af0243] dch -r -D unstable 1438s 1 file changed, 1 insertion(+), 1 deletion(-) 1438s + t-dgit -wgf push-source --new 1438s + local dgit=dgit 1438s + pwd 1438s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1438s + : ' 1438s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1438s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 1439s | git rev-parse --show-toplevel 1439s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1439s | git config -z --get-regexp --local '.*' 1439s | git config -z --get-regexp --local '.*' 1439s | git config -z --get-regexp --global '.*' 1439s | git config -z --get-regexp --system '.*' 1439s format 3.0 (quilt), quilt mode linear 1439s Format `3.0 (quilt)', need to check/update patch stack 1439s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1439s => `' 1439s + git diff --quiet HEAD 1439s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1439s canonical suite name for unstable is sid 1439s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1439s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1439s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1439s | git rev-parse 'HEAD~0' 1439s => `4af0243f9227b0d695fbff38df345aca23969e2e' 1439s | git symbolic-ref -q HEAD 1439s => `refs/heads/master' 1439s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1439s CD work 1439s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1439s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1439s examining quilt state (multiple patches, linear mode) 1439s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 1439s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 1439s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1439s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1439s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 1439s | git rev-parse 'HEAD~0' 1439s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1439s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1439s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1439s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1439s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1439s CD fake 1439s | find -name .git -prune -print0 1439s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1439s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 1439s + git add -Af . 1439s | git write-tree 1439s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 1439s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1440s CD .. 1440s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1440s CD ../fake 1440s + git add -Af . 1440s | git write-tree 1440s => `607612c46d7ea5b66697b830f1a50f069061d460' 1440s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1440s CD ../work 1440s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1440s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1440s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1440s => `: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' 1440s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 1440s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1440s => `' 1440s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1440s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 1440s => `lib.c\x00new-upstream-file\x00src.c\x00' 1440s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 1440s differences @dl ## ## == == == ==. 1440s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 1440s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1440s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1440s starting quiltify (multiple patches, linear mode) 1440s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 1440s => `debian/control'... 1440s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1440s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1440s => `' 1440s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1440s search finished hooray! 1440s quiltify linearisation planning successful, executing... 1440s + git checkout -q master 1440s | git status --ignored --porcelain 1440s => `?? .pc/' 1440s nothing quilty to commit, ok. 1440s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1440s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1440s | git rev-parse 'HEAD~0' 1440s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1440s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1440s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1440s CD work 1440s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1440s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1440s CD .. 1440s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1440s dpkg-source: info: using source format '3.0 (quilt)' 1440s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1440s dpkg-source: info: using patch list from debian/patches/series 1440s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 1440s dpkg-source: info: building example in example_2.0-2.dsc 1440s CD work 1440s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1440s package seems new, not specifying -v 1440s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 1440s dpkg-genchanges: info: not including original source code in upload 1440s CD .. 1440s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1440s renaming (Files) example_2.0.orig.tar.gz 1440s renaming (Files) example_2.0-2.debian.tar.xz 1440s renaming (dsc) example_2.0-2.dsc 1440s renaming (changes) example_2.0-2_source.changes 1440s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1440s actually entering push 1440s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1440s => `1' 1440s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1440s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1440s git_lrfetch_sane iteration 0 1440s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1440s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 1440s => c7fbdf01d5593245424491530f0b2ea0a11f4209 refs/tags/archive/test-dummy/2.0-1 1440s => 449e30781112d560bc7b97962e396c421e5fc32f refs/tags/test-dummy/2.0-1 1440s 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 1440s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1440s | git for-each-ref refs/dgit-fetch/test-dummy 1440s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 1440s |> c7fbdf01d5593245424491530f0b2ea0a11f4209 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1440s |> 449e30781112d560bc7b97962e396c421e5fc32f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1440s git_lrfetch_sane: tidying any old suite lrfetchrefs 1440s | git for-each-ref refs/dgit-fetch/sid 1440s git_lrfetch_sane: git fetch --no-insane emulation complete 1440s $VAR1 = { 1440s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => 'c7fbdf01d5593245424491530f0b2ea0a11f4209', 1440s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '449e30781112d560bc7b97962e396c421e5fc32f', 1440s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9' 1440s }; 1440s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1440s |> c7fbdf01d5593245424491530f0b2ea0a11f4209 tag refs/tags/archive/test-dummy/2.0-1 1440s currently refs/tags/archive/test-dummy/2.0-1=c7fbdf01d5593245424491530f0b2ea0a11f4209 1440s |> 449e30781112d560bc7b97962e396c421e5fc32f tag refs/tags/test-dummy/2.0-1 1440s currently refs/tags/test-dummy/2.0-1=449e30781112d560bc7b97962e396c421e5fc32f 1440s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1440s |> c7fbdf01d5593245424491530f0b2ea0a11f4209 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1440s offered refs/tags/archive/test-dummy/2.0-1=c7fbdf01d5593245424491530f0b2ea0a11f4209 1440s |> 449e30781112d560bc7b97962e396c421e5fc32f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1440s offered refs/tags/test-dummy/2.0-1=449e30781112d560bc7b97962e396c421e5fc32f 1440s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1440s get_archive_dsc: nothing in archive, returning undef 1440s no version available from the archive 1440s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 1440s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 1440s 1440s Package not found in the archive, but has allegedly been pushed using dgit. 1440s Perhaps the upload is stuck in incoming. Using the version from git. 1440s 1440s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s fetch mergeinfos: 1440s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 1440s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 1440s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 1440s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 1440s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 1440s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 1440s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1440s + git check-ref-format archive/test-dummy/2.0-2 1440s | git symbolic-ref -q HEAD 1440s => `refs/heads/master' 1440s | git rev-parse 'HEAD~0' 1440s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1440s ffq_prev_branchinfo branch current refs/heads/master 1440s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1440s => `' 1440s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1440s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1440s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1440s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1440s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1440s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1440s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1440s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1440s | git status --ignored --porcelain 1440s => `' 1440s nothing quilty to commit, ok. 1440s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1440s => `' 1440s + git diff --quiet HEAD 1440s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1440s => `45ea71a69fa522ce760afdab8a420200443753e9' 1440s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 1440s => `' 1440s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1440s checking that example_2.0-2.dsc corresponds to HEAD 1440s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc 1440s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc) 1440s dpkg-source: info: extracting example in example-2.0 1440s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1440s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 1440s dpkg-source: info: using patch list from debian/patches/series 1440s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1440s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1440s dpkg-source: info: applying subdir/addnewups 1440s CD example-2.0 1440s | find -name .git -prune -print0 1440s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1440s + git add -Af . 1440s | git write-tree 1440s => `607612c46d7ea5b66697b830f1a50f069061d460' 1440s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1440s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1440s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1440s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1440s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1440s files_compare_inputs example_2.0-2.dsc 1440s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 1440s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1440s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 1440s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 1440s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1440s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 1440s files_compare_inputs example_2.0-2.dsc Files 1440s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 1440s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 1440s files_compare_inputs example_2.0-2_source.changes 1440s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 1440s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 1440s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 1440s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 1440s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 1440s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 1440s files_compare_inputs example_2.0-2_source.changes Files 1440s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 1440s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 1440s checking origs needed (2.0)... 1440s checking origs needed placement 'devel extra'... 1440s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1440s origs example_2.0.orig.tar.gz is_orig 1440s -| sh -ec 'cd "$1"; shift 1440s 1440s find -name "$1" -print0 | 1440s xargs -0r sha256sum 1440s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1440s origs example_2.0.orig.tar.gz $#$have=-1 1440s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1440s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 1440s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1440s push_tagwants: $VAR1 = [ 1440s '2.0-2', 1440s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1440s undef, 1440s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1440s ]; 1440s $VAR2 = [ 1440s { 1440s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1440s 'TagFn' => sub { "DUMMY" }, 1440s 'Tfn' => sub { "DUMMY" }, 1440s 'TfSuffix' => '', 1440s 'View' => 'dgit', 1440s 'Tag' => 'archive/test-dummy/2.0-2' 1440s }, 1440s { 1440s 'Tfn' => sub { "DUMMY" }, 1440s 'TfSuffix' => '-dgit', 1440s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1440s 'TagFn' => sub { "DUMMY" }, 1440s 'Tag' => 'test-dummy/2.0-2', 1440s 'View' => 'dgit' 1440s } 1440s ]; 1440s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1440s => `1530000000 +0000' 1440s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1440s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1441s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1441s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1441s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1441s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1441s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1441s => `f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4' 1441s + git verify-tag f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 1441s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1441s gpg: Signature made Mon Mar 31 23:11:10 2025 UTC 1441s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1441s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1441s gpg: WARNING: This key is not certified with a trusted signature! 1441s gpg: There is no indication that the signature belongs to the owner. 1441s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1441s + git update-ref refs/tags/archive/test-dummy/2.0-2 f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 1441s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1441s => `32795f4c9a68a11dcb33896d2c390b0fe22168f1' 1441s + git verify-tag 32795f4c9a68a11dcb33896d2c390b0fe22168f1 1441s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1441s gpg: Signature made Mon Mar 31 23:11:11 2025 UTC 1441s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1441s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1441s gpg: WARNING: This key is not certified with a trusted signature! 1441s gpg: There is no indication that the signature belongs to the owner. 1441s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1441s + git update-ref refs/tags/test-dummy/2.0-2 32795f4c9a68a11dcb33896d2c390b0fe22168f1 1441s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1441s => `1' 1441s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 1441s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1441s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 1441s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 1441s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 1441s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1441s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 1441s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1441s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1441s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1441s 1441s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 1441s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1441s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1441s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1441s 1441s Successfully signed dsc, changes files 1441s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 1442s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1442s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1442s D: Setting host argument. 1442s Checking signature on .changes 1442s Checking signature on .dsc 1442s Package includes an .orig.tar.gz file although the debian revision suggests 1442s that it might not be required. Multiple uploads of the .orig.tar.gz may be 1442s rejected by the upload queue management software. 1442s Uploading to test-dummy (via local to localhost): 1442s Successfully uploaded packages. 1442s dgit ok: pushed and uploaded 2.0-2 1442s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1442s del_lrfetchrefs... 1442s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 1442s del_lrfetchrefs: c7fbdf01d5593245424491530f0b2ea0a11f4209 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1442s del_lrfetchrefs: 449e30781112d560bc7b97962e396c421e5fc32f refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1442s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1442s ' 1442s + git push 1442s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1442s eb10718..6b22dd5 master -> master 1442s + cd .. 1442s + t-archive-process-incoming sid 1442s + local suite=sid 1442s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1442s + t-archive-query sid 1442s + local suite=sid 1442s + local dscf=main/example_2.0-2.dsc 1442s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 1442s + local suite=sid 1442s + local p=example 1442s + local v=2.0-2 1442s + local dscf=main/example_2.0-2.dsc 1442s + local sha 1442s ++ sha256sum 1442s + sha='25872df5d1453205750c5098300c4f0e94f6a56235a6f679ae9066e189a4b452 -' 1442s + echo '2.0-2 25872df5d1453205750c5098300c4f0e94f6a56235a6f679ae9066e189a4b452 main/example_2.0-2.dsc' 1442s + t-aq-archive-updated sid example 1442s + local suite=sid 1442s + local p=example 1442s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1442s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1442s + perl -wne ' 1442s use JSON; 1442s use strict; 1442s our @v; 1442s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1442s push @v, { 1442s "version" => "$1", 1442s "sha256sum" => "$2", 1442s "component" => "$3", 1442s "filename" => "$4", 1442s }; 1442s END { 1442s my $json = JSON->new->canonical(); 1442s print $json->encode(\@v) or die $!; 1442s } 1442s ' 1442s ++ 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 1442s ++ echo git mirror aq 1442s + 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' ' 1442s . $troot/lib-gdr 1442s t-tstunt-parsechangelog 1442s p=example 1442s t-git-next-date 1442s ' 1442s + local savevars= 1442s + 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' 1442s + local 'importeval= 1442s . $troot/lib-gdr 1442s t-tstunt-parsechangelog 1442s p=example 1442s t-git-next-date 1442s ' 1442s + local import=IMPORT.gdr-convert-gbp 1442s + exec 1442s + local vn 1442s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1442s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1442s print STDERR "saving-exporting $vn\n"; 1442s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1442s or die $!; 1442s } 1442s ' 1442s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1442s saving-exporting DGIT_TEST_REAL_GPG 1442s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1442s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1442s + set -e 1442s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1442s + 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 1442s + printf '\n%s\n' ' 1442s . $troot/lib-gdr 1442s t-tstunt-parsechangelog 1442s p=example 1442s t-git-next-date 1442s ' 1442s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1442s + rc=0 1442s + set +x 1442s + set +e 1442s + pwd 1442s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1442s + '[' x '!=' x ']' 1442s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1442s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1442s + set -e 1442s + test 0 = 0 1442s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1442s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1442s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1442s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1442s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1442s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1442s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1442s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1442s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1442s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1442s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1442s ++ . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1442s +++ : -D 1442s +++ export GDR_TEST_DEBUG 1442s +++ t-tstunt debchange 1442s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s +++ local var=PATH 1442s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s +++ eval ' 1442s case "$PATH" in 1442s "$tstunt:"*) ;; 1442s *":$tstunt:"*) ;; 1442s "") PATH="$tstunt" ;; 1442s *) PATH="$tstunt:$PATH" ;; 1442s esac 1442s export PATH 1442s ' 1442s ++++ case "$PATH" in 1442s ++++ export PATH 1442s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s +++ local var=PERLLIB 1442s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s +++ eval ' 1442s case "$PERLLIB" in 1442s "$tstunt:"*) ;; 1442s *":$tstunt:"*) ;; 1442s "") PERLLIB="$tstunt" ;; 1442s *) PERLLIB="$tstunt:$PERLLIB" ;; 1442s esac 1442s export PERLLIB 1442s ' 1442s ++++ case "$PERLLIB" in 1442s ++++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s ++++ export PERLLIB 1442s +++ local f 1442s +++ for f in "$@" 1442s +++ t-tstunt--save-real debchange 1442s +++ local f=debchange 1442s +++ case "$f" in 1442s +++ local rc 1442s +++ local real 1442s +++ set +e 1442s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1442s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1442s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1442s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1442s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1442s ++++ type -p debchange 1442s +++ real=/usr/bin/debchange 1442s +++ rc=0 1442s +++ set -e 1442s +++ case $rc in 1442s +++ local varname=debchange 1442s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1442s +++ eval ' 1442s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1442s export DGIT_TEST_REAL_DEBCHANGE 1442s ' 1442s ++++ : /usr/bin/debchange 1442s ++++ export DGIT_TEST_REAL_DEBCHANGE 1442s +++ f=./debchange 1442s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1442s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1442s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1442s ++ t-tstunt-parsechangelog 1442s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1442s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s ++ local var=PATH 1442s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s ++ eval ' 1442s case "$PATH" in 1442s "$tstunt:"*) ;; 1442s *":$tstunt:"*) ;; 1442s "") PATH="$tstunt" ;; 1442s *) PATH="$tstunt:$PATH" ;; 1442s esac 1442s export PATH 1442s ' 1442s +++ case "$PATH" in 1442s +++ export PATH 1442s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s ++ local var=PERLLIB 1442s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1442s ++ eval ' 1442s case "$PERLLIB" in 1442s "$tstunt:"*) ;; 1442s *":$tstunt:"*) ;; 1442s "") PERLLIB="$tstunt" ;; 1442s *) PERLLIB="$tstunt:$PERLLIB" ;; 1442s esac 1442s export PERLLIB 1442s ' 1442s +++ case "$PERLLIB" in 1442s +++ export PERLLIB 1442s ++ local f 1442s ++ for f in "$@" 1442s ++ t-tstunt--save-real dpkg-parsechangelog 1442s ++ local f=dpkg-parsechangelog 1442s ++ case "$f" in 1442s ++ local rc 1442s ++ local real 1442s ++ set +e 1442s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1442s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1442s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1442s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1442s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1442s +++ type -p dpkg-parsechangelog 1442s ++ real=/usr/bin/dpkg-parsechangelog 1442s ++ rc=0 1442s ++ set -e 1442s ++ case $rc in 1442s ++ local varname=dpkg_parsechangelog 1442s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1442s ++ eval ' 1442s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1442s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1442s ' 1442s +++ : /usr/bin/dpkg-parsechangelog 1442s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1442s ++ f=./dpkg-parsechangelog 1442s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1442s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1442s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1442s ++ for f in "$@" 1442s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1442s ++ local f=Dpkg/Changelog/Parse.pm 1442s ++ case "$f" in 1442s ++ return 1442s ++ f=./Dpkg/Changelog/Parse.pm 1442s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1442s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1442s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1442s ++ p=example 1442s ++ t-git-next-date 1442s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1442s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1442s + cd example 1442s + t-dgit setup-mergechangelogs 1442s + local dgit=dgit 1442s + pwd 1442s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1442s + : ' 1442s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1442s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-mergechangelogs 1442s | git rev-parse --show-toplevel 1442s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1442s | git config -z --get-regexp --local '.*' 1442s | git config -z --get-regexp --local '.*' 1442s | git config -z --get-regexp --global '.*' 1442s | git config -z --get-regexp --system '.*' 1442s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 1442s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 1442s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1442s ' 1442s + : maintainer 1442s + git checkout master 1442s Already on 'master' 1442s Your branch is up to date with 'origin/master'. 1442s + v=2.0-3 1442s + t-maintainer-commit-some-changes 1442s + t-dch-commit -v2.0-3 -m 'start 2.0-3' 1442s + t-debchange -v2.0-3 -m 'start 2.0-3' 1442s + DEBEMAIL=dgit-tests@example.org 1442s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v2.0-3 -m 'start 2.0-3' 1442s + 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 1442s + git commit -m 'dch -v2.0-3 -m start 2.0-3' debian/changelog 1442s [master 4dd98f7] dch -v2.0-3 -m start 2.0-3 1442s 1 file changed, 6 insertions(+) 1442s + t-some-changes 'maintainer 2.0-3' 1442s + local 'token=maintainer 2.0-3' 1442s + local which=dum 1442s + local fsuffix= 1442s + t-git-next-date 1442s + GIT_COMMITTER_DATE='1530000002 +0100' 1442s + GIT_AUTHOR_DATE='1530000002 +0100' 1442s + case "$which" in 1442s + echo '// debian maintainer 2.0-3' 1442s + git add debian/zorkmid 1442s + git commit -m 'DEBIAN add zorkmid (maintainer 2.0-3)' 1442s [master c5aeac0] DEBIAN add zorkmid (maintainer 2.0-3) 1442s 1 file changed, 1 insertion(+) 1442s create mode 100644 debian/zorkmid 1442s + case "$which" in 1442s + echo '// upstream maintainer 2.0-3' 1442s + git add src.c 1442s + git commit -m 'UPSTREAM edit src.c (maintainer 2.0-3)' 1442s [master 64946bb] UPSTREAM edit src.c (maintainer 2.0-3) 1442s 1 file changed, 1 insertion(+) 1442s + case "$which" in 1442s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1442s + echo '// both! maintainer 2.0-3' 1442s + git add debian/zorkmid 1442s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1442s + echo '// both! maintainer 2.0-3' 1442s + git add src.c 1442s + git commit -m 'MIXED add both() (maintainer 2.0-3)' 1442s [master 964ce93] MIXED add both() (maintainer 2.0-3) 1442s 2 files changed, 2 insertions(+) 1442s + t-git-next-date 1442s + GIT_COMMITTER_DATE='1530000003 +0100' 1442s + GIT_AUTHOR_DATE='1530000003 +0100' 1442s + t-git-debrebase 1442s + local gdr=git-debrebase 1442s + : ' 1442s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1442s + git-debrebase --dgit=dgit -D 1442s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1442s git-debrebase ffq check_specs * 1442s git-debrebase ffq merge master 1442s git-debrebase ffq check_remote origin remote fetch/merge branch 1442s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1442s OK, you are ahead of refs/remotes/origin/master 1442s git-debrebase ffq check_remote undef remote push branch 1442s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1442s OK, you are ahead of refs/remotes/dgit/dgit/sid 1442s git-debrebase *** WALK 964ce93fe0ce99ab711d1cb423537d236e0bbf20 0 - 1442s git-debrebase get_differs 64946bb029165d28437faddd24dd43a5ca319327 6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f = 0x22 1442s git-debrebase classify 964ce93fe0ce99ab711d1cb423537d236e0bbf20 $t=6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f @p 64946bb029165d28437faddd24dd43a5ca319327/0x22 1442s git-debrebase = Mixed {"CommitId" => "964ce93fe0ce99ab711d1cb423537d236e0bbf20","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "64946bb029165d28437faddd24dd43a5ca319327"}],"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","Tree" => "6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f","Type" => "Mixed"} 1442s git-debrebase get_differs c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c 75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537 = 0x2 1442s git-debrebase classify 64946bb029165d28437faddd24dd43a5ca319327 $t=75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537 @p c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c/0x2 1442s git-debrebase = Upstream {"Hdr" => "tree 75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537\nparent c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","CommitId" => "64946bb029165d28437faddd24dd43a5ca319327","Type" => "Upstream","Tree" => "75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537"} 1442s git-debrebase get_differs 4dd98f768a8f29a08011b04867832a40ef33e618 b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9 = 0x20 1442s git-debrebase classify c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c $t=b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9 @p 4dd98f768a8f29a08011b04867832a40ef33e618/0x20 1442s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9","Hdr" => "tree b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9\nparent 4dd98f768a8f29a08011b04867832a40ef33e618\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4dd98f768a8f29a08011b04867832a40ef33e618"}],"Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","CommitId" => "c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c"} 1442s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 89b9b5a11fee7d2a1c974f30aa28172018b99c18 = 0x10 1442s git-debrebase classify 4dd98f768a8f29a08011b04867832a40ef33e618 $t=89b9b5a11fee7d2a1c974f30aa28172018b99c18 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 1442s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "89b9b5a11fee7d2a1c974f30aa28172018b99c18","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"}],"Hdr" => "tree 89b9b5a11fee7d2a1c974f30aa28172018b99c18\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Msg" => "dch -v2.0-3 -m start 2.0-3\n","CommitId" => "4dd98f768a8f29a08011b04867832a40ef33e618"} 1442s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1442s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1442s git-debrebase = 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","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches"} 1442s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1442s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1442s git-debrebase = Changelog {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}],"Msg" => "dch -r -D unstable\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Type" => "Changelog","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 1442s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1442s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1442s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","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","Parents" => [{"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16,"Ix" => 0}],"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"} 1442s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1442s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1442s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1442s git-debrebase = Pseudomerge {"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Parents" => [{"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0,"Ix" => 0},{"Ix" => 1,"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Overwritten" => [$VAR1->{"Parents"}[1]],"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","Contributor" => $VAR1->{"Parents"}[0]} 1442s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1442s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1442s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 1442s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1442s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1442s git-debrebase = Upstream {"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c"} 1442s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1442s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1442s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2,"Ix" => 0}],"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"} 1442s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1442s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1442s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1442s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","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"} 1442s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 14 pm 0 1442s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1442s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1442s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 15 1442s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1442s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1442s git-debrebase WALK REWRITING NOW cl=HASH(0x557e4f4f190) procd=HASH(0x557e4f54f88) 1442s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1442s git-debrebase WALK BUILD 4dd98f768a8f29a08011b04867832a40ef33e618 Debian (rewriting=1) 1442s git-debrebase WALK BUILD c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c Debian (rewriting=1) 1443s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1443s git-debrebase WALK BUILD 964ce93fe0ce99ab711d1cb423537d236e0bbf20 Debian (rewriting=1) 1443s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1443s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1443s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1443s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1443s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1443s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1443s git-debrebase WALK BUILD 64946bb029165d28437faddd24dd43a5ca319327 Upstream (rewriting=1) 1443s git-debrebase WALK BUILD 964ce93fe0ce99ab711d1cb423537d236e0bbf20 Upstream (rewriting=1) 1443s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1443s git-debrebase get_differs 5b2d01d10ec62b3f25e6f7a22710468830e457fb 964ce93fe0ce99ab711d1cb423537d236e0bbf20 = 0x4 1443s git-debrebase *** WALK RETURN 5b2d01d10ec62b3f25e6f7a22710468830e457fb 274022edec808f75f2359551ecdc6de6b6390355 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1443s git-debrebase: laundered (head was 964ce93fe0ce99ab711d1cb423537d236e0bbf20) 1443s git-debrebase >= update refs/ffq-prev/heads/master 964ce93fe0ce99ab711d1cb423537d236e0bbf20 0000000000000000000000000000000000000000 1443s git-debrebase >= delete refs/debrebase-last/heads/master 1443s git-debrebase >= update HEAD 5b2d01d10ec62b3f25e6f7a22710468830e457fb 964ce93fe0ce99ab711d1cb423537d236e0bbf20 1443s git-debrebase >$ 1443s Recorded previous head for preservation 1443s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1443s ' 1443s + t-git-debrebase stitch 1443s + local gdr=git-debrebase 1443s + : ' 1443s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1443s + git-debrebase --dgit=dgit -D stitch 1443s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1443s git-debrebase get_differs b3c76885171009da1ef20071776aa9044fae8502 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x2 1443s git-debrebase classify 5b2d01d10ec62b3f25e6f7a22710468830e457fb $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p b3c76885171009da1ef20071776aa9044fae8502/0x2 1443s git-debrebase = Upstream {"Hdr" => "tree 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae\nparent b3c76885171009da1ef20071776aa9044fae8502\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Differs" => 2,"Ix" => 0}],"CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb","Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream"} 1443s git-debrebase get_differs 8139d3db657e3270633db038d311934dab9b5fa2 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 = 0x2 1443s git-debrebase classify b3c76885171009da1ef20071776aa9044fae8502 $t=5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 @p 8139d3db657e3270633db038d311934dab9b5fa2/0x2 1443s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Ix" => 0}],"CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Hdr" => "tree 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14\nparent 8139d3db657e3270633db038d311934dab9b5fa2\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Type" => "Upstream"} 1443s git-debrebase get_differs f99dd01b94310ac6847d5bb66d530db52eceb9a7 1a9494a6c69d5574aa472ee96d6f641184e55cfa = 0x2 1443s git-debrebase classify 8139d3db657e3270633db038d311934dab9b5fa2 $t=1a9494a6c69d5574aa472ee96d6f641184e55cfa @p f99dd01b94310ac6847d5bb66d530db52eceb9a7/0x2 1443s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7"}],"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","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","Type" => "Upstream"} 1443s git-debrebase get_differs 505316fe392571a9180b6df0d54ec25ffb40c9c7 a71937789bee6e5711ddc7f7e212948a45fedf59 = 0x2 1443s git-debrebase classify f99dd01b94310ac6847d5bb66d530db52eceb9a7 $t=a71937789bee6e5711ddc7f7e212948a45fedf59 @p 505316fe392571a9180b6df0d54ec25ffb40c9c7/0x2 1443s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7"}],"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Hdr" => "tree a71937789bee6e5711ddc7f7e212948a45fedf59\nparent 505316fe392571a9180b6df0d54ec25ffb40c9c7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "a71937789bee6e5711ddc7f7e212948a45fedf59","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 1443s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 447f86ca9d4d65b8c1128528a4338c51733e127b = 0x2 1443s git-debrebase classify 505316fe392571a9180b6df0d54ec25ffb40c9c7 $t=447f86ca9d4d65b8c1128528a4338c51733e127b @p 274022edec808f75f2359551ecdc6de6b6390355/0x2 1443s git-debrebase = Upstream {"Hdr" => "tree 447f86ca9d4d65b8c1128528a4338c51733e127b\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Ix" => 0}],"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Tree" => "447f86ca9d4d65b8c1128528a4338c51733e127b","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 1443s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 1443s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 1443s git-debrebase = Packaging {"Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"}],"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Type" => "Packaging","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1443s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 1443s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 1443s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Type" => "Packaging","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Parents" => [{"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Differs" => 32,"Ix" => 0}],"Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4"} 1443s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 1443s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1443s git-debrebase = Changelog {"Tree" => "894ca54a967167e2bb994b82357d084539559075","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16,"Ix" => 0}],"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","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"} 1443s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1443s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1443s git-debrebase = 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","Type" => "Changelog","Msg" => "dch -r -D unstable\n"} 1443s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1443s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1443s git-debrebase = Changelog {"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 1530000003 +0100\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}]} 1443s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1443s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1443s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1443s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"Differs" => 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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor"} 1443s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1443s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1443s git-debrebase >= delete refs/ffq-prev/heads/master 964ce93fe0ce99ab711d1cb423537d236e0bbf20 1443s git-debrebase >= update refs/debrebase-last/heads/master 74d5f586ed443ce47434f30fbbeff3eacb36748d 0000000000000000000000000000000000000000 1443s git-debrebase >= update HEAD 74d5f586ed443ce47434f30fbbeff3eacb36748d 5b2d01d10ec62b3f25e6f7a22710468830e457fb 1443s git-debrebase >$ 1443s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1443s ' 1443s + git branch did.maintainer 1443s + t-git-next-date 1443s + GIT_COMMITTER_DATE='1530000004 +0100' 1443s + GIT_AUTHOR_DATE='1530000004 +0100' 1443s + t-git-next-date 1443s + GIT_COMMITTER_DATE='1530000005 +0100' 1443s + GIT_AUTHOR_DATE='1530000005 +0100' 1443s + : nmu 1443s + git checkout -b nmu origin/master~0 1443s Switched to a new branch 'nmu' 1443s + t-git-next-date 1443s + GIT_COMMITTER_DATE='1530000006 +0100' 1443s + GIT_AUTHOR_DATE='1530000006 +0100' 1443s + v=2.0-2+nmu1 1443s + t-nmu-commit-an-upstream-change 1443s + echo '// more upstream' 1443s + git add newsrc.c 1443s + git commit -m 'UPSTREAM NMU' 1443s [nmu a46e8d3] UPSTREAM NMU 1443s 1 file changed, 1 insertion(+) 1443s create mode 100644 newsrc.c 1443s + t-dch-commit -v2.0-2+nmu1 -m finalise 1443s + t-debchange -v2.0-2+nmu1 -m finalise 1443s + DEBEMAIL=dgit-tests@example.org 1443s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v2.0-2+nmu1 -m finalise 1443s + exec env TZ=UTC faketime -f 2018-06-26 08:00:06 env -u TZ /usr/bin/debchange -v2.0-2+nmu1 -m finalise 1443s + git commit -m 'dch -v2.0-2+nmu1 -m finalise' debian/changelog 1443s [nmu eb84137] dch -v2.0-2+nmu1 -m finalise 1443s 1 file changed, 6 insertions(+) 1443s + t-dch-commit-r 1443s + t-dch-r-rune t-dch-commit 1443s + local cmd=t-dch-commit 1443s + shift 1443s + local suite=unstable 1443s + t-dch-commit -r -D unstable '' 1443s + t-debchange -r -D unstable '' 1443s + DEBEMAIL=dgit-tests@example.org 1443s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1443s + exec env TZ=UTC faketime -f 2018-06-26 08:00:06 env -u TZ /usr/bin/debchange -r -D unstable 1443s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1443s libdistro-info-perl is not installed, Debian release names are not known. 1443s libdistro-info-perl is not installed, Ubuntu release names are not known. 1443s + git commit -m 'dch -r -D unstable ' debian/changelog 1443s [nmu c796f6f] dch -r -D unstable 1443s 1 file changed, 1 insertion(+), 1 deletion(-) 1443s + t-dgit -wgf push-source 1443s + local dgit=dgit 1443s + pwd 1443s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1443s + : ' 1443s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1443s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source 1443s | git rev-parse --show-toplevel 1443s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1443s | git config -z --get-regexp --local '.*' 1443s | git config -z --get-regexp --local '.*' 1443s | git config -z --get-regexp --global '.*' 1443s | git config -z --get-regexp --system '.*' 1443s format 3.0 (quilt), quilt mode linear 1443s Format `3.0 (quilt)', need to check/update patch stack 1443s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1443s => `' 1443s + git diff --quiet HEAD 1443s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1443s canonical suite name for unstable is sid 1443s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1443s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1443s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1443s | git rev-parse 'HEAD~0' 1443s => `c796f6f0f624a7aa89eee33d301e249029f42362' 1443s | git symbolic-ref -q HEAD 1443s => `refs/heads/nmu' 1443s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1443s CD work 1443s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1443s + git reset -q --hard c796f6f0f624a7aa89eee33d301e249029f42362 1443s examining quilt state (multiple patches, linear mode) 1443s branch_is_gdr c796f6f0f624a7aa89eee33d301e249029f42362... 1443s branch_is_gdr 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf gdr make-patches YES 1443s + git reset -q --hard c796f6f0f624a7aa89eee33d301e249029f42362 1443s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1444s HEAD is now at 1b09bea Commit patch queue (exported by git-debrebase) 1444s | git rev-parse 'HEAD~0' 1444s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1444s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1444s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1444s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1444s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1444s CD fake 1444s | find -name .git -prune -print0 1444s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1444s + git checkout -f 1b09bea8a4b0249eafd6d5623761abfa79446f68 -- debian 1444s + git add -Af . 1444s | git write-tree 1444s => `2e49b4b87cbedac7e1e20ece2288a2244efa6d93' 1444s fake orig tree object 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 1444s CD .. 1444s + git reset -q --hard 1b09bea8a4b0249eafd6d5623761abfa79446f68 1444s CD ../fake 1444s + git add -Af . 1444s | git write-tree 1444s => `b5b261782b3ba083e7f9d56d8b6ece45218faf20' 1444s fake o+d/p tree object 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 1444s CD ../work 1444s | git ls-tree --name-only -z 1b09bea8a4b0249eafd6d5623761abfa79446f68 1444s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 1444s | git diff-tree -z --no-renames -r 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 1b09bea8a4b0249eafd6d5623761abfa79446f68 1444s => `: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' 1444s quiltify_trees_differ 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 1b09bea8a4b0249eafd6d5623761abfa79446f68 => 1 1444s | git diff-tree -z --no-renames --name-only -r 1b09bea8a4b0249eafd6d5623761abfa79446f68 b5b261782b3ba083e7f9d56d8b6ece45218faf20 1444s => `' 1444s quiltify_trees_differ 1b09bea8a4b0249eafd6d5623761abfa79446f68 b5b261782b3ba083e7f9d56d8b6ece45218faf20 => 0 1444s | git diff-tree -z --no-renames --name-only -r 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 b5b261782b3ba083e7f9d56d8b6ece45218faf20 1444s => `lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 1444s quiltify_trees_differ 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 b5b261782b3ba083e7f9d56d8b6ece45218faf20 => 1 1444s differences @dl ## ## == == == ==. 1444s dgit: base trees orig=2e49b4b87cbedac7e1e2 o+d/p=b5b261782b3ba083e7f9 1444s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1444s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1444s starting quiltify (multiple patches, linear mode) 1444s | git ls-tree --name-only 1b09bea8a4b0249eafd6d5623761abfa79446f68 -- debian/rules debian/control 1444s => `debian/control'... 1444s quiltify investigate 1b09bea8a4b0249eafd6d5623761abfa79446f68 1444s | git diff-tree -z --no-renames --name-only 1b09bea8a4b0249eafd6d5623761abfa79446f68 b5b261782b3ba083e7f9d56d8b6ece45218faf20 1444s => `' 1444s quiltify_trees_differ 1b09bea8a4b0249eafd6d5623761abfa79446f68 b5b261782b3ba083e7f9d56d8b6ece45218faf20 => 0 1444s search finished hooray! 1444s quiltify linearisation planning successful, executing... 1444s + git checkout -q master 1444s | git status --ignored --porcelain 1444s => `?? .pc/' 1444s nothing quilty to commit, ok. 1444s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1444s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1444s | git rev-parse 'HEAD~0' 1444s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1444s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1444s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1444s CD work 1444s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1444s + git reset -q --hard 1b09bea8a4b0249eafd6d5623761abfa79446f68 1444s CD .. 1444s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1445s dpkg-source: info: using source format '3.0 (quilt)' 1445s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1445s dpkg-source: info: using patch list from debian/patches/series 1445s dpkg-source: info: building example in example_2.0-2+nmu1.debian.tar.xz 1445s dpkg-source: info: building example in example_2.0-2+nmu1.dsc 1445s CD work 1445s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1445s changelog will contain changes since 2.0-2 1445s + sh -ec 'exec >../$1; shift; exec "$@"' x 'example_2.0-2+nmu1_source.changes' dpkg-genchanges -S -v2.0-2 1445s dpkg-genchanges: info: not including original source code in upload 1445s CD .. 1445s moving example_2.0-2+nmu1.dsc, example_2.0-2+nmu1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1445s renaming (Files) example_2.0.orig.tar.gz 1445s renaming (Files) example_2.0-2+nmu1.debian.tar.xz 1445s renaming (dsc) example_2.0-2+nmu1.dsc 1445s renaming (changes) example_2.0-2+nmu1_source.changes 1445s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1445s actually entering push 1445s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1445s => `1' 1445s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1445s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1445s git_lrfetch_sane iteration 0 1445s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1445s => 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit/sid 1445s => c7fbdf01d5593245424491530f0b2ea0a11f4209 refs/tags/archive/test-dummy/2.0-1 1445s => f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 refs/tags/archive/test-dummy/2.0-2 1445s => 449e30781112d560bc7b97962e396c421e5fc32f refs/tags/test-dummy/2.0-1 1445s => 32795f4c9a68a11dcb33896d2c390b0fe22168f1 refs/tags/test-dummy/2.0-2 1445s 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 1445s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1445s | git for-each-ref refs/dgit-fetch/test-dummy 1445s |> 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit refs/dgit-fetch/test-dummy/dgit/sid 1445s |> c7fbdf01d5593245424491530f0b2ea0a11f4209 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1445s |> f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1445s |> 449e30781112d560bc7b97962e396c421e5fc32f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1445s |> 32795f4c9a68a11dcb33896d2c390b0fe22168f1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1445s git_lrfetch_sane: tidying any old suite lrfetchrefs 1445s | git for-each-ref refs/dgit-fetch/sid 1445s git_lrfetch_sane: git fetch --no-insane emulation complete 1445s $VAR1 = { 1445s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => 'c7fbdf01d5593245424491530f0b2ea0a11f4209', 1445s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '449e30781112d560bc7b97962e396c421e5fc32f', 1445s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => '32795f4c9a68a11dcb33896d2c390b0fe22168f1', 1445s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => 'f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4', 1445s 'refs/dgit-fetch/test-dummy/dgit/sid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s }; 1445s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1445s |> c7fbdf01d5593245424491530f0b2ea0a11f4209 tag refs/tags/archive/test-dummy/2.0-1 1445s currently refs/tags/archive/test-dummy/2.0-1=c7fbdf01d5593245424491530f0b2ea0a11f4209 1445s |> f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 tag refs/tags/archive/test-dummy/2.0-2 1445s currently refs/tags/archive/test-dummy/2.0-2=f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 1445s |> 449e30781112d560bc7b97962e396c421e5fc32f tag refs/tags/test-dummy/2.0-1 1445s currently refs/tags/test-dummy/2.0-1=449e30781112d560bc7b97962e396c421e5fc32f 1445s |> 32795f4c9a68a11dcb33896d2c390b0fe22168f1 tag refs/tags/test-dummy/2.0-2 1445s currently refs/tags/test-dummy/2.0-2=32795f4c9a68a11dcb33896d2c390b0fe22168f1 1445s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1445s |> c7fbdf01d5593245424491530f0b2ea0a11f4209 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1445s offered refs/tags/archive/test-dummy/2.0-1=c7fbdf01d5593245424491530f0b2ea0a11f4209 1445s |> f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1445s offered refs/tags/archive/test-dummy/2.0-2=f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 1445s |> 449e30781112d560bc7b97962e396c421e5fc32f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1445s offered refs/tags/test-dummy/2.0-1=449e30781112d560bc7b97962e396c421e5fc32f 1445s |> 32795f4c9a68a11dcb33896d2c390b0fe22168f1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1445s offered refs/tags/test-dummy/2.0-2=32795f4c9a68a11dcb33896d2c390b0fe22168f1 1445s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1445s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.0-2.dsc... 1445s get_archive_dsc: Version 2.0-2 1445s last upload to archive: specified git info (test-dummy) 1445s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 1445s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 1445s GCF>| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1445s GCF<| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit 350 1445s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s previous reference hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1445s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s fetch_from_archive: lastfetch=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1445s using existing example_2.0.orig.tar.gz 1445s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s fetch mergeinfos: 1445s commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf Dgit field in .dsc from archive 1445s fetch hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1445s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1445s | git log -n2 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1445s => `commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf'... 1445s is_gitattrs_setup: found nothing 1445s | git ls-tree -lrz -- 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf: 1445s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1445s + git check-ref-format 'archive/test-dummy/2.0-2+nmu1' 1445s | git symbolic-ref -q HEAD 1445s => `refs/heads/nmu' 1445s | git rev-parse 'HEAD~0' 1445s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1445s ffq_prev_branchinfo branch current refs/heads/nmu 1445s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/nmu' 1445s => `' 1445s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/nmu' 1445s => `' 1445s | git status --ignored --porcelain 1445s => `' 1445s nothing quilty to commit, ok. 1445s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1445s => `' 1445s + git diff --quiet HEAD 1445s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1b09bea8a4b0249eafd6d5623761abfa79446f68 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1445s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1445s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2+nmu1' 1445s => `' 1445s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1445s checking that example_2.0-2+nmu1.dsc corresponds to HEAD 1445s + dpkg-source -x -- '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2+nmu1.dsc' 1445s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2+nmu1.dsc) 1445s dpkg-source: info: extracting example in example-2.0 1445s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1445s dpkg-source: info: unpacking example_2.0-2+nmu1.debian.tar.xz 1445s dpkg-source: info: using patch list from debian/patches/series 1445s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1445s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1445s dpkg-source: info: applying subdir/addnewups 1445s dpkg-source: info: applying 0004-UPSTREAM-NMU.patch 1445s CD example-2.0 1445s | find -name .git -prune -print0 1445s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1445s + git add -Af . 1445s | git write-tree 1445s => `b5b261782b3ba083e7f9d56d8b6ece45218faf20' 1445s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1445s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1445s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1445s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1445s + git diff --quiet b5b261782b3ba083e7f9d56d8b6ece45218faf20 1b09bea8a4b0249eafd6d5623761abfa79446f68 1445s files_compare_inputs example_2.0-2+nmu1.dsc 1445s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha256 1445s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1445s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha256 example_2.0-2+nmu1.debian.tar.xz 1445s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha1 1445s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1445s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha1 example_2.0-2+nmu1.debian.tar.xz 1445s files_compare_inputs example_2.0-2+nmu1.dsc Files 1445s files_compare_inputs example_2.0-2+nmu1.dsc Files example_2.0.orig.tar.gz 1445s files_compare_inputs example_2.0-2+nmu1.dsc Files example_2.0-2+nmu1.debian.tar.xz 1445s files_compare_inputs example_2.0-2+nmu1_source.changes 1445s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha256 1445s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha256 example_2.0-2+nmu1.dsc 1445s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha256 example_2.0-2+nmu1.debian.tar.xz 1445s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha1 1445s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha1 example_2.0-2+nmu1.dsc 1445s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha1 example_2.0-2+nmu1.debian.tar.xz 1445s files_compare_inputs example_2.0-2+nmu1_source.changes Files 1445s files_compare_inputs example_2.0-2+nmu1_source.changes Files example_2.0-2+nmu1.dsc 1445s files_compare_inputs example_2.0-2+nmu1_source.changes Files example_2.0-2+nmu1.debian.tar.xz 1445s checking origs needed (2.0)... 1445s checking origs needed placement 'devel extra'... 1445s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1445s origs example_2.0.orig.tar.gz is_orig 1445s -| sh -ec 'cd "$1"; shift 1445s 1445s find -name "$1" -print0 | 1445s xargs -0r sha256sum 1445s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1445s | 0e1bd42ce3bea52885dcc33e1deaea0259dd4088494c1ecdfa4c50fbea0aceb2 ./pool/main/example_2.0.orig.tar.gz 1445s origs example_2.0.orig.tar.gz $#$have=0 1445s origs example_2.0.orig.tar.gz f.same=1 #f._differ=-1 1445s origs example_2.0-2+nmu1.debian.tar.xz | a77c6dbe75698c94323b274b6106df89 1428 example_2.0-2+nmu1.debian.tar.xz 1445s ../example_2.0-2+nmu1_source.changes already has appropriate .orig(s) (if any) 1445s push_tagwants: $VAR1 = [ 1445s '2.0-2+nmu1', 1445s '1b09bea8a4b0249eafd6d5623761abfa79446f68', 1445s undef, 1445s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1445s ]; 1445s $VAR2 = [ 1445s { 1445s 'Tfn' => sub { "DUMMY" }, 1445s 'View' => 'dgit', 1445s 'Objid' => '1b09bea8a4b0249eafd6d5623761abfa79446f68', 1445s 'Tag' => 'archive/test-dummy/2.0-2+nmu1', 1445s 'TagFn' => sub { "DUMMY" }, 1445s 'TfSuffix' => '' 1445s }, 1445s { 1445s 'Objid' => '1b09bea8a4b0249eafd6d5623761abfa79446f68', 1445s 'View' => 'dgit', 1445s 'Tfn' => sub { "DUMMY" }, 1445s 'TfSuffix' => '-dgit', 1445s 'Tag' => 'test-dummy/2.0-2+nmu1', 1445s 'TagFn' => sub { "DUMMY" } 1445s } 1445s ]; 1445s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 1445s => `1530000006 +0000' 1445s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1445s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1445s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1445s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1445s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1445s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1445s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1445s => `1cff5f94270e50d8229e6bba3e77e4b20d0251d5' 1445s + git verify-tag 1cff5f94270e50d8229e6bba3e77e4b20d0251d5 1445s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1445s gpg: Signature made Mon Mar 31 23:11:15 2025 UTC 1445s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1445s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1445s gpg: WARNING: This key is not certified with a trusted signature! 1445s gpg: There is no indication that the signature belongs to the owner. 1445s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1445s + git update-ref 'refs/tags/archive/test-dummy/2.0-2+nmu1' 1cff5f94270e50d8229e6bba3e77e4b20d0251d5 1445s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1445s => `767e77d2c98a23a3172eab0d45c507b43d0a0b57' 1445s + git verify-tag 767e77d2c98a23a3172eab0d45c507b43d0a0b57 1445s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1445s gpg: Signature made Mon Mar 31 23:11:15 2025 UTC 1445s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1445s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1445s gpg: WARNING: This key is not certified with a trusted signature! 1445s gpg: There is no indication that the signature belongs to the owner. 1445s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1445s + git update-ref 'refs/tags/test-dummy/2.0-2+nmu1' 767e77d2c98a23a3172eab0d45c507b43d0a0b57 1445s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1445s => `1' 1445s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/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' 1445s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1445s 6b22dd5..1b09bea 1b09bea8a4b0249eafd6d5623761abfa79446f68 -> refs/dgit/sid 1445s * [new tag] archive/test-dummy/2.0-2+nmu1 -> archive/test-dummy/2.0-2+nmu1 1445s * [new tag] test-dummy/2.0-2+nmu1 -> test-dummy/2.0-2+nmu1 1445s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 1b09bea8a4b0249eafd6d5623761abfa79446f68 1445s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A '../example_2.0-2+nmu1_source.changes' 1445s signfile dsc ../example_2.0-2+nmu1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1446s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1446s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1446s 1446s fixup_changes dsc ../example_2.0-2+nmu1.dsc ../example_2.0-2+nmu1_source.changes 1446s signfile changes ../example_2.0-2+nmu1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1446s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1446s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1446s 1446s Successfully signed dsc, changes files 1446s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy '../example_2.0-2+nmu1_source.changes' 1446s gpg: ../example_2.0-2+nmu1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1446s gpg: ../example_2.0-2+nmu1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1446s D: Setting host argument. 1446s Checking signature on .changes 1446s Checking signature on .dsc 1446s Uploading to test-dummy (via local to localhost): 1446s Successfully uploaded packages. 1446s dgit ok: pushed and uploaded 2.0-2+nmu1 1446s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1446s del_lrfetchrefs... 1446s del_lrfetchrefs: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit-fetch/test-dummy/dgit/sid 1446s del_lrfetchrefs: c7fbdf01d5593245424491530f0b2ea0a11f4209 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1446s del_lrfetchrefs: f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1446s del_lrfetchrefs: 449e30781112d560bc7b97962e396c421e5fc32f refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1446s del_lrfetchrefs: 32795f4c9a68a11dcb33896d2c390b0fe22168f1 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1446s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1446s ' 1446s + t-archive-process-incoming sid 1446s + local suite=sid 1446s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2+nmu1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2+nmu1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2+nmu1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1446s + t-archive-query sid 1446s + local suite=sid 1446s + local dscf=main/example_2.0-2+nmu1.dsc 1446s + t-archive-query-aq sid example 2.0-2+nmu1 main/example_2.0-2+nmu1.dsc 1446s + local suite=sid 1446s + local p=example 1446s + local v=2.0-2+nmu1 1446s + local dscf=main/example_2.0-2+nmu1.dsc 1446s + local sha 1446s ++ sha256sum 1446s + sha='df0d5af3911a4805877814e7491fb72f266c86767b1a247ce625393ffe05c659 -' 1446s + echo '2.0-2+nmu1 df0d5af3911a4805877814e7491fb72f266c86767b1a247ce625393ffe05c659 main/example_2.0-2+nmu1.dsc' 1446s + t-aq-archive-updated sid example 1446s + local suite=sid 1446s + local p=example 1446s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1446s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1446s + perl -wne ' 1446s use JSON; 1446s use strict; 1446s our @v; 1446s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1446s push @v, { 1446s "version" => "$1", 1446s "sha256sum" => "$2", 1446s "component" => "$3", 1446s "filename" => "$4", 1446s }; 1446s END { 1446s my $json = JSON->new->canonical(); 1446s print $json->encode(\@v) or die $!; 1446s } 1446s ' 1446s + : 'rebase nmu onto our branch' 1446s + t-git-next-date 1446s + GIT_COMMITTER_DATE='1530000007 +0100' 1446s + GIT_AUTHOR_DATE='1530000007 +0100' 1446s + git checkout master 1446s Switched to branch 'master' 1446s Your branch is ahead of 'origin/master' by 15 commits. 1446s (use "git push" to publish your local commits) 1446s + t-nmu-causes-ff-fail 1446s + t-dgit fetch 1446s + local dgit=dgit 1446s + pwd 1446s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1446s + : ' 1446s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1446s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch 1446s | git rev-parse --show-toplevel 1446s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1446s | git config -z --get-regexp --local '.*' 1446s | git config -z --get-regexp --local '.*' 1446s | git config -z --get-regexp --global '.*' 1446s | git config -z --get-regexp --system '.*' 1446s | git symbolic-ref -q HEAD 1446s => `refs/heads/master' 1446s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1446s canonical suite name for unstable is sid 1446s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1446s => `1' 1446s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1446s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1446s git_lrfetch_sane iteration 0 1446s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1446s => 1b09bea8a4b0249eafd6d5623761abfa79446f68 refs/dgit/sid 1446s => c7fbdf01d5593245424491530f0b2ea0a11f4209 refs/tags/archive/test-dummy/2.0-1 1446s => f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 refs/tags/archive/test-dummy/2.0-2 1446s => 1cff5f94270e50d8229e6bba3e77e4b20d0251d5 refs/tags/archive/test-dummy/2.0-2+nmu1 1446s => 449e30781112d560bc7b97962e396c421e5fc32f refs/tags/test-dummy/2.0-1 1446s => 32795f4c9a68a11dcb33896d2c390b0fe22168f1 refs/tags/test-dummy/2.0-2 1446s => 767e77d2c98a23a3172eab0d45c507b43d0a0b57 refs/tags/test-dummy/2.0-2+nmu1 1446s 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 1446s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1446s | git for-each-ref refs/dgit-fetch/test-dummy 1446s |> 1b09bea8a4b0249eafd6d5623761abfa79446f68 commit refs/dgit-fetch/test-dummy/dgit/sid 1446s |> c7fbdf01d5593245424491530f0b2ea0a11f4209 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1446s |> f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1446s |> 1cff5f94270e50d8229e6bba3e77e4b20d0251d5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2+nmu1 1446s |> 449e30781112d560bc7b97962e396c421e5fc32f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1446s |> 32795f4c9a68a11dcb33896d2c390b0fe22168f1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1446s |> 767e77d2c98a23a3172eab0d45c507b43d0a0b57 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2+nmu1 1446s git_lrfetch_sane: tidying any old suite lrfetchrefs 1446s | git for-each-ref refs/dgit-fetch/sid 1446s git_lrfetch_sane: git fetch --no-insane emulation complete 1446s $VAR1 = { 1446s 'refs/dgit-fetch/test-dummy/dgit/sid' => '1b09bea8a4b0249eafd6d5623761abfa79446f68', 1446s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => 'f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4', 1446s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2+nmu1' => '767e77d2c98a23a3172eab0d45c507b43d0a0b57', 1446s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => '32795f4c9a68a11dcb33896d2c390b0fe22168f1', 1446s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => 'c7fbdf01d5593245424491530f0b2ea0a11f4209', 1446s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2+nmu1' => '1cff5f94270e50d8229e6bba3e77e4b20d0251d5', 1446s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '449e30781112d560bc7b97962e396c421e5fc32f' 1446s }; 1446s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1446s |> c7fbdf01d5593245424491530f0b2ea0a11f4209 tag refs/tags/archive/test-dummy/2.0-1 1446s currently refs/tags/archive/test-dummy/2.0-1=c7fbdf01d5593245424491530f0b2ea0a11f4209 1446s |> f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 tag refs/tags/archive/test-dummy/2.0-2 1446s currently refs/tags/archive/test-dummy/2.0-2=f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 1446s |> 1cff5f94270e50d8229e6bba3e77e4b20d0251d5 tag refs/tags/archive/test-dummy/2.0-2+nmu1 1446s currently refs/tags/archive/test-dummy/2.0-2+nmu1=1cff5f94270e50d8229e6bba3e77e4b20d0251d5 1446s |> 449e30781112d560bc7b97962e396c421e5fc32f tag refs/tags/test-dummy/2.0-1 1446s currently refs/tags/test-dummy/2.0-1=449e30781112d560bc7b97962e396c421e5fc32f 1446s |> 32795f4c9a68a11dcb33896d2c390b0fe22168f1 tag refs/tags/test-dummy/2.0-2 1446s currently refs/tags/test-dummy/2.0-2=32795f4c9a68a11dcb33896d2c390b0fe22168f1 1446s |> 767e77d2c98a23a3172eab0d45c507b43d0a0b57 tag refs/tags/test-dummy/2.0-2+nmu1 1446s currently refs/tags/test-dummy/2.0-2+nmu1=767e77d2c98a23a3172eab0d45c507b43d0a0b57 1446s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1446s |> c7fbdf01d5593245424491530f0b2ea0a11f4209 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1446s offered refs/tags/archive/test-dummy/2.0-1=c7fbdf01d5593245424491530f0b2ea0a11f4209 1446s |> f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1446s offered refs/tags/archive/test-dummy/2.0-2=f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 1446s |> 1cff5f94270e50d8229e6bba3e77e4b20d0251d5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2+nmu1 1446s offered refs/tags/archive/test-dummy/2.0-2+nmu1=1cff5f94270e50d8229e6bba3e77e4b20d0251d5 1446s |> 449e30781112d560bc7b97962e396c421e5fc32f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1446s offered refs/tags/test-dummy/2.0-1=449e30781112d560bc7b97962e396c421e5fc32f 1446s |> 32795f4c9a68a11dcb33896d2c390b0fe22168f1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1446s offered refs/tags/test-dummy/2.0-2=32795f4c9a68a11dcb33896d2c390b0fe22168f1 1446s |> 767e77d2c98a23a3172eab0d45c507b43d0a0b57 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2+nmu1 1446s offered refs/tags/test-dummy/2.0-2+nmu1=767e77d2c98a23a3172eab0d45c507b43d0a0b57 1446s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1446s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.0-2+nmu1.dsc... 1446s get_archive_dsc: Version 2.0-2+nmu1 1446s last upload to archive: specified git info (test-dummy) 1446s GCF| git cat-file --batch 1446s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 1446s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 1446s GCF>| 1b09bea8a4b0249eafd6d5623761abfa79446f68 1446s GCF<| 1b09bea8a4b0249eafd6d5623761abfa79446f68 commit 350 1446s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s previous reference hash=1b09bea8a4b0249eafd6d5623761abfa79446f68 1446s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s fetch_from_archive: lastfetch=1b09bea8a4b0249eafd6d5623761abfa79446f68 1446s using existing example_2.0.orig.tar.gz 1446s | git merge-base 1b09bea8a4b0249eafd6d5623761abfa79446f68 1b09bea8a4b0249eafd6d5623761abfa79446f68 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s fetch mergeinfos: 1446s commit 1b09bea8a4b0249eafd6d5623761abfa79446f68 Dgit field in .dsc from archive 1446s fetch hash=1b09bea8a4b0249eafd6d5623761abfa79446f68 1446s | git merge-base 1b09bea8a4b0249eafd6d5623761abfa79446f68 1b09bea8a4b0249eafd6d5623761abfa79446f68 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s | git merge-base 1b09bea8a4b0249eafd6d5623761abfa79446f68 1b09bea8a4b0249eafd6d5623761abfa79446f68 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 1446s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 1446s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 1b09bea8a4b0249eafd6d5623761abfa79446f68 1446s | git log -n2 1b09bea8a4b0249eafd6d5623761abfa79446f68 1446s => `commit 1b09bea8a4b0249eafd6d5623761abfa79446f68'... 1446s is_gitattrs_setup: found nothing 1446s | git ls-tree -lrz -- 1b09bea8a4b0249eafd6d5623761abfa79446f68: 1446s dgit ok: fetched into refs/remotes/dgit/dgit/sid 1446s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1446s del_lrfetchrefs... 1446s del_lrfetchrefs: 1b09bea8a4b0249eafd6d5623761abfa79446f68 refs/dgit-fetch/test-dummy/dgit/sid 1446s del_lrfetchrefs: c7fbdf01d5593245424491530f0b2ea0a11f4209 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1446s del_lrfetchrefs: f3bc7f1ada88f0b974c2137cc7ae596e0b06eae4 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1446s del_lrfetchrefs: 1cff5f94270e50d8229e6bba3e77e4b20d0251d5 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2+nmu1 1446s del_lrfetchrefs: 449e30781112d560bc7b97962e396c421e5fc32f refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1446s del_lrfetchrefs: 32795f4c9a68a11dcb33896d2c390b0fe22168f1 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1446s del_lrfetchrefs: 767e77d2c98a23a3172eab0d45c507b43d0a0b57 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2+nmu1 1446s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1446s ' 1446s + t-expect-fail 'E:Not.*fast-forward' git merge --ff-only dgit/dgit/sid 1446s + local 'mpat=E:Not.*fast-forward' 1446s + shift 1446s + set +o pipefail 1446s + LC_MESSAGES=C 1446s + LANGUAGE=C 1446s + git merge --ff-only dgit/dgit/sid 1446s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1446s fatal: Not possible to fast-forward, aborting. 1446s + local 'ps=128 0' 1446s + set -o pipefail 1446s + case $ps in 1446s + t-grep-mpat 'E:Not.*fast-forward' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1446s + local 'mpat=E:Not.*fast-forward' 1446s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1446s + local grepper=fgrep 1446s + case "$mpat" in 1446s + case "$mpat" in 1446s + grepper=egrep 1446s + mpat='Not.*fast-forward' 1446s + egrep -e 'Not.*fast-forward' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1446s fatal: Not possible to fast-forward, aborting. 1446s + t-expect-fail 'E:-fdiverged.*refs/remotes/dgit/dgit/sid' t-git-debrebase 1446s + local 'mpat=E:-fdiverged.*refs/remotes/dgit/dgit/sid' 1446s + shift 1446s + set +o pipefail 1446s + LC_MESSAGES=C 1446s + LANGUAGE=C 1446s + t-git-debrebase 1446s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1446s + local gdr=git-debrebase 1446s + : ' 1446s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1446s + git-debrebase --dgit=dgit -D 1447s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1447s git-debrebase ffq check_specs * 1447s git-debrebase ffq merge master 1447s git-debrebase ffq check_remote origin remote fetch/merge branch 1447s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1447s OK, you are ahead of refs/remotes/origin/master 1447s git-debrebase ffq check_remote undef remote push branch 1447s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1447s git-debrebase: snag detected (-fdiverged): you have diverged from refs/remotes/dgit/dgit/sid 1447s 1447s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1447s + local 'ps=255 0' 1447s + set -o pipefail 1447s + case $ps in 1447s + t-grep-mpat 'E:-fdiverged.*refs/remotes/dgit/dgit/sid' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1447s + local 'mpat=E:-fdiverged.*refs/remotes/dgit/dgit/sid' 1447s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1447s + local grepper=fgrep 1447s + case "$mpat" in 1447s + case "$mpat" in 1447s + grepper=egrep 1447s + mpat='-fdiverged.*refs/remotes/dgit/dgit/sid' 1447s + egrep -e '-fdiverged.*refs/remotes/dgit/dgit/sid' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1447s git-debrebase: snag detected (-fdiverged): you have diverged from refs/remotes/dgit/dgit/sid 1447s + git checkout dgit/dgit/sid 1447s Note: switching to 'dgit/dgit/sid'. 1447s 1447s You are in 'detached HEAD' state. You can look around, make experimental 1447s changes and commit them, and you can discard any commits you make in this 1447s state without impacting any branches by switching back to a branch. 1447s 1447s If you want to create a new branch to retain commits you create, you may 1447s do so (now or later) by using -c with the switch command. Example: 1447s 1447s git switch -c 1447s 1447s Or undo this operation with: 1447s 1447s git switch - 1447s 1447s Turn off this advice by setting config variable advice.detachedHead to false 1447s 1447s HEAD is now at 1b09bea Commit patch queue (exported by git-debrebase) 1447s + t-expect-fail 'E:CONFLICT.*Commit patch queue' git rebase master 1447s + local 'mpat=E:CONFLICT.*Commit patch queue' 1447s + shift 1447s + set +o pipefail 1447s + LC_MESSAGES=C 1447s + LANGUAGE=C 1447s + git rebase master 1447s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1447s 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. 1447s error: could not apply 1b09bea... Commit patch queue (exported by git-debrebase) 1447s hint: Resolve all conflicts manually, mark them as resolved with 1447s hint: "git add/rm ", then run "git rebase --continue". 1447s hint: You can instead skip this commit: run "git rebase --skip". 1447s hint: To abort and get back to the state before "git rebase", run "git rebase --abort". 1447s Could not apply 1b09bea... Commit patch queue (exported by git-debrebase) 1447s + local 'ps=1 0' 1447s + set -o pipefail 1447s + case $ps in 1447s + t-grep-mpat 'E:CONFLICT.*Commit patch queue' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1447s + local 'mpat=E:CONFLICT.*Commit patch queue' 1447s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1447s + local grepper=fgrep 1447s + case "$mpat" in 1447s + case "$mpat" in 1447s + grepper=egrep 1447s + mpat='CONFLICT.*Commit patch queue' 1447s + egrep -e 'CONFLICT.*Commit patch queue' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1447s 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. 1447s + git rebase --skip 1447s Successfully rebased and updated detached HEAD. 1447s + git push . HEAD:master 1447s To . 1447s 74d5f58..6e3d7e5 HEAD -> master 1447s + git checkout master 1447s Switched to branch 'master' 1447s Your branch is ahead of 'origin/master' by 18 commits. 1447s (use "git push" to publish your local commits) 1447s + t-nmu-reconciled-good nmu 1447s + local nmutree=nmu 1447s + : 'check that what we have is what is expected' 1447s + git checkout -b compare.nmu origin/master~0 1447s Switched to a new branch 'compare.nmu' 1447s + git checkout nmu . 1447s Updated 4 paths from b5b2617 1447s + git rm -rf debian/patches 1447s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 1447s rm 'debian/patches/0002-Edit-the-.c-file.patch' 1447s rm 'debian/patches/0004-UPSTREAM-NMU.patch' 1447s rm 'debian/patches/series' 1447s rm 'debian/patches/subdir/addnewups' 1447s + git commit -m 'rm patches nmu' 1447s [compare.nmu b6a6629] rm patches nmu 1447s 6 files changed, 7 insertions(+), 50 deletions(-) 1447s delete mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1447s delete mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1447s delete mode 100644 debian/patches/series 1447s delete mode 100644 debian/patches/subdir/addnewups 1447s create mode 100644 newsrc.c 1447s + git checkout -b compare.maintainer origin/master~0 1447s Switched to a new branch 'compare.maintainer' 1447s + git checkout did.maintainer . 1447s Updated 3 paths from 27ebb24 1447s + git rm -rf --ignore-unmatch debian/patches 1447s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 1447s rm 'debian/patches/0002-Edit-the-.c-file.patch' 1447s rm 'debian/patches/series' 1447s rm 'debian/patches/subdir/addnewups' 1447s + git commit --allow-empty -m 'rm patches maintainer' 1447s [compare.maintainer c6ef209] rm patches maintainer 1447s 7 files changed, 10 insertions(+), 50 deletions(-) 1447s delete mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1447s delete mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1447s delete mode 100644 debian/patches/series 1447s delete mode 100644 debian/patches/subdir/addnewups 1447s create mode 100644 debian/zorkmid 1447s + git merge compare.nmu 1447s Auto-merging debian/changelog 1447s Merge made by the 'ort' strategy. 1447s debian/changelog | 6 ++++++ 1447s newsrc.c | 1 + 1447s 2 files changed, 7 insertions(+) 1447s create mode 100644 newsrc.c 1447s + git diff --quiet master 1447s + : 'check that dgit still likes it' 1447s + git checkout master 1447s Switched to branch 'master' 1447s Your branch is ahead of 'origin/master' by 18 commits. 1447s (use "git push" to publish your local commits) 1447s + t-dgit -wgf quilt-fixup 1447s + local dgit=dgit 1447s + pwd 1447s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1447s + : ' 1447s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1447s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf quilt-fixup 1447s | git rev-parse --show-toplevel 1447s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1447s | git config -z --get-regexp --local '.*' 1447s | git config -z --get-regexp --local '.*' 1447s | git config -z --get-regexp --global '.*' 1447s | git config -z --get-regexp --system '.*' 1447s format 3.0 (quilt), quilt mode linear 1447s Format `3.0 (quilt)', need to check/update patch stack 1447s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1447s => `' 1447s + git diff --quiet HEAD 1447s + git clean -xdff 1447s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1447s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1447s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1447s | git rev-parse 'HEAD~0' 1447s => `6e3d7e5dc883530475bbf126c39e6594671419bd' 1447s | git symbolic-ref -q HEAD 1447s => `refs/heads/master' 1447s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1447s CD work 1447s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1447s + git reset -q --hard 6e3d7e5dc883530475bbf126c39e6594671419bd 1447s examining quilt state (multiple patches, linear mode) 1447s branch_is_gdr 6e3d7e5dc883530475bbf126c39e6594671419bd... 1447s branch_is_gdr 74d5f586ed443ce47434f30fbbeff3eacb36748d gdr pseudomerge YES 1447s + git reset -q --hard 6e3d7e5dc883530475bbf126c39e6594671419bd 1447s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1448s HEAD is now at 21f6391 Commit patch queue (exported by git-debrebase) 1448s | git rev-parse 'HEAD~0' 1448s => `21f639160e5dacd131368f53dfa4359a434ed750' 1448s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1448s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1448s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1448s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1448s CD fake 1448s | find -name .git -prune -print0 1448s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1448s + git checkout -f 21f639160e5dacd131368f53dfa4359a434ed750 -- debian 1448s + git add -Af . 1448s | git write-tree 1448s => `1fa546e6d762855593875b228f8ace524e583faa' 1448s fake orig tree object 1fa546e6d762855593875b228f8ace524e583faa 1448s CD .. 1448s + git reset -q --hard 21f639160e5dacd131368f53dfa4359a434ed750 1448s CD ../fake 1448s + git add -Af . 1448s | git write-tree 1448s => `4f034dbfc0af0cdca7861e42ea8735719d11b63f' 1448s fake o+d/p tree object 1fa546e6d762855593875b228f8ace524e583faa 1448s CD ../work 1448s | git ls-tree --name-only -z 21f639160e5dacd131368f53dfa4359a434ed750 1448s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 1448s | git diff-tree -z --no-renames -r 1fa546e6d762855593875b228f8ace524e583faa 21f639160e5dacd131368f53dfa4359a434ed750 1448s => `: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' 1448s quiltify_trees_differ 1fa546e6d762855593875b228f8ace524e583faa 21f639160e5dacd131368f53dfa4359a434ed750 => 1 1448s | git diff-tree -z --no-renames --name-only -r 21f639160e5dacd131368f53dfa4359a434ed750 4f034dbfc0af0cdca7861e42ea8735719d11b63f 1448s => `' 1448s quiltify_trees_differ 21f639160e5dacd131368f53dfa4359a434ed750 4f034dbfc0af0cdca7861e42ea8735719d11b63f => 0 1448s | git diff-tree -z --no-renames --name-only -r 1fa546e6d762855593875b228f8ace524e583faa 4f034dbfc0af0cdca7861e42ea8735719d11b63f 1448s => `lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 1448s quiltify_trees_differ 1fa546e6d762855593875b228f8ace524e583faa 4f034dbfc0af0cdca7861e42ea8735719d11b63f => 1 1448s differences @dl ## ## == == == ==. 1448s dgit: base trees orig=1fa546e6d76285559387 o+d/p=4f034dbfc0af0cdca786 1448s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1448s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1448s starting quiltify (multiple patches, linear mode) 1448s | git ls-tree --name-only 21f639160e5dacd131368f53dfa4359a434ed750 -- debian/rules debian/control 1448s => `debian/control'... 1448s quiltify investigate 21f639160e5dacd131368f53dfa4359a434ed750 1448s | git diff-tree -z --no-renames --name-only 21f639160e5dacd131368f53dfa4359a434ed750 4f034dbfc0af0cdca7861e42ea8735719d11b63f 1448s => `' 1448s quiltify_trees_differ 21f639160e5dacd131368f53dfa4359a434ed750 4f034dbfc0af0cdca7861e42ea8735719d11b63f => 0 1448s search finished hooray! 1448s quiltify linearisation planning successful, executing... 1448s + git checkout -q master 1448s | git status --ignored --porcelain 1448s => `?? .pc/' 1448s nothing quilty to commit, ok. 1448s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1448s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1448s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1448s ' 1448s + t-ok 1448s + : ======================================== 1448s + t-check-only-bpd 1448s + '[' .. = .. ']' 1448s + return 1448s + t-fscks 1448s + shopt -s nullglob 1448s + for d in $tmp/*/.git $tmp/git/*.git 1448s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1448s + t-git-fsck 1448s ++ git rev-parse --git-dir 1448s + local fsckerrs=.git/dgit-test-fsck.errs 1448s + set +e 1448s + LC_MESSAGES=C 1448s + git fsck --no-dangling --strict 1448s + tee .git/dgit-test-fsck.errs 1448s + ps='0 0' 1448s + set -e 1448s + local pats 1448s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1448s + test '0 0' = '0 0' 1448s + pats+=(-e 'notice: HEAD points to an unborn branch') 1448s + pats+=(-e 'notice: No default references') 1448s + set +e 1448s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1448s + rc=1 1448s + set -e 1448s + case $rc in 1448s + for d in $tmp/*/.git $tmp/git/*.git 1448s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1448s + t-git-fsck 1448s ++ git rev-parse --git-dir 1448s + local fsckerrs=./dgit-test-fsck.errs 1448s + set +e 1448s + LC_MESSAGES=C 1448s + git fsck --no-dangling --strict 1448s + tee ./dgit-test-fsck.errs 1448s notice: HEAD points to an unborn branch (master) 1448s + ps='0 0' 1448s + set -e 1448s + local pats 1448s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1448s + test '0 0' = '0 0' 1448s + pats+=(-e 'notice: HEAD points to an unborn branch') 1448s + pats+=(-e 'notice: No default references') 1448s + set +e 1448s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1448s + rc=1 1448s + set -e 1448s + case $rc in 1448s + t-save-artifacts 1448s + artifacts=/tmp/autopkgtest.XK8uun/gdr-diverge-nmu-dgit-artifacts 1448s + '[' x/tmp/autopkgtest.XK8uun/gdr-diverge-nmu-dgit-artifacts = x ']' 1448s + '[' xtmp = x ']' 1448s + GZIP=-1v 1448s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-diverge-nmu-dgit-artifacts/gdr-diverge-nmu-dgit.tar.gz '--exclude=*.tar' . 1448s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1448s 80.8% 1448s + echo ok. 1448s ok. 1448s + rc=0 1448s + set +x 1448s + set +e 1448s + pwd 1448s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1448s + '[' x '!=' x ']' 1448s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1448s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1448s + set -e 1448s + test 0 = 0 1449s autopkgtest [23:11:19]: test gdr-diverge-nmu-dgit: -----------------------] 1449s gdr-diverge-nmu-dgit PASS 1449s autopkgtest [23:11:19]: test gdr-diverge-nmu-dgit: - - - - - - - - - - results - - - - - - - - - - 1450s autopkgtest [23:11:20]: test gdr-edits: preparing testbed 1450s Reading package lists... 1450s Building dependency tree... 1450s Reading state information... 1450s Starting pkgProblemResolver with broken count: 0 1450s Starting 2 pkgProblemResolver with broken count: 0 1450s Done 1451s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1452s autopkgtest [23:11:22]: test gdr-edits: [----------------------- 1452s ++ set -o pipefail 1452s ++ . tests/lib-core 1452s ++ . tests/lib-restricts 1452s ++ trap ' 1452s rc=$? 1452s set +x 1452s test $rc = 0 || echo " 1452s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1452s 1452s Most relevant logs are just before assignment rc=$rc 1452s Will now do cleanup etc. 1452s " 1452s set -x 1452s set +e 1452s pwd 1452s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1452s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1452s set -e 1452s test $rc = 0 || t-report-failure 1452s ' EXIT 1452s ++ t-filter-out-git-hyphen-dir 1452s ++ local pathent 1452s +++ type -p git-rev-parse 1452s +++ : 1452s ++ pathent= 1452s ++ case "$pathent" in 1452s ++ return 1452s ++ t-set-intree 1452s ++ '[' x = x ']' 1452s ++ return 1452s ++ : -D 1452s ++ export DGIT_TEST_DEBUG 1452s ++ : x 1452s ++ export DGIT_TEST_DEBPUSH_DEBUG 1452s ++ : 1452s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1452s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1452s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1452s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1452s ++ export LC_CTYPE=C.UTF-8 1452s ++ LC_CTYPE=C.UTF-8 1452s ++ unset CDPATH 1452s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1452s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1452s +++ pwd 1452s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1452s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1452s ++ testname=gdr-edits 1452s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1452s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1452s ++ bpd=.. 1452s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1452s ++ '[' x '!=' x ']' 1452s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s +++ pwd 1452s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ t-set-using-tmp 1452s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1452s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1452s ++ export 'DEBFULLNAME=dgit test git user' 1452s ++ DEBFULLNAME='dgit test git user' 1452s ++ git config --global user.email dgit-test@debian.example.net 1452s ++ git config --global user.name 'dgit test git user' 1452s ++ git config --global protocol.ext.allow always 1452s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1452s ++ env -0 1452s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1452s ++ export DEBCHANGE_VENDOR=dpkg 1452s ++ DEBCHANGE_VENDOR=dpkg 1452s ++ unset VISUAL 1452s ++ unset GIT_EDITOR 1452s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1452s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1452s ++ cat 1452s ++ schroot=build 1452s ++ : aq 1452s ++ : archive/test-dummy 1452s ++ : sid:unstable 1452s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1452s ++ git config --global dgit.default.old-dsc-distro test-dummy 1452s ++ for import in ${autoimport-gnupg} 1452s ++ case "$0" in 1452s ++ t-setup-import gnupg 1452s ++ local setupname=gnupg 1452s ++ local setupsrc 1452s ++ local lock 1452s ++ '[' x = x ']' 1452s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1452s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1452s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1452s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1452s cd "$1"; shift 1452s setupname="$1"; shift 1452s simport="$1"; shift 1452s if [ -e "$simport" ]; then exit 0; fi 1452s env - "$@" \ 1452s "tests/setup/$setupname" 1452s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1452s + cd /tmp/autopkgtest.XK8uun/build.980/src 1452s + shift 1452s + setupname=gnupg 1452s + shift 1452s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1452s + shift 1452s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1452s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-edits-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-edits-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-edits-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-edits -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-edits' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-edits-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1452s ++ set -o pipefail 1452s ++ . tests/lib-core 1452s ++ . tests/lib-restricts 1452s ++ trap ' 1452s rc=$? 1452s set +x 1452s test $rc = 0 || echo " 1452s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1452s 1452s Most relevant logs are just before assignment rc=$rc 1452s Will now do cleanup etc. 1452s " 1452s set -x 1452s set +e 1452s pwd 1452s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1452s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1452s set -e 1452s test $rc = 0 || t-report-failure 1452s ' EXIT 1452s ++ t-filter-out-git-hyphen-dir 1452s ++ local pathent 1452s +++ type -p git-rev-parse 1452s +++ : 1452s ++ pathent= 1452s ++ case "$pathent" in 1452s ++ return 1452s ++ t-set-intree 1452s ++ '[' x = x ']' 1452s ++ return 1452s ++ : -D 1452s ++ export DGIT_TEST_DEBUG 1452s ++ : x 1452s ++ export DGIT_TEST_DEBPUSH_DEBUG 1452s ++ : 1452s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1452s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1452s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1452s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1452s ++ export LC_CTYPE=C.UTF-8 1452s ++ LC_CTYPE=C.UTF-8 1452s ++ unset CDPATH 1452s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1452s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1452s +++ pwd 1452s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1452s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1452s ++ testname=gnupg 1452s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1452s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1452s ++ bpd=.. 1452s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1452s ++ '[' x '!=' x ']' 1452s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s +++ pwd 1452s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ t-set-using-tmp 1452s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1452s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1452s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1452s ++ export 'DEBFULLNAME=dgit test git user' 1452s ++ DEBFULLNAME='dgit test git user' 1452s ++ git config --global user.email dgit-test@debian.example.net 1452s ++ git config --global user.name 'dgit test git user' 1452s ++ git config --global protocol.ext.allow always 1452s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1452s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1452s ++ export DEBCHANGE_VENDOR=dpkg 1452s ++ DEBCHANGE_VENDOR=dpkg 1452s ++ unset VISUAL 1452s ++ unset GIT_EDITOR 1452s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1452s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1452s ++ cat 1452s ++ schroot=build 1452s ++ : aq 1452s ++ : archive/test-dummy 1452s ++ : sid:unstable 1452s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1452s ++ git config --global dgit.default.old-dsc-distro test-dummy 1452s ++ for import in ${autoimport-gnupg} 1452s ++ case "$0" in 1452s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1452s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1452s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1452s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1452s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1452s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1452s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1452s + setup=' 1452s export GNUPGHOME=$tmp/gnupg 1452s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1452s 1452s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1452s ssb rsa2048 2013-11-17 [E] 1452s 1452s sec rsa2048 2014-01-26 [SC] 1452s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1452s uid [ultimate] Populus Romanus (test key) 1452s ssb rsa2048 2014-01-26 [E] 1452s 1452s sec rsa2048 2014-01-26 [SC] 1452s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1452s uid [ unknown] Hannibal (test key) 1452s ssb rsa2048 2014-01-26 [E] 1452s 1452s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1452s export GNUPGHOME=$tmp/gnupg 1452s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1452s 1452s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 1452s delete mode 100644 debian/source/format 1452s + git tag v1.0 1452s + : 'fake up that our quilt-tip was descended from upstream' 1452s + git checkout quilt-tip 1452s Switched to branch 'quilt-tip' 1452s + git merge --no-edit -s ours upstream 1452s Merge made by the 'ours' strategy. 1452s + : 'fake up that our quilt-tip had the patch queue in it' 1452s + git checkout patch-queue/quilt-tip 1452s Switched to branch 'patch-queue/quilt-tip' 1452s + gbp pq export 1453s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1453s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1453s + git add debian/patches 1453s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 1453s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 1453s 4 files changed, 50 insertions(+) 1453s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1453s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1453s create mode 100644 debian/patches/series 1453s create mode 100644 debian/patches/subdir/addnewups 1453s + : 'make branch names more conventional' 1453s + git branch -D master 1453s Deleted branch master (was 17d67db). 1453s + git branch -m quilt-tip master 1453s + not-gdr-processable origin 1453s + git branch gdr-unprocessable/origin 1453s + t-git-debrebase analyse 1453s + local gdr=git-debrebase 1453s + : ' 1453s + grep 'Unknown Unprocessable' 1453s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1453s + git-debrebase --dgit=dgit -D analyse 1453s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 1453s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1453s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1453s git-debrebase = AddPatches {"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n"} 1453s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1453s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1453s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1453s git-debrebase = Pseudomerge {"Overwritten" => [{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Ix" => 1,"Differs" => 48}],"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","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},$VAR1->{"Overwritten"}[0]],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge"} 1453s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1453s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1453s git-debrebase = Upstream {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Type" => "Upstream","Msg" => "Add *.o to .gitignore\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0,"Differs" => 2}]} 1453s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1453s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1453s git-debrebase = Mixed {"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Type" => "Mixed","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b"} 1453s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1453s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1453s 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","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}],"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165"} 1453s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1453s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1453s git-debrebase = Packaging {"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","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}]} 1453s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1453s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1453s git-debrebase = Packaging {"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32,"Ix" => 0}],"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Type" => "Packaging","Msg" => "WIP\n"} 1453s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1453s git-debrebase ** Unknown 1453s git-debrebase *** WALK BOMB unrecognised 1453s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1453s ' 1453s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1453s + : 'fake up an upstream 2.0' 1453s + git branch make-upstream upstream 1453s + t-make-new-upstream-tarball 2.0 1453s + local uv=2.0 1453s + git checkout make-upstream 1453s Switched to branch 'make-upstream' 1453s + echo 'upstream 2.0' 1453s + git commit -a -m 'upstream 2.0 tarball' 1453s [make-upstream 4db56a8] upstream 2.0 tarball 1453s 1 file changed, 1 insertion(+) 1453s + t-make-orig example 2.0 make-upstream 1453s + local p=example 1453s + local v=2.0 1453s + local tag=make-upstream 1453s + ust=example_2.0.orig.tar.gz 1453s + GZIP=-1 1453s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1453s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1453s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1453s + git branch -D quilt-tip-2 1453s Deleted branch quilt-tip-2 (was 99fcab4). 1453s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1453s + git branch -D gitish-only 1453s Deleted branch gitish-only (was 2b2ddc8). 1453s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1453s + git branch -D quilt-tip-1.1 1453s Deleted branch quilt-tip-1.1 (was 7fc34be). 1453s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1453s + git branch -D patch-queue/quilt-tip 1453s Deleted branch patch-queue/quilt-tip (was d843a68). 1453s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1453s + git branch -D indep-arch 1453s Deleted branch indep-arch (was e215729). 1453s + : 'see what gbp import-orig does' 1453s + git checkout master 1453s Switched to branch 'master' 1453s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1453s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1453s gbp:info: Source package is example 1453s gbp:info: Upstream version is 2.0 1453s gbp:info: Replacing upstream source on 'master' 1453s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1453s + not-gdr-processable merge 1453s + git branch gdr-unprocessable/merge 1453s + t-git-debrebase analyse 1453s + local gdr=git-debrebase 1453s + : ' 1453s + grep 'Unknown Unprocessable' 1453s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1453s + git-debrebase --dgit=dgit -D analyse 1453s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 1453s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1453s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1453s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1453s git-debrebase ** Unknown 1453s git-debrebase *** WALK BOMB unrecognised 1453s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1453s ' 1453s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 1453s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1453s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1453s + DEBEMAIL=dgit-tests@example.org 1453s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1453s + 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) 1453s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1453s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1453s 1 file changed, 6 insertions(+) 1453s + t-dch-commit-r 1453s + t-dch-r-rune t-dch-commit 1453s + local cmd=t-dch-commit 1453s + shift 1453s + local suite=unstable 1453s + t-dch-commit -r -D unstable '' 1453s + t-debchange -r -D unstable '' 1453s + DEBEMAIL=dgit-tests@example.org 1453s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1453s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1453s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1453s libdistro-info-perl is not installed, Debian release names are not known. 1453s libdistro-info-perl is not installed, Ubuntu release names are not known. 1453s + git commit -m 'dch -r -D unstable ' debian/changelog 1453s [master f31021f] dch -r -D unstable 1453s 1 file changed, 3 insertions(+), 2 deletions(-) 1453s + echo garbage 1453s + git add debian/patches/garbage 1453s + git commit -m 'add garbage' debian/patches/garbage 1453s [master eb10718] add garbage 1453s 1 file changed, 1 insertion(+) 1453s create mode 100644 debian/patches/garbage 1453s + t-archive-none example 1453s + t-select-package example 1453s + p=example 1453s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1453s + t-archive-none-aq 1453s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 1453s + : 1453s + local 'jsondelim=[' 1453s + local suitespec 1453s + for suitespec in $suitespecs 1453s + local suite=sid 1453s + local sname=unstable 1453s + t-aq-archive-updated sid example 1453s + local suite=sid 1453s + local p=example 1453s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1453s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1453s + perl -wne ' 1453s use JSON; 1453s use strict; 1453s our @v; 1453s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1453s push @v, { 1453s "version" => "$1", 1453s "sha256sum" => "$2", 1453s "component" => "$3", 1453s "filename" => "$4", 1453s }; 1453s END { 1453s my $json = JSON->new->canonical(); 1453s print $json->encode(\@v) or die $!; 1453s } 1453s ' 1453s + t-aq-archive-updated new example 1453s + local suite=new 1453s + local p=example 1453s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1453s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1453s + perl -wne ' 1453s use JSON; 1453s use strict; 1453s our @v; 1453s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1453s push @v, { 1453s "version" => "$1", 1453s "sha256sum" => "$2", 1453s "component" => "$3", 1453s "filename" => "$4", 1453s }; 1453s END { 1453s my $json = JSON->new->canonical(); 1453s print $json->encode(\@v) or die $!; 1453s } 1453s ' 1453s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1453s + cat 1453s + jsondelim=' },' 1453s + cat 1453s + t-git-none 1453s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1453s + set -e 1453s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1453s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1453s + t-dgit -wgf --gbp push-source --new 1453s + local dgit=dgit 1453s + pwd 1453s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1453s + : ' 1453s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1453s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 1454s | git rev-parse --show-toplevel 1454s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1454s | git config -z --get-regexp --local '.*' 1454s | git config -z --get-regexp --local '.*' 1454s | git config -z --get-regexp --global '.*' 1454s | git config -z --get-regexp --system '.*' 1454s format 3.0 (quilt), quilt mode gbp 1454s Format `3.0 (quilt)', need to check/update patch stack 1454s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1454s => `' 1454s + git diff --quiet HEAD 1454s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1454s canonical suite name for unstable is sid 1454s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1454s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1454s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1454s | git rev-parse 'HEAD~0' 1454s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1454s | git symbolic-ref -q HEAD 1454s => `refs/heads/master' 1454s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1454s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1454s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1454s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1454s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1454s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 99faa1474bbee6e3ccd4612347ee724b418c4b9e200f5b8fc48988e9bf6071bd 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1454s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1454s >(no reflog) 1454s splitbrain cache miss 1454s CD work 1454s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1454s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1454s + git checkout -q -b dgit-view 1454s examining quilt state (multiple patches, gbp mode) 1454s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1454s CD fake 1454s | find -name .git -prune -print0 1454s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1454s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 1454s + git add -Af . 1454s | git write-tree 1454s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 1454s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1454s CD .. 1454s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1454s CD ../fake 1454s + git add -Af . 1454s | git write-tree 1454s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1454s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1454s CD ../work 1454s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 1454s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 1454s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 1454s => `' 1454s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 1454s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 1454s => `lib.c\x00new-upstream-file\x00src.c\x00' 1454s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1454s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 1454s => `lib.c\x00new-upstream-file\x00src.c\x00' 1454s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1454s differences @dl == ## ## == == ==. 1454s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 1454s dgit: quilt differences: src: == orig ## gitignores: == orig == 1454s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1454s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1454s => `1530000000 +0000' 1454s dgit view: creating patches-applied version using gbp pq 1454s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 1454s + git update-ref refs/heads/dgit-view HEAD 1454s + git checkout -q dgit-view 1454s | git rev-parse 'HEAD~0' 1454s => `45ea71a69fa522ce760afdab8a420200443753e9' 1454s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1454s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 1454s => `' 1454s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 99faa1474bbee6e3ccd4612347ee724b418c4b9e200f5b8fc48988e9bf6071bd 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 1454s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 1454s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1454s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1454s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1454s | git rev-parse 'HEAD~0' 1454s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1454s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1454s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1454s dpkg-source: info: using source format '3.0 (quilt)' 1454s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1454s dpkg-source: info: using patch list from debian/patches/series 1454s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 1454s dpkg-source: info: building example in example_2.0-1.dsc 1454s CD work 1454s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1454s package seems new, not specifying -v 1454s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 1455s dpkg-genchanges: info: not including original source code in upload 1455s CD .. 1455s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1455s renaming (Files) example_2.0.orig.tar.gz 1455s renaming (Files) example_2.0-1.debian.tar.xz 1455s renaming (dsc) example_2.0-1.dsc 1455s renaming (changes) example_2.0-1_source.changes 1455s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1455s actually entering push 1455s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1455s => `0' 1455s + git config remote.dgit.skipdefaultupdate true 1455s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1455s get_archive_dsc: nothing in archive, returning undef 1455s no version available from the archive 1455s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1455s => `' 1455s previous reference hash= 1455s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1455s => `' 1455s fetch_from_archive: lastfetch= 1455s nothing found! 1455s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1455s + git check-ref-format archive/test-dummy/2.0-1 1455s | git symbolic-ref -q HEAD 1455s => `refs/heads/master' 1455s | git rev-parse 'HEAD~0' 1455s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1455s ffq_prev_branchinfo branch current refs/heads/master 1455s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1455s => `' 1455s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1455s => `' 1455s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1455s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1455s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1455s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1455s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1455s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 99faa1474bbee6e3ccd4612347ee724b418c4b9e200f5b8fc48988e9bf6071bd 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1455s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1455s CD work 1455s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1455s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1455s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1455s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 1455s splitbrain_pseudomerge... 1455s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1455s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1455s => `' 1455s + git diff --quiet HEAD 1455s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 1455s => `' 1455s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1455s checking that example_2.0-1.dsc corresponds to HEAD 1455s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc 1455s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc) 1455s dpkg-source: info: extracting example in example-2.0 1455s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1455s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 1455s dpkg-source: info: using patch list from debian/patches/series 1455s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1455s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1455s dpkg-source: info: applying subdir/addnewups 1455s CD example-2.0 1455s | find -name .git -prune -print0 1455s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1455s + git add -Af . 1455s | git write-tree 1455s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1455s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1455s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1455s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1455s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1455s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 1455s files_compare_inputs example_2.0-1.dsc 1455s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 1455s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1455s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 1455s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 1455s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1455s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 1455s files_compare_inputs example_2.0-1.dsc Files 1455s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 1455s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 1455s files_compare_inputs example_2.0-1_source.changes 1455s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 1455s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 1455s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 1455s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 1455s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 1455s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 1455s files_compare_inputs example_2.0-1_source.changes Files 1455s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 1455s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 1455s checking origs needed (2.0)... 1455s checking origs needed placement 'devel extra'... 1455s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1455s origs example_2.0.orig.tar.gz is_orig 1455s -| sh -ec 'cd "$1"; shift 1455s 1455s find -name "$1" -print0 | 1455s xargs -0r sha256sum 1455s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1455s origs example_2.0.orig.tar.gz $#$have=-1 1455s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1455s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 1455s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1455s push_tagwants: $VAR1 = [ 1455s '2.0-1', 1455s '45ea71a69fa522ce760afdab8a420200443753e9', 1455s 'eb10718ab213ccfa83613ebbddefbffda941a548', 1455s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1455s ]; 1455s $VAR2 = [ 1455s { 1455s 'Tag' => 'archive/test-dummy/2.0-1', 1455s 'View' => 'dgit', 1455s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1455s 'TfSuffix' => '', 1455s 'Tfn' => sub { "DUMMY" }, 1455s 'TagFn' => sub { "DUMMY" } 1455s }, 1455s { 1455s 'TagFn' => sub { "DUMMY" }, 1455s 'Tfn' => sub { "DUMMY" }, 1455s 'TfSuffix' => '-maintview', 1455s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 1455s 'View' => 'maint', 1455s 'Tag' => 'test-dummy/2.0-1' 1455s } 1455s ]; 1455s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1455s => `1530000000 +0000' 1455s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1455s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1455s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1455s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 1455s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1455s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 1455s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1455s => `95163808096ecc72500a41bf930ff04d7f20b577' 1455s + git verify-tag 95163808096ecc72500a41bf930ff04d7f20b577 1455s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1455s gpg: Signature made Mon Mar 31 23:11:25 2025 UTC 1455s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1455s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1455s gpg: WARNING: This key is not certified with a trusted signature! 1455s gpg: There is no indication that the signature belongs to the owner. 1455s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1455s + git update-ref refs/tags/archive/test-dummy/2.0-1 95163808096ecc72500a41bf930ff04d7f20b577 1455s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 1455s => `8fd01e541f0f80470af54cc3ccb229f586c2a7ef' 1455s + git verify-tag 8fd01e541f0f80470af54cc3ccb229f586c2a7ef 1455s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1455s gpg: Signature made Mon Mar 31 23:11:25 2025 UTC 1455s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1455s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1455s gpg: WARNING: This key is not certified with a trusted signature! 1455s gpg: There is no indication that the signature belongs to the owner. 1455s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1455s + git update-ref refs/tags/test-dummy/2.0-1 8fd01e541f0f80470af54cc3ccb229f586c2a7ef 1455s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1455s => `0' 1455s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 1455s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 1455s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1455s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 1455s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 1455s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 1455s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 1455s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 1455s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1455s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1456s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1456s 1456s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 1456s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1456s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1456s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1456s 1456s Successfully signed dsc, changes files 1456s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 1456s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1456s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1456s D: Setting host argument. 1456s Checking signature on .changes 1456s Checking signature on .dsc 1456s Uploading to test-dummy (via local to localhost): 1456s Successfully uploaded packages. 1456s dgit ok: pushed and uploaded 2.0-1 1456s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1456s del_lrfetchrefs... 1456s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1456s ' 1456s + t-salsa-add-remote 1456s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1456s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1456s + set -e 1456s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1456s + git init --bare 1456s hint: Using 'master' as the name for the initial branch. This default branch name 1456s hint: is subject to change. To configure the initial branch name to use in all 1456s hint: of your new repositories, which will suppress this warning, call: 1456s hint: 1456s hint: git config --global init.defaultBranch 1456s hint: 1456s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1456s hint: 'development'. The just-created branch can be renamed via this command: 1456s hint: 1456s hint: git branch -m 1456s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example/ 1456s + git remote add origin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1456s + git push --set-upstream origin master 1456s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1456s * [new branch] master -> master 1456s Branch 'master' set up to track remote branch 'master' from 'origin'. 1456s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1456s + local 'mpat=E:identical in upstream files' 1456s + shift 1456s + set +o pipefail 1456s + LC_MESSAGES=C 1456s + LANGUAGE=C 1456s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1456s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1456s + local gdr=git-debrebase 1456s + : ' 1456s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1456s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1456s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1456s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 1456s docs/README | 1 + 1456s 1 file changed, 1 insertion(+) 1456s 1456s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1456s git-debrebase: identical in upstream files. See diffstat above, or run 1456s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 1456s + local 'ps=255 0' 1456s + set -o pipefail 1456s + case $ps in 1456s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1456s + local 'mpat=E:identical in upstream files' 1456s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1456s + local grepper=fgrep 1456s + case "$mpat" in 1456s + case "$mpat" in 1456s + grepper=egrep 1456s + mpat='identical in upstream files' 1456s + egrep -e 'identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1456s git-debrebase: identical in upstream files. See diffstat above, or run 1456s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1456s + local 'mpat=E:Unused patch file garbage will be discarded' 1456s + shift 1456s + set +o pipefail 1456s + LC_MESSAGES=C 1456s + LANGUAGE=C 1456s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1456s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1456s + local gdr=git-debrebase 1456s + : ' 1456s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1456s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1456s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1456s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1456s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1456s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1457s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1457s $VAR2 = bless( do{\(my $o = { 1457s 'name' => 'debian/changelog, entry no.1', 1457s 'in_order' => [ 1457s 'Source', 1457s 'Version', 1457s 'Distribution', 1457s 'Urgency', 1457s 'Maintainer', 1457s 'Timestamp', 1457s 'Date', 1457s 'Changes' 1457s ], 1457s 'keep_duplicate' => 0, 1457s 'allow_pgp' => 1, 1457s 'drop_empty' => 0, 1457s 'is_pgp_signed' => 0, 1457s 'fields' => { 1457s 'Source' => 'example', 1457s 'Version' => '2.0-1', 1457s 'Distribution' => 'unstable', 1457s 'Urgency' => 'medium', 1457s 'Maintainer' => 'dgit test git user ', 1457s 'Timestamp' => '1530000000', 1457s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1457s 'Changes' => ' 1457s example (2.0-1) unstable; urgency=medium 1457s 1457s [ Ian Jackson ] 1457s * new upstream (did gbp import-orig)' 1457s }, 1457s 'out_order' => [], 1457s 'allow_duplicate' => 0 1457s })}, 'Dpkg::Control::Hash' ); 1457s last finished-looking changelog entry: (2.0-1) unstable 1457s will stitch in dgit view, archive/test-dummy/2.0-1 1457s git-debrebase: snags: 1 overriden by individual -f options 1457s 1457s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1457s + local 'ps=255 0' 1457s + set -o pipefail 1457s + case $ps in 1457s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1457s + local 'mpat=E:Unused patch file garbage will be discarded' 1457s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1457s + local grepper=fgrep 1457s + case "$mpat" in 1457s + case "$mpat" in 1457s + grepper=egrep 1457s + mpat='Unused patch file garbage will be discarded' 1457s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1457s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1457s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1457s + local gdr=git-debrebase 1457s + : ' 1457s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1457s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1457s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1457s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1457s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1457s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1457s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1457s $VAR2 = bless( do{\(my $o = { 1457s 'out_order' => [], 1457s 'allow_pgp' => 1, 1457s 'allow_duplicate' => 0, 1457s 'is_pgp_signed' => 0, 1457s 'in_order' => [ 1457s 'Source', 1457s 'Version', 1457s 'Distribution', 1457s 'Urgency', 1457s 'Maintainer', 1457s 'Timestamp', 1457s 'Date', 1457s 'Changes' 1457s ], 1457s 'fields' => { 1457s 'Source' => 'example', 1457s 'Version' => '2.0-1', 1457s 'Distribution' => 'unstable', 1457s 'Urgency' => 'medium', 1457s 'Maintainer' => 'dgit test git user ', 1457s 'Timestamp' => '1530000000', 1457s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1457s 'Changes' => ' 1457s example (2.0-1) unstable; urgency=medium 1457s 1457s [ Ian Jackson ] 1457s * new upstream (did gbp import-orig)' 1457s }, 1457s 'keep_duplicate' => 0, 1457s 'name' => 'debian/changelog, entry no.1', 1457s 'drop_empty' => 0 1457s })}, 'Dpkg::Control::Hash' ); 1457s last finished-looking changelog entry: (2.0-1) unstable 1457s will stitch in dgit view, archive/test-dummy/2.0-1 1457s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1457s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1457s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1457s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 1457s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1457s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1457s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1457s git-debrebase ffq check_specs * 1457s git-debrebase ffq merge master 1457s git-debrebase ffq check_remote origin remote fetch/merge branch 1457s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1457s OK, you are ahead of refs/remotes/origin/master 1457s git-debrebase ffq check_remote undef remote push branch 1457s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1457s OK, you are ahead of refs/remotes/dgit/dgit/sid 1457s git-debrebase: snags: 2 overriden by individual -f options 1457s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 1457s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 1457s git-debrebase >$ 1457s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 1457s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1457s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1457s ' 1457s + git branch converted-from-gbp 1457s + v=2.0-2 1457s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1457s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1457s + DEBEMAIL=dgit-tests@example.org 1457s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1457s + 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 1457s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1457s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1457s 1 file changed, 6 insertions(+) 1457s + t-dch-commit-r 1457s + t-dch-r-rune t-dch-commit 1457s + local cmd=t-dch-commit 1457s + shift 1457s + local suite=unstable 1457s + t-dch-commit -r -D unstable '' 1457s + t-debchange -r -D unstable '' 1457s + DEBEMAIL=dgit-tests@example.org 1457s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1457s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1457s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1457s libdistro-info-perl is not installed, Debian release names are not known. 1457s libdistro-info-perl is not installed, Ubuntu release names are not known. 1457s + git commit -m 'dch -r -D unstable ' debian/changelog 1457s [master 4af0243] dch -r -D unstable 1457s 1 file changed, 1 insertion(+), 1 deletion(-) 1457s + t-dgit -wgf push-source --new 1457s + local dgit=dgit 1457s + pwd 1457s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1457s + : ' 1457s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1457s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 1457s | git rev-parse --show-toplevel 1458s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1458s | git config -z --get-regexp --local '.*' 1458s | git config -z --get-regexp --local '.*' 1458s | git config -z --get-regexp --global '.*' 1458s | git config -z --get-regexp --system '.*' 1458s format 3.0 (quilt), quilt mode linear 1458s Format `3.0 (quilt)', need to check/update patch stack 1458s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1458s => `' 1458s + git diff --quiet HEAD 1458s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1458s canonical suite name for unstable is sid 1458s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1458s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1458s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1458s | git rev-parse 'HEAD~0' 1458s => `4af0243f9227b0d695fbff38df345aca23969e2e' 1458s | git symbolic-ref -q HEAD 1458s => `refs/heads/master' 1458s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1458s CD work 1458s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1458s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1458s examining quilt state (multiple patches, linear mode) 1458s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 1458s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 1458s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1458s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1458s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 1458s | git rev-parse 'HEAD~0' 1458s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1458s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1458s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1458s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1458s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1458s CD fake 1458s | find -name .git -prune -print0 1458s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1458s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 1458s + git add -Af . 1458s | git write-tree 1458s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 1458s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1458s CD .. 1458s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1458s CD ../fake 1458s + git add -Af . 1458s | git write-tree 1458s => `607612c46d7ea5b66697b830f1a50f069061d460' 1458s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1458s CD ../work 1458s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1458s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1458s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1458s => `: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' 1458s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 1458s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1458s => `' 1458s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1458s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 1458s => `lib.c\x00new-upstream-file\x00src.c\x00' 1458s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 1458s differences @dl ## ## == == == ==. 1458s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 1458s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1458s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1458s starting quiltify (multiple patches, linear mode) 1458s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 1458s => `debian/control'... 1458s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1458s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1458s => `' 1458s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1458s search finished hooray! 1458s quiltify linearisation planning successful, executing... 1458s + git checkout -q master 1458s | git status --ignored --porcelain 1458s => `?? .pc/' 1458s nothing quilty to commit, ok. 1458s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1458s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1458s | git rev-parse 'HEAD~0' 1458s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1458s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1458s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1458s CD work 1458s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1458s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1458s CD .. 1458s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1459s dpkg-source: info: using source format '3.0 (quilt)' 1459s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1459s dpkg-source: info: using patch list from debian/patches/series 1459s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 1459s dpkg-source: info: building example in example_2.0-2.dsc 1459s CD work 1459s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1459s package seems new, not specifying -v 1459s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 1459s dpkg-genchanges: info: not including original source code in upload 1459s CD .. 1459s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1459s renaming (Files) example_2.0.orig.tar.gz 1459s renaming (Files) example_2.0-2.debian.tar.xz 1459s renaming (dsc) example_2.0-2.dsc 1459s renaming (changes) example_2.0-2_source.changes 1459s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1459s actually entering push 1459s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1459s => `1' 1459s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1459s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1459s git_lrfetch_sane iteration 0 1459s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1459s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 1459s => 95163808096ecc72500a41bf930ff04d7f20b577 refs/tags/archive/test-dummy/2.0-1 1459s => 8fd01e541f0f80470af54cc3ccb229f586c2a7ef refs/tags/test-dummy/2.0-1 1459s 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 1459s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1459s | git for-each-ref refs/dgit-fetch/test-dummy 1459s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 1459s |> 95163808096ecc72500a41bf930ff04d7f20b577 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1459s |> 8fd01e541f0f80470af54cc3ccb229f586c2a7ef tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1459s git_lrfetch_sane: tidying any old suite lrfetchrefs 1459s | git for-each-ref refs/dgit-fetch/sid 1459s git_lrfetch_sane: git fetch --no-insane emulation complete 1459s $VAR1 = { 1459s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '8fd01e541f0f80470af54cc3ccb229f586c2a7ef', 1459s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '95163808096ecc72500a41bf930ff04d7f20b577', 1459s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9' 1459s }; 1459s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1459s |> 95163808096ecc72500a41bf930ff04d7f20b577 tag refs/tags/archive/test-dummy/2.0-1 1459s currently refs/tags/archive/test-dummy/2.0-1=95163808096ecc72500a41bf930ff04d7f20b577 1459s |> 8fd01e541f0f80470af54cc3ccb229f586c2a7ef tag refs/tags/test-dummy/2.0-1 1459s currently refs/tags/test-dummy/2.0-1=8fd01e541f0f80470af54cc3ccb229f586c2a7ef 1459s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1459s |> 95163808096ecc72500a41bf930ff04d7f20b577 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1459s offered refs/tags/archive/test-dummy/2.0-1=95163808096ecc72500a41bf930ff04d7f20b577 1459s |> 8fd01e541f0f80470af54cc3ccb229f586c2a7ef tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1459s offered refs/tags/test-dummy/2.0-1=8fd01e541f0f80470af54cc3ccb229f586c2a7ef 1459s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1459s get_archive_dsc: nothing in archive, returning undef 1459s no version available from the archive 1459s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 1459s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 1459s 1459s Package not found in the archive, but has allegedly been pushed using dgit. 1459s Perhaps the upload is stuck in incoming. Using the version from git. 1459s 1459s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s fetch mergeinfos: 1459s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 1459s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 1459s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 1459s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 1459s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 1459s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 1459s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1459s + git check-ref-format archive/test-dummy/2.0-2 1459s | git symbolic-ref -q HEAD 1459s => `refs/heads/master' 1459s | git rev-parse 'HEAD~0' 1459s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1459s ffq_prev_branchinfo branch current refs/heads/master 1459s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1459s => `' 1459s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1459s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1459s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1459s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1459s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1459s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1459s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1459s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1459s | git status --ignored --porcelain 1459s => `' 1459s nothing quilty to commit, ok. 1459s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1459s => `' 1459s + git diff --quiet HEAD 1459s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1459s => `45ea71a69fa522ce760afdab8a420200443753e9' 1459s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 1459s => `' 1459s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1459s checking that example_2.0-2.dsc corresponds to HEAD 1459s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc 1459s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc) 1459s dpkg-source: info: extracting example in example-2.0 1459s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1459s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 1459s dpkg-source: info: using patch list from debian/patches/series 1459s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1459s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1459s dpkg-source: info: applying subdir/addnewups 1459s CD example-2.0 1459s | find -name .git -prune -print0 1459s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1459s + git add -Af . 1459s | git write-tree 1459s => `607612c46d7ea5b66697b830f1a50f069061d460' 1459s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1459s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1459s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1459s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1459s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1459s files_compare_inputs example_2.0-2.dsc 1459s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 1459s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1459s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 1459s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 1459s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1459s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 1459s files_compare_inputs example_2.0-2.dsc Files 1459s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 1459s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 1459s files_compare_inputs example_2.0-2_source.changes 1459s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 1459s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 1459s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 1459s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 1459s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 1459s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 1459s files_compare_inputs example_2.0-2_source.changes Files 1459s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 1459s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 1459s checking origs needed (2.0)... 1459s checking origs needed placement 'devel extra'... 1459s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1459s origs example_2.0.orig.tar.gz is_orig 1459s -| sh -ec 'cd "$1"; shift 1459s 1459s find -name "$1" -print0 | 1459s xargs -0r sha256sum 1459s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1459s origs example_2.0.orig.tar.gz $#$have=-1 1459s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1459s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 1459s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1459s push_tagwants: $VAR1 = [ 1459s '2.0-2', 1459s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1459s undef, 1459s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1459s ]; 1459s $VAR2 = [ 1459s { 1459s 'Tag' => 'archive/test-dummy/2.0-2', 1459s 'TfSuffix' => '', 1459s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1459s 'View' => 'dgit', 1459s 'Tfn' => sub { "DUMMY" }, 1459s 'TagFn' => sub { "DUMMY" } 1459s }, 1459s { 1459s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1459s 'View' => 'dgit', 1459s 'Tag' => 'test-dummy/2.0-2', 1459s 'TfSuffix' => '-dgit', 1459s 'Tfn' => sub { "DUMMY" }, 1459s 'TagFn' => sub { "DUMMY" } 1459s } 1459s ]; 1459s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1459s => `1530000000 +0000' 1459s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1459s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1459s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1459s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1459s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1459s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1459s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1459s => `eac015fbcec6042cef3a3de967f94bbde78a94d2' 1459s + git verify-tag eac015fbcec6042cef3a3de967f94bbde78a94d2 1459s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1459s gpg: Signature made Mon Mar 31 23:11:29 2025 UTC 1459s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1459s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1459s gpg: WARNING: This key is not certified with a trusted signature! 1459s gpg: There is no indication that the signature belongs to the owner. 1459s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1459s + git update-ref refs/tags/archive/test-dummy/2.0-2 eac015fbcec6042cef3a3de967f94bbde78a94d2 1459s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1459s => `1960e504e15369045525735aa7c0d6fb79f2c208' 1459s + git verify-tag 1960e504e15369045525735aa7c0d6fb79f2c208 1459s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1459s gpg: Signature made Mon Mar 31 23:11:29 2025 UTC 1459s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1459s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1459s gpg: WARNING: This key is not certified with a trusted signature! 1459s gpg: There is no indication that the signature belongs to the owner. 1459s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1459s + git update-ref refs/tags/test-dummy/2.0-2 1960e504e15369045525735aa7c0d6fb79f2c208 1459s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1459s => `1' 1459s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 1460s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1460s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 1460s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 1460s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 1460s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1460s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 1460s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1460s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1460s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1460s 1460s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 1460s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1460s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1460s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1460s 1460s Successfully signed dsc, changes files 1460s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 1460s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1460s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1460s D: Setting host argument. 1460s Checking signature on .changes 1460s Checking signature on .dsc 1460s Package includes an .orig.tar.gz file although the debian revision suggests 1460s that it might not be required. Multiple uploads of the .orig.tar.gz may be 1460s rejected by the upload queue management software. 1460s Uploading to test-dummy (via local to localhost): 1460s Successfully uploaded packages. 1460s dgit ok: pushed and uploaded 2.0-2 1460s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1460s del_lrfetchrefs... 1460s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 1460s del_lrfetchrefs: 95163808096ecc72500a41bf930ff04d7f20b577 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1460s del_lrfetchrefs: 8fd01e541f0f80470af54cc3ccb229f586c2a7ef refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1460s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1460s ' 1460s + git push 1460s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1460s eb10718..6b22dd5 master -> master 1460s + cd .. 1460s + t-archive-process-incoming sid 1460s + local suite=sid 1460s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1460s + t-archive-query sid 1460s + local suite=sid 1460s + local dscf=main/example_2.0-2.dsc 1460s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 1460s + local suite=sid 1460s + local p=example 1460s + local v=2.0-2 1460s + local dscf=main/example_2.0-2.dsc 1460s + local sha 1460s ++ sha256sum 1460s + sha='e9e1aa368b0876d75e9ed4724c516c0d5c183b8b73b7f83138937caec728e859 -' 1460s + echo '2.0-2 e9e1aa368b0876d75e9ed4724c516c0d5c183b8b73b7f83138937caec728e859 main/example_2.0-2.dsc' 1460s + t-aq-archive-updated sid example 1460s + local suite=sid 1460s + local p=example 1460s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1460s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1460s + perl -wne ' 1460s use JSON; 1460s use strict; 1460s our @v; 1460s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1460s push @v, { 1460s "version" => "$1", 1460s "sha256sum" => "$2", 1460s "component" => "$3", 1460s "filename" => "$4", 1460s }; 1460s END { 1460s my $json = JSON->new->canonical(); 1460s print $json->encode(\@v) or die $!; 1460s } 1460s ' 1460s ++ 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 1460s ++ echo git mirror aq 1460s + 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' ' 1460s . $troot/lib-gdr 1460s t-tstunt-parsechangelog 1460s p=example 1460s t-git-next-date 1460s ' 1460s + local savevars= 1460s + 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' 1460s + local 'importeval= 1460s . $troot/lib-gdr 1460s t-tstunt-parsechangelog 1460s p=example 1460s t-git-next-date 1460s ' 1460s + local import=IMPORT.gdr-convert-gbp 1460s + exec 1460s + local vn 1460s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1460s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1460s print STDERR "saving-exporting $vn\n"; 1460s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1460s or die $!; 1460s } 1460s ' 1460s saving-exporting DGIT_TEST_REAL_GPG 1460s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1460s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1460s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1460s + set -e 1460s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1460s + 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 1460s + printf '\n%s\n' ' 1460s . $troot/lib-gdr 1460s t-tstunt-parsechangelog 1460s p=example 1460s t-git-next-date 1460s ' 1460s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1460s + rc=0 1460s + set +x 1460s + set +e 1460s + pwd 1460s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1460s + '[' x '!=' x ']' 1460s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1460s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1460s + set -e 1460s + test 0 = 0 1460s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1460s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1460s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1460s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1460s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1460s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1460s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1460s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1460s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1460s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1460s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1460s ++ . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1460s +++ : -D 1460s +++ export GDR_TEST_DEBUG 1460s +++ t-tstunt debchange 1460s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1460s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1460s +++ local var=PATH 1460s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1460s +++ eval ' 1460s case "$PATH" in 1460s "$tstunt:"*) ;; 1460s *":$tstunt:"*) ;; 1460s "") PATH="$tstunt" ;; 1460s *) PATH="$tstunt:$PATH" ;; 1460s esac 1460s export PATH 1460s ' 1460s ++++ case "$PATH" in 1460s ++++ export PATH 1460s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1460s +++ local var=PERLLIB 1460s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1460s +++ eval ' 1460s case "$PERLLIB" in 1460s "$tstunt:"*) ;; 1460s *":$tstunt:"*) ;; 1460s "") PERLLIB="$tstunt" ;; 1460s *) PERLLIB="$tstunt:$PERLLIB" ;; 1460s esac 1460s export PERLLIB 1460s ' 1460s ++++ case "$PERLLIB" in 1460s ++++ export PERLLIB 1460s +++ local f 1460s +++ for f in "$@" 1460s +++ t-tstunt--save-real debchange 1460s +++ local f=debchange 1460s +++ case "$f" in 1460s +++ local rc 1460s +++ local real 1460s +++ set +e 1460s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1460s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1460s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1460s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1460s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1460s ++++ type -p debchange 1460s +++ real=/usr/bin/debchange 1460s +++ rc=0 1460s +++ set -e 1460s +++ case $rc in 1460s +++ local varname=debchange 1460s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1460s +++ eval ' 1460s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1460s export DGIT_TEST_REAL_DEBCHANGE 1460s ' 1460s ++++ : /usr/bin/debchange 1460s ++++ export DGIT_TEST_REAL_DEBCHANGE 1460s +++ f=./debchange 1460s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1460s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1460s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1460s ++ t-tstunt-parsechangelog 1460s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1460s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1460s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1460s ++ local var=PATH 1460s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1460s ++ eval ' 1460s case "$PATH" in 1460s "$tstunt:"*) ;; 1460s *":$tstunt:"*) ;; 1460s "") PATH="$tstunt" ;; 1460s *) PATH="$tstunt:$PATH" ;; 1460s esac 1460s export PATH 1460s ' 1460s +++ case "$PATH" in 1460s +++ export PATH 1460s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1460s ++ local var=PERLLIB 1460s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1460s ++ eval ' 1460s case "$PERLLIB" in 1460s "$tstunt:"*) ;; 1460s *":$tstunt:"*) ;; 1460s "") PERLLIB="$tstunt" ;; 1460s *) PERLLIB="$tstunt:$PERLLIB" ;; 1460s esac 1460s export PERLLIB 1460s ' 1460s +++ case "$PERLLIB" in 1460s +++ export PERLLIB 1460s ++ local f 1460s ++ for f in "$@" 1460s ++ t-tstunt--save-real dpkg-parsechangelog 1460s ++ local f=dpkg-parsechangelog 1460s ++ case "$f" in 1460s ++ local rc 1460s ++ local real 1460s ++ set +e 1460s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1460s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1460s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1460s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1460s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1460s +++ type -p dpkg-parsechangelog 1460s ++ real=/usr/bin/dpkg-parsechangelog 1460s ++ rc=0 1460s ++ set -e 1460s ++ case $rc in 1460s ++ local varname=dpkg_parsechangelog 1460s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1460s ++ eval ' 1460s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1460s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1460s ' 1460s +++ : /usr/bin/dpkg-parsechangelog 1460s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1460s ++ f=./dpkg-parsechangelog 1460s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1460s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1460s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1460s ++ for f in "$@" 1460s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1460s ++ local f=Dpkg/Changelog/Parse.pm 1460s ++ case "$f" in 1460s ++ return 1460s ++ f=./Dpkg/Changelog/Parse.pm 1460s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1460s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1460s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1460s ++ p=example 1460s ++ t-git-next-date 1460s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1460s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1460s + git config --global init.defaultBranch trunk 1460s + cd example 1460s + v=2.0-3 1460s + t-dch-commit -v 2.0-3 -m testing 1460s + t-debchange -v 2.0-3 -m testing 1460s + DEBEMAIL=dgit-tests@example.org 1460s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-3 -m testing 1460s + exec env TZ=UTC faketime -f 2018-06-26 08:00:01 env -u TZ /usr/bin/debchange -v 2.0-3 -m testing 1460s + git commit -m 'dch -v 2.0-3 -m testing' debian/changelog 1460s [master e3ea5bf] dch -v 2.0-3 -m testing 1460s 1 file changed, 6 insertions(+) 1460s + t-git-debrebase analyse 1460s + local gdr=git-debrebase 1460s + tee ../anal.1 1460s + : ' 1460s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1460s + git-debrebase --dgit=dgit -D analyse 1460s git-debrebase *** WALK e3ea5bfb0516ddc14aa79d0498e07ca91defd33b 1 *main::STDOUT 1460s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 = 0x10 1460s git-debrebase classify e3ea5bfb0516ddc14aa79d0498e07ca91defd33b $t=367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 1460s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7","CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b","Hdr" => "tree 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Msg" => "dch -v 2.0-3 -m testing\n","Parents" => [{"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Ix" => 0,"Differs" => 16}]} 1461s e3ea5bfb0516ddc14aa79d0498e07ca91defd33b Changeloggit-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1461s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1461s git-debrebase = AddPatches {"Type" => "AddPatches","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n"} 1461s 1461s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf AddPatchesgit-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1461s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1461s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}],"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"} 1461s 1461s 4af0243f9227b0d695fbff38df345aca23969e2e Changeloggit-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1461s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1461s 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","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Type" => "Changelog","Parents" => [{"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Ix" => 0,"Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1461s 1461s 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Changeloggit-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1461s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1461s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1461s git-debrebase = Pseudomerge {"Overwritten" => [{"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Ix" => 1,"Differs" => 8}],"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"},"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","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Type" => "Pseudomerge"} 1461s 1461s 0bcedd364c245298b6ec08d8f29abf69e34b6e5b Pseudomerge Contributor=178896af44c5b02e05a3442df6c33233b6acb807git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1461s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1461s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","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","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Type" => "Upstream"} 1461s 1461s 178896af44c5b02e05a3442df6c33233b6acb807 Upstreamgit-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1461s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1461s git-debrebase = Upstream {"Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0,"Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c"} 1461s 1461s 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstreamgit-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1461s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1461s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","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}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1461s 1461s 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstreamgit-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1461s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1461s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1461s git-debrebase = Anchor {"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1461s 1461s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor 1461s Anchorgit-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 2 upp 4 proc 10 pm 0 1461s 1461s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1461s ' 1461s + cat ../anal.1 1461s e3ea5bfb0516ddc14aa79d0498e07ca91defd33b Changelog 1461s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf AddPatches 1461s 4af0243f9227b0d695fbff38df345aca23969e2e Changelog 1461s 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Changelog 1461s 0bcedd364c245298b6ec08d8f29abf69e34b6e5b Pseudomerge Contributor=178896af44c5b02e05a3442df6c33233b6acb807 1461s 178896af44c5b02e05a3442df6c33233b6acb807 Upstream 1461s 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream 1461s 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream 1461s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor 1461s Anchor 1461s + t-some-changes edits 1461s + local token=edits 1461s + local which=dum 1461s + local fsuffix= 1461s + t-git-next-date 1461s + GIT_COMMITTER_DATE='1530000002 +0100' 1461s + GIT_AUTHOR_DATE='1530000002 +0100' 1461s + case "$which" in 1461s + echo '// debian edits' 1461s + git add debian/zorkmid 1461s + git commit -m 'DEBIAN add zorkmid (edits)' 1461s [master 1ee5d13] DEBIAN add zorkmid (edits) 1461s 1 file changed, 1 insertion(+) 1461s create mode 100644 debian/zorkmid 1461s + case "$which" in 1461s + echo '// upstream edits' 1461s + git add src.c 1461s + git commit -m 'UPSTREAM edit src.c (edits)' 1461s [master 2ceed12] UPSTREAM edit src.c (edits) 1461s 1 file changed, 1 insertion(+) 1461s + case "$which" in 1461s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1461s + echo '// both! edits' 1461s + git add debian/zorkmid 1461s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1461s + echo '// both! edits' 1461s + git add src.c 1461s + git commit -m 'MIXED add both() (edits)' 1461s [master cd1a73b] MIXED add both() (edits) 1461s 2 files changed, 2 insertions(+) 1461s + t-git-next-date 1461s + GIT_COMMITTER_DATE='1530000003 +0100' 1461s + GIT_AUTHOR_DATE='1530000003 +0100' 1461s + t-dch-commit-r 1461s + t-dch-r-rune t-dch-commit 1461s + local cmd=t-dch-commit 1461s + shift 1461s + local suite=unstable 1461s + t-dch-commit -r -D unstable '' 1461s + t-debchange -r -D unstable '' 1461s + DEBEMAIL=dgit-tests@example.org 1461s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1461s + exec env TZ=UTC faketime -f 2018-06-26 08:00:03 env -u TZ /usr/bin/debchange -r -D unstable 1461s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1461s libdistro-info-perl is not installed, Debian release names are not known. 1461s libdistro-info-perl is not installed, Ubuntu release names are not known. 1461s + git commit -m 'dch -r -D unstable ' debian/changelog 1461s [master 2a87115] dch -r -D unstable 1461s 1 file changed, 2 insertions(+), 2 deletions(-) 1461s + git tag t.before 1461s + t-git-debrebase 1461s + local gdr=git-debrebase 1461s + : ' 1461s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1461s + git-debrebase --dgit=dgit -D 1461s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1461s git-debrebase ffq check_specs * 1461s git-debrebase ffq merge master 1461s git-debrebase ffq check_remote origin remote fetch/merge branch 1461s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1461s OK, you are ahead of refs/remotes/origin/master 1461s git-debrebase ffq check_remote undef remote push branch 1461s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1461s OK, you are ahead of refs/remotes/dgit/dgit/sid 1461s git-debrebase *** WALK 2a87115bc3f8ca826ea007ce753107074ca7c619 0 - 1461s git-debrebase get_differs cd1a73b0d571c79ca12a7d8b4a4a93b863931061 e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e = 0x10 1461s git-debrebase classify 2a87115bc3f8ca826ea007ce753107074ca7c619 $t=e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e @p cd1a73b0d571c79ca12a7d8b4a4a93b863931061/0x10 1461s git-debrebase = Changelog {"Tree" => "e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e","Parents" => [{"Differs" => 16,"CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061","Ix" => 0}],"Type" => "Changelog","Hdr" => "tree e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e\nparent cd1a73b0d571c79ca12a7d8b4a4a93b863931061\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Msg" => "dch -r -D unstable\n"} 1461s git-debrebase get_differs 2ceed1229dd14a9c7bd40480c061a7e55243e34f d46f208b7607ba8804649163cd2bead722b3dcd1 = 0x22 1461s git-debrebase classify cd1a73b0d571c79ca12a7d8b4a4a93b863931061 $t=d46f208b7607ba8804649163cd2bead722b3dcd1 @p 2ceed1229dd14a9c7bd40480c061a7e55243e34f/0x22 1461s git-debrebase = Mixed {"CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061","Hdr" => "tree d46f208b7607ba8804649163cd2bead722b3dcd1\nparent 2ceed1229dd14a9c7bd40480c061a7e55243e34f\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Msg" => "MIXED add both() (edits)\n","Parents" => [{"Differs" => 34,"CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f","Ix" => 0}],"Tree" => "d46f208b7607ba8804649163cd2bead722b3dcd1","Type" => "Mixed"} 1461s git-debrebase get_differs 1ee5d138031b9e8febce2769522b7ff8faa92fe3 e0f113b557570441f656fe976c2e2317cf95b193 = 0x2 1461s git-debrebase classify 2ceed1229dd14a9c7bd40480c061a7e55243e34f $t=e0f113b557570441f656fe976c2e2317cf95b193 @p 1ee5d138031b9e8febce2769522b7ff8faa92fe3/0x2 1461s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3","Ix" => 0}],"Tree" => "e0f113b557570441f656fe976c2e2317cf95b193","Msg" => "UPSTREAM edit src.c (edits)\n","CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f","Hdr" => "tree e0f113b557570441f656fe976c2e2317cf95b193\nparent 1ee5d138031b9e8febce2769522b7ff8faa92fe3\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 1461s git-debrebase get_differs e3ea5bfb0516ddc14aa79d0498e07ca91defd33b f9239e94551063b14f3d1dca12ff06dbd096b2af = 0x20 1461s git-debrebase classify 1ee5d138031b9e8febce2769522b7ff8faa92fe3 $t=f9239e94551063b14f3d1dca12ff06dbd096b2af @p e3ea5bfb0516ddc14aa79d0498e07ca91defd33b/0x20 1461s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b","Differs" => 32}],"Tree" => "f9239e94551063b14f3d1dca12ff06dbd096b2af","Msg" => "DEBIAN add zorkmid (edits)\n","CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3","Hdr" => "tree f9239e94551063b14f3d1dca12ff06dbd096b2af\nparent e3ea5bfb0516ddc14aa79d0498e07ca91defd33b\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 1461s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 = 0x10 1461s git-debrebase classify e3ea5bfb0516ddc14aa79d0498e07ca91defd33b $t=367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 1461s git-debrebase = Changelog {"Hdr" => "tree 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b","Msg" => "dch -v 2.0-3 -m testing\n","Tree" => "367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7","Parents" => [{"Ix" => 0,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Differs" => 16}],"Type" => "Changelog"} 1461s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1461s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1461s git-debrebase = AddPatches {"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Type" => "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"} 1461s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1461s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1461s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "dch -r -D unstable\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1461s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1461s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1461s git-debrebase = Changelog {"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","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","Parents" => [{"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16,"Ix" => 0}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Type" => "Changelog"} 1461s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1461s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1461s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1461s git-debrebase = Pseudomerge {"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"},{"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8}],"Contributor" => $VAR1->{"Parents"}[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" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge"} 1461s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1461s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1461s git-debrebase = 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","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0}]} 1461s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1461s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1461s git-debrebase = 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","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 1461s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1461s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1461s git-debrebase = Upstream {"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","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" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Type" => "Upstream"} 1461s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1461s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1461s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1461s 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","Type" => "Anchor","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1461s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 6 upp 6 proc 15 pm 0 1461s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1461s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1461s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 1461s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1461s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1461s git-debrebase WALK REWRITING NOW cl=HASH(0x407e6d1f470) procd=HASH(0x407e6d256d8) 1461s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1461s git-debrebase WALK BUILD e3ea5bfb0516ddc14aa79d0498e07ca91defd33b Debian (rewriting=1) 1461s git-debrebase WALK BUILD 1ee5d138031b9e8febce2769522b7ff8faa92fe3 Debian (rewriting=1) 1461s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1461s git-debrebase WALK BUILD cd1a73b0d571c79ca12a7d8b4a4a93b863931061 Debian (rewriting=1) 1461s git-debrebase WALK BUILD 2a87115bc3f8ca826ea007ce753107074ca7c619 Debian (rewriting=1) 1461s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1461s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1461s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1461s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1461s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1461s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1461s git-debrebase WALK BUILD 2ceed1229dd14a9c7bd40480c061a7e55243e34f Upstream (rewriting=1) 1461s git-debrebase WALK BUILD cd1a73b0d571c79ca12a7d8b4a4a93b863931061 Upstream (rewriting=1) 1461s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1461s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 2a87115bc3f8ca826ea007ce753107074ca7c619 = 0x4 1461s git-debrebase *** WALK RETURN 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 cd67898e896264914067d3c0dee667e61099f3c8 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1461s git-debrebase: laundered (head was 2a87115bc3f8ca826ea007ce753107074ca7c619) 1461s git-debrebase >= update refs/ffq-prev/heads/master 2a87115bc3f8ca826ea007ce753107074ca7c619 0000000000000000000000000000000000000000 1461s git-debrebase >= delete refs/debrebase-last/heads/master 1461s git-debrebase >= update HEAD 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 2a87115bc3f8ca826ea007ce753107074ca7c619 1461s git-debrebase >$ 1461s Recorded previous head for preservation 1461s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1461s ' 1461s + t-gdr-good laundered 1461s + local state=laundered 1461s + local beforetag= 1461s + case $state in 1461s + git diff --quiet -- :. ':!debian/patches' 1461s + LC_MESSAGES=C 1461s + t-git-debrebase status 1461s + local gdr=git-debrebase 1461s + : ' 1461s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1461s + git-debrebase --dgit=dgit -D status 1461s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 1461s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 1461s git-debrebase = Upstream {"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"}],"Type" => "Upstream","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","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"} 1461s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 1461s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 1461s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Ix" => 0}],"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (edits)\n","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1461s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 1461s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 1461s git-debrebase = Upstream {"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","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"}],"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e"} 1461s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 1461s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 1461s git-debrebase = Upstream {"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","Parents" => [{"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Differs" => 2,"Ix" => 0}],"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Type" => "Upstream"} 1461s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 1461s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 1461s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Differs" => 2}],"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","Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f"} 1461s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 1461s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 1461s git-debrebase = Changelog {"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Parents" => [{"Ix" => 0,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Differs" => 16}],"Type" => "Changelog","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","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"} 1461s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 1461s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 1461s git-debrebase = Packaging {"Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Parents" => [{"Ix" => 0,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Differs" => 32}]} 1461s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 1461s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 1461s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84"}],"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Type" => "Packaging","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"} 1461s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 1461s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1461s git-debrebase = Changelog {"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Parents" => [{"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16}],"Type" => "Changelog","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","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"} 1461s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1461s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1461s 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,"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16}],"Type" => "Changelog"} 1461s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1461s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1461s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5","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 1530000003 +0100\n"} 1461s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1461s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1461s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1461s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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"} 1461s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1461s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1461s ' 1461s + case $state in 1461s + egrep '^ *branch is laundered' ../status.check 1461s branch is laundered 1461s + t-gdr-good-analyse HEAD laundered 1461s + local head=HEAD 1461s + local state=laundered 1461s + local wsfx= 1461s + local etypes bwtip 1461s + case $state in 1461s + etypes=Upstream 1461s ++ t-git-debrebase breakwater 1461s ++ local gdr=git-debrebase 1461s ++ : ' 1461s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1461s ++ git-debrebase --dgit=dgit -D breakwater 1462s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 1462s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 1462s git-debrebase = Upstream {"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","Type" => "Upstream","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Parents" => [{"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Ix" => 0,"Differs" => 2}]} 1462s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 1462s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 1462s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Ix" => 0,"Differs" => 2}],"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","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"} 1462s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 1462s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 1462s git-debrebase = 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","Parents" => [{"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Differs" => 2,"Ix" => 0}],"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Type" => "Upstream"} 1462s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 1462s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 1462s git-debrebase = Upstream {"Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\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","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Parents" => [{"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Differs" => 2,"Ix" => 0}]} 1462s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 1462s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 1462s git-debrebase = Upstream {"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","Type" => "Upstream","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Parents" => [{"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Differs" => 2,"Ix" => 0}],"Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f"} 1462s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 1462s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 1462s git-debrebase = Changelog {"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","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"}],"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Type" => "Changelog"} 1462s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 1462s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 1462s git-debrebase = Packaging {"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"}],"Type" => "Packaging","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1462s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 1462s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 1462s git-debrebase = Packaging {"Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "DEBIAN add zorkmid (edits)\n","Type" => "Packaging","CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d","Parents" => [{"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Ix" => 0,"Differs" => 32}]} 1462s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 1462s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1462s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","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"} 1462s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1462s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1462s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Parents" => [{"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16,"Ix" => 0}],"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"} 1462s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1462s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1462s git-debrebase = 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","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog"} 1462s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1462s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1462s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1462s 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","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1462s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1462s ' 1462s + bwtip=Y:cd67898e896264914067d3c0dee667e61099f3c8 1462s + anal=../anal 1462s + t-git-debrebase analyse HEAD 1462s + local gdr=git-debrebase 1462s + : ' 1462s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1462s + git-debrebase --dgit=dgit -D analyse HEAD 1462s git-debrebase *** WALK 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1 *main::STDOUT 1462s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 1462s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 1462s git-debrebase = Upstream {"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Type" => "Upstream","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Differs" => 2}]} 1462s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 1462s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 1462s git-debrebase = Upstream {"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","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Type" => "Upstream","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Msg" => "UPSTREAM edit src.c (edits)\n"} 1462s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 1462s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 1462s git-debrebase = Upstream {"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","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","Parents" => [{"Differs" => 2,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Ix" => 0}],"Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Type" => "Upstream"} 1462s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 1462s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 1462s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","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"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"} 1462s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 1462s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 1462s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Differs" => 2,"Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7"} 1462s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 1462s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 1462s git-debrebase = Changelog {"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","Type" => "Changelog","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Msg" => "dch -r -D unstable\n"} 1462s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 1462s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 1462s git-debrebase = Packaging {"Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Ix" => 0}],"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","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"} 1462s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 1462s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 1462s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (edits)\n","CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d","Type" => "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"} 1462s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 1462s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1462s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16,"Ix" => 0}],"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"} 1462s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1462s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1462s git-debrebase = Changelog {"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","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","Type" => "Changelog"} 1462s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1462s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1462s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5"} 1462s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1462s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1462s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1462s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]]} 1462s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 4 proc 11 pm -1 1462s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1462s ' 1462s ++ git rev-parse HEAD 1462s + expect=701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1462s + exec 1462s + local cid ctype info nparents 1462s + read cid ctype info 1462s + : ===== 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 Upstream ===== 1462s + test 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 = 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1462s + local cetype=Upstream 1462s + '[' xUpstream = xUpstream ']' 1462s + cetype=SAME 1462s ++ git log -n1 --pretty=format:%P 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1462s + local parents=ccfbba34db87d1958014a2d21910c0101c8899d6 1462s + expect=ccfbba34db87d1958014a2d21910c0101c8899d6 1462s + enparents=1 1462s + : Upstream/SAME ccfbba34db87d1958014a2d21910c0101c8899d6 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s ++ printf %s ccfbba34db87d1958014a2d21910c0101c8899d6 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo ccfbba34db87d1958014a2d21910c0101c8899d6 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== ccfbba34db87d1958014a2d21910c0101c8899d6 Upstream ===== 1462s + test ccfbba34db87d1958014a2d21910c0101c8899d6 = ccfbba34db87d1958014a2d21910c0101c8899d6 1462s + local cetype=Upstream 1462s + '[' xUpstream = xUpstream ']' 1462s + cetype=SAME 1462s ++ git log -n1 --pretty=format:%P ccfbba34db87d1958014a2d21910c0101c8899d6 1462s + local parents=57c5b974d287db76460be14f71b4dc55a9bf276e 1462s + expect=57c5b974d287db76460be14f71b4dc55a9bf276e 1462s + enparents=1 1462s + : Upstream/SAME 57c5b974d287db76460be14f71b4dc55a9bf276e 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s ++ printf %s 57c5b974d287db76460be14f71b4dc55a9bf276e 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo 57c5b974d287db76460be14f71b4dc55a9bf276e 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== 57c5b974d287db76460be14f71b4dc55a9bf276e Upstream ===== 1462s + test 57c5b974d287db76460be14f71b4dc55a9bf276e = 57c5b974d287db76460be14f71b4dc55a9bf276e 1462s + local cetype=Upstream 1462s + '[' xUpstream = xUpstream ']' 1462s + cetype=SAME 1462s ++ git log -n1 --pretty=format:%P 57c5b974d287db76460be14f71b4dc55a9bf276e 1462s + local parents=af4f554362ff02a1bbae558a182bb3c926512138 1462s + expect=af4f554362ff02a1bbae558a182bb3c926512138 1462s + enparents=1 1462s + : Upstream/SAME af4f554362ff02a1bbae558a182bb3c926512138 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s ++ printf %s af4f554362ff02a1bbae558a182bb3c926512138 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo af4f554362ff02a1bbae558a182bb3c926512138 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== af4f554362ff02a1bbae558a182bb3c926512138 Upstream ===== 1462s + test af4f554362ff02a1bbae558a182bb3c926512138 = af4f554362ff02a1bbae558a182bb3c926512138 1462s + local cetype=Upstream 1462s + '[' xUpstream = xUpstream ']' 1462s + cetype=SAME 1462s ++ git log -n1 --pretty=format:%P af4f554362ff02a1bbae558a182bb3c926512138 1462s + local parents=b013e77447acc11029f98a8aa19d74b4c2c315d7 1462s + expect=b013e77447acc11029f98a8aa19d74b4c2c315d7 1462s + enparents=1 1462s + : Upstream/SAME b013e77447acc11029f98a8aa19d74b4c2c315d7 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s ++ printf %s b013e77447acc11029f98a8aa19d74b4c2c315d7 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo b013e77447acc11029f98a8aa19d74b4c2c315d7 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== b013e77447acc11029f98a8aa19d74b4c2c315d7 Upstream ===== 1462s + test b013e77447acc11029f98a8aa19d74b4c2c315d7 = b013e77447acc11029f98a8aa19d74b4c2c315d7 1462s + local cetype=Upstream 1462s + '[' xUpstream = xUpstream ']' 1462s + cetype=SAME 1462s ++ git log -n1 --pretty=format:%P b013e77447acc11029f98a8aa19d74b4c2c315d7 1462s + local parents=cd67898e896264914067d3c0dee667e61099f3c8 1462s + expect=cd67898e896264914067d3c0dee667e61099f3c8 1462s + enparents=1 1462s + : Upstream/SAME cd67898e896264914067d3c0dee667e61099f3c8 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s ++ printf %s cd67898e896264914067d3c0dee667e61099f3c8 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo cd67898e896264914067d3c0dee667e61099f3c8 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== cd67898e896264914067d3c0dee667e61099f3c8 Changelog ===== 1462s + test cd67898e896264914067d3c0dee667e61099f3c8 = cd67898e896264914067d3c0dee667e61099f3c8 1462s + local cetype=Upstream 1462s + '[' xChangelog = xUpstream ']' 1462s ++ git log -n1 --pretty=format:%P cd67898e896264914067d3c0dee667e61099f3c8 1462s + local parents=8e4834ab8bffee2a148fe5e4a53f45b914afd569 1462s + expect=8e4834ab8bffee2a148fe5e4a53f45b914afd569 1462s + enparents=1 1462s + : Changelog/Upstream 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + '[' xY:cd67898e896264914067d3c0dee667e61099f3c8 '!=' x ']' 1462s + test Y:cd67898e896264914067d3c0dee667e61099f3c8 = Y:cd67898e896264914067d3c0dee667e61099f3c8 1462s + bwtip= 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s + git diff --quiet 8e4834ab8bffee2a148fe5e4a53f45b914afd569..cd67898e896264914067d3c0dee667e61099f3c8 -- :. ':!debian/changelog' 1462s + etypes=Packaging 1462s ++ printf %s 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== 8e4834ab8bffee2a148fe5e4a53f45b914afd569 Packaging ===== 1462s + test 8e4834ab8bffee2a148fe5e4a53f45b914afd569 = 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1462s + local cetype=Packaging 1462s + '[' xPackaging = xPackaging ']' 1462s + cetype=SAME 1462s ++ git log -n1 --pretty=format:%P 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1462s + local parents=a1a56f704487b6339119bdb910659f5519f0c84d 1462s + expect=a1a56f704487b6339119bdb910659f5519f0c84d 1462s + enparents=1 1462s + : Packaging/SAME a1a56f704487b6339119bdb910659f5519f0c84d 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :. ':!debian' 1462s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :debian/patches 1462s + etypes=Packaging 1462s ++ printf %s a1a56f704487b6339119bdb910659f5519f0c84d 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo a1a56f704487b6339119bdb910659f5519f0c84d 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== a1a56f704487b6339119bdb910659f5519f0c84d Packaging ===== 1462s + test a1a56f704487b6339119bdb910659f5519f0c84d = a1a56f704487b6339119bdb910659f5519f0c84d 1462s + local cetype=Packaging 1462s + '[' xPackaging = xPackaging ']' 1462s + cetype=SAME 1462s ++ git log -n1 --pretty=format:%P a1a56f704487b6339119bdb910659f5519f0c84d 1462s + local parents=c7dc423ffb995d941617811c9612ee6d65ee3b84 1462s + expect=c7dc423ffb995d941617811c9612ee6d65ee3b84 1462s + enparents=1 1462s + : Packaging/SAME c7dc423ffb995d941617811c9612ee6d65ee3b84 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :. ':!debian' 1462s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :debian/patches 1462s + etypes=Packaging 1462s ++ printf %s c7dc423ffb995d941617811c9612ee6d65ee3b84 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo c7dc423ffb995d941617811c9612ee6d65ee3b84 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== c7dc423ffb995d941617811c9612ee6d65ee3b84 Changelog ===== 1462s + test c7dc423ffb995d941617811c9612ee6d65ee3b84 = c7dc423ffb995d941617811c9612ee6d65ee3b84 1462s + local cetype=Packaging 1462s + '[' xChangelog = xPackaging ']' 1462s ++ git log -n1 --pretty=format:%P c7dc423ffb995d941617811c9612ee6d65ee3b84 1462s + local parents=32b1b8f0bdc575561b14de2ec9711d768a12d928 1462s + expect=32b1b8f0bdc575561b14de2ec9711d768a12d928 1462s + enparents=1 1462s + : Changelog/Packaging 32b1b8f0bdc575561b14de2ec9711d768a12d928 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s + git diff --quiet 32b1b8f0bdc575561b14de2ec9711d768a12d928..c7dc423ffb995d941617811c9612ee6d65ee3b84 -- :. ':!debian/changelog' 1462s + etypes=Packaging 1462s ++ printf %s 32b1b8f0bdc575561b14de2ec9711d768a12d928 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo 32b1b8f0bdc575561b14de2ec9711d768a12d928 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== 32b1b8f0bdc575561b14de2ec9711d768a12d928 Changelog ===== 1462s + test 32b1b8f0bdc575561b14de2ec9711d768a12d928 = 32b1b8f0bdc575561b14de2ec9711d768a12d928 1462s + local cetype=Packaging 1462s + '[' xChangelog = xPackaging ']' 1462s ++ git log -n1 --pretty=format:%P 32b1b8f0bdc575561b14de2ec9711d768a12d928 1462s + local parents=9214201f528bae71f4647709e2357407746739d5 1462s + expect=9214201f528bae71f4647709e2357407746739d5 1462s + enparents=1 1462s + : Changelog/Packaging 9214201f528bae71f4647709e2357407746739d5 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s + git diff --quiet 9214201f528bae71f4647709e2357407746739d5..32b1b8f0bdc575561b14de2ec9711d768a12d928 -- :. ':!debian/changelog' 1462s + etypes=Packaging 1462s ++ printf %s 9214201f528bae71f4647709e2357407746739d5 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo 9214201f528bae71f4647709e2357407746739d5 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== 9214201f528bae71f4647709e2357407746739d5 Changelog ===== 1462s + test 9214201f528bae71f4647709e2357407746739d5 = 9214201f528bae71f4647709e2357407746739d5 1462s + local cetype=Packaging 1462s + '[' xChangelog = xPackaging ']' 1462s ++ git log -n1 --pretty=format:%P 9214201f528bae71f4647709e2357407746739d5 1462s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1462s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1462s + enparents=1 1462s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..9214201f528bae71f4647709e2357407746739d5 -- :. ':!debian/changelog' 1462s + etypes=Packaging 1462s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1462s ++ wc -w 1462s + local cnparents=1 1462s + test 1 = 1 1462s ++ for f in $parents 1462s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1462s ++ wc -w 1462s ++ t-sort -u 1462s ++ LC_COLLATE=C 1462s ++ sort -u 1462s + local cndparents=1 1462s + test 1 = 1 1462s + case "$parents" in 1462s + case "$ctype" in 1462s + read cid ctype info 1462s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1462s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1462s + local cetype=Packaging 1462s + '[' xAnchor = xPackaging ']' 1462s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1462s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1462s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1462s + enparents=1 1462s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1462s + case "$ctype/$cetype" in 1462s + case "$ctype/$etypes" in 1462s + case "$cetype" in 1462s + case "$ctype" in 1462s + break 1462s + t-dgit push-source 1462s + local dgit=dgit 1462s + pwd 1462s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1462s + : ' 1462s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1462s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push-source 1462s | git rev-parse --show-toplevel 1462s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1462s | git config -z --get-regexp --local '.*' 1462s | git config -z --get-regexp --local '.*' 1462s | git config -z --get-regexp --global '.*' 1462s | git config -z --get-regexp --system '.*' 1462s format 3.0 (quilt), quilt mode linear 1462s Format `3.0 (quilt)', need to check/update patch stack 1462s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1462s => `' 1462s + git diff --quiet HEAD 1462s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1462s canonical suite name for unstable is sid 1462s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1462s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1462s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1462s | git rev-parse 'HEAD~0' 1462s => `701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0' 1462s | git symbolic-ref -q HEAD 1462s => `refs/heads/master' 1462s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1462s CD work 1462s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1462s + git reset -q --hard 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1462s examining quilt state (multiple patches, linear mode) 1462s branch_is_gdr 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0... 1462s branch_is_gdr 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 gdr anchor YES 1462s + git reset -q --hard 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1462s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1463s HEAD is now at cb1f7fd Commit patch queue (exported by git-debrebase) 1463s | git rev-parse 'HEAD~0' 1463s => `cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe' 1463s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1463s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1463s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1463s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1463s CD fake 1463s | find -name .git -prune -print0 1463s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1463s + git checkout -f cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe -- debian 1463s + git add -Af . 1463s | git write-tree 1463s => `f904c66e1710e1151bce7bfcbc6763f6ea826c19' 1463s fake orig tree object f904c66e1710e1151bce7bfcbc6763f6ea826c19 1463s CD .. 1463s + git reset -q --hard cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1463s CD ../fake 1463s + git add -Af . 1463s | git write-tree 1463s => `02ab455c92be6f90e27681286d7d90d9169dff59' 1463s fake o+d/p tree object f904c66e1710e1151bce7bfcbc6763f6ea826c19 1463s CD ../work 1463s | git ls-tree --name-only -z cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1463s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1463s | git diff-tree -z --no-renames -r f904c66e1710e1151bce7bfcbc6763f6ea826c19 cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1463s => `: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' 1463s quiltify_trees_differ f904c66e1710e1151bce7bfcbc6763f6ea826c19 cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe => 1 1463s | git diff-tree -z --no-renames --name-only -r cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 1463s => `' 1463s quiltify_trees_differ cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 => 0 1463s | git diff-tree -z --no-renames --name-only -r f904c66e1710e1151bce7bfcbc6763f6ea826c19 02ab455c92be6f90e27681286d7d90d9169dff59 1463s => `lib.c\x00new-upstream-file\x00src.c\x00' 1463s quiltify_trees_differ f904c66e1710e1151bce7bfcbc6763f6ea826c19 02ab455c92be6f90e27681286d7d90d9169dff59 => 1 1463s differences @dl ## ## == == == ==. 1463s dgit: base trees orig=f904c66e1710e1151bce o+d/p=02ab455c92be6f90e276 1463s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1463s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1463s starting quiltify (multiple patches, linear mode) 1463s | git ls-tree --name-only cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe -- debian/rules debian/control 1463s => `debian/control'... 1463s quiltify investigate cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1463s | git diff-tree -z --no-renames --name-only cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 1463s => `' 1463s quiltify_trees_differ cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 => 0 1463s search finished hooray! 1463s quiltify linearisation planning successful, executing... 1463s + git checkout -q master 1463s | git status --ignored --porcelain 1463s => `?? .pc/' 1463s nothing quilty to commit, ok. 1463s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1463s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1463s | git rev-parse 'HEAD~0' 1463s => `cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe' 1463s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1463s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1463s CD work 1463s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1463s + git reset -q --hard cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1463s CD .. 1463s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1463s dpkg-source: info: using source format '3.0 (quilt)' 1463s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1463s dpkg-source: info: using patch list from debian/patches/series 1463s dpkg-source: info: building example in example_2.0-3.debian.tar.xz 1463s dpkg-source: info: building example in example_2.0-3.dsc 1463s CD work 1463s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1463s changelog will contain changes since 2.0-2 1463s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-3_source.changes dpkg-genchanges -S -v2.0-2 1463s dpkg-genchanges: info: not including original source code in upload 1463s CD .. 1463s moving example_2.0-3.dsc, example_2.0-3_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1463s renaming (Files) example_2.0.orig.tar.gz 1463s renaming (Files) example_2.0-3.debian.tar.xz 1463s renaming (dsc) example_2.0-3.dsc 1463s renaming (changes) example_2.0-3_source.changes 1463s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1463s actually entering push 1463s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1463s => `1' 1463s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1463s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1463s git_lrfetch_sane iteration 0 1463s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1463s => 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit/sid 1463s => 95163808096ecc72500a41bf930ff04d7f20b577 refs/tags/archive/test-dummy/2.0-1 1463s => eac015fbcec6042cef3a3de967f94bbde78a94d2 refs/tags/archive/test-dummy/2.0-2 1463s => 8fd01e541f0f80470af54cc3ccb229f586c2a7ef refs/tags/test-dummy/2.0-1 1463s => 1960e504e15369045525735aa7c0d6fb79f2c208 refs/tags/test-dummy/2.0-2 1463s 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 1463s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1463s | git for-each-ref refs/dgit-fetch/test-dummy 1463s |> 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit refs/dgit-fetch/test-dummy/dgit/sid 1463s |> 95163808096ecc72500a41bf930ff04d7f20b577 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1463s |> eac015fbcec6042cef3a3de967f94bbde78a94d2 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1463s |> 8fd01e541f0f80470af54cc3ccb229f586c2a7ef tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1463s |> 1960e504e15369045525735aa7c0d6fb79f2c208 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1463s git_lrfetch_sane: tidying any old suite lrfetchrefs 1463s | git for-each-ref refs/dgit-fetch/sid 1463s git_lrfetch_sane: git fetch --no-insane emulation complete 1463s $VAR1 = { 1463s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '95163808096ecc72500a41bf930ff04d7f20b577', 1463s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => 'eac015fbcec6042cef3a3de967f94bbde78a94d2', 1463s 'refs/dgit-fetch/test-dummy/dgit/sid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1463s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => '1960e504e15369045525735aa7c0d6fb79f2c208', 1463s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '8fd01e541f0f80470af54cc3ccb229f586c2a7ef' 1463s }; 1463s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1463s |> 95163808096ecc72500a41bf930ff04d7f20b577 tag refs/tags/archive/test-dummy/2.0-1 1463s currently refs/tags/archive/test-dummy/2.0-1=95163808096ecc72500a41bf930ff04d7f20b577 1463s |> eac015fbcec6042cef3a3de967f94bbde78a94d2 tag refs/tags/archive/test-dummy/2.0-2 1463s currently refs/tags/archive/test-dummy/2.0-2=eac015fbcec6042cef3a3de967f94bbde78a94d2 1463s |> 8fd01e541f0f80470af54cc3ccb229f586c2a7ef tag refs/tags/test-dummy/2.0-1 1463s currently refs/tags/test-dummy/2.0-1=8fd01e541f0f80470af54cc3ccb229f586c2a7ef 1463s |> 1960e504e15369045525735aa7c0d6fb79f2c208 tag refs/tags/test-dummy/2.0-2 1463s currently refs/tags/test-dummy/2.0-2=1960e504e15369045525735aa7c0d6fb79f2c208 1463s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1463s |> 95163808096ecc72500a41bf930ff04d7f20b577 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1463s offered refs/tags/archive/test-dummy/2.0-1=95163808096ecc72500a41bf930ff04d7f20b577 1463s |> eac015fbcec6042cef3a3de967f94bbde78a94d2 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1463s offered refs/tags/archive/test-dummy/2.0-2=eac015fbcec6042cef3a3de967f94bbde78a94d2 1463s |> 8fd01e541f0f80470af54cc3ccb229f586c2a7ef tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1463s offered refs/tags/test-dummy/2.0-1=8fd01e541f0f80470af54cc3ccb229f586c2a7ef 1463s |> 1960e504e15369045525735aa7c0d6fb79f2c208 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1463s offered refs/tags/test-dummy/2.0-2=1960e504e15369045525735aa7c0d6fb79f2c208 1463s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1463s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.0-2.dsc... 1463s get_archive_dsc: Version 2.0-2 1463s last upload to archive: specified git info (test-dummy) 1463s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 1463s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 1463s GCF>| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1463s GCF<| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit 350 1463s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s previous reference hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1463s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s fetch_from_archive: lastfetch=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1463s using existing example_2.0.orig.tar.gz 1463s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s fetch mergeinfos: 1463s commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf Dgit field in .dsc from archive 1463s fetch hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1463s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1463s | git log -n2 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1463s => `commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf'... 1463s | git ls-tree -lrz -- 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf: 1463s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1463s + git check-ref-format archive/test-dummy/2.0-3 1463s | git symbolic-ref -q HEAD 1463s => `refs/heads/master' 1463s | git rev-parse 'HEAD~0' 1463s => `cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe' 1463s ffq_prev_branchinfo branch current refs/heads/master 1463s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1463s => `2a87115bc3f8ca826ea007ce753107074ca7c619' 1463s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1463s => `' 1463s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 2a87115bc3f8ca826ea007ce753107074ca7c619 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1463s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1463s + git-debrebase stitch 1464s | git rev-parse 'HEAD~0' 1464s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1464s | git status --ignored --porcelain 1464s => `' 1464s nothing quilty to commit, ok. 1464s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1464s => `' 1464s + git diff --quiet HEAD 1464s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1464s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1464s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1464s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1464s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1464s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1464s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-3' 1464s => `' 1464s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1464s checking that example_2.0-3.dsc corresponds to HEAD 1464s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-3.dsc 1464s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-3.dsc) 1464s dpkg-source: info: extracting example in example-2.0 1464s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1464s dpkg-source: info: unpacking example_2.0-3.debian.tar.xz 1464s dpkg-source: info: using patch list from debian/patches/series 1464s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1464s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1464s dpkg-source: info: applying subdir/addnewups 1464s dpkg-source: info: applying 0004-UPSTREAM-edit-src.c-edits.patch 1464s dpkg-source: info: applying 0005-MIXED-add-both-edits.patch 1464s CD example-2.0 1464s | find -name .git -prune -print0 1464s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1464s + git add -Af . 1464s | git write-tree 1464s => `02ab455c92be6f90e27681286d7d90d9169dff59' 1464s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1464s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1464s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1464s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1464s + git diff --quiet 02ab455c92be6f90e27681286d7d90d9169dff59 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1464s files_compare_inputs example_2.0-3.dsc 1464s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 1464s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1464s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 example_2.0-3.debian.tar.xz 1464s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 1464s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1464s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 example_2.0-3.debian.tar.xz 1464s files_compare_inputs example_2.0-3.dsc Files 1464s files_compare_inputs example_2.0-3.dsc Files example_2.0.orig.tar.gz 1464s files_compare_inputs example_2.0-3.dsc Files example_2.0-3.debian.tar.xz 1464s files_compare_inputs example_2.0-3_source.changes 1464s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 1464s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 example_2.0-3.dsc 1464s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 example_2.0-3.debian.tar.xz 1464s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 1464s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 example_2.0-3.dsc 1464s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 example_2.0-3.debian.tar.xz 1464s files_compare_inputs example_2.0-3_source.changes Files 1464s files_compare_inputs example_2.0-3_source.changes Files example_2.0-3.dsc 1464s files_compare_inputs example_2.0-3_source.changes Files example_2.0-3.debian.tar.xz 1464s checking origs needed (2.0)... 1464s checking origs needed placement 'devel extra'... 1464s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1464s origs example_2.0.orig.tar.gz is_orig 1464s -| sh -ec 'cd "$1"; shift 1464s 1464s find -name "$1" -print0 | 1464s xargs -0r sha256sum 1464s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1464s | 0e1bd42ce3bea52885dcc33e1deaea0259dd4088494c1ecdfa4c50fbea0aceb2 ./pool/main/example_2.0.orig.tar.gz 1464s origs example_2.0.orig.tar.gz $#$have=0 1464s origs example_2.0.orig.tar.gz f.same=1 #f._differ=-1 1464s origs example_2.0-3.debian.tar.xz | 209fa3d86e30862d4d2e508d0a168538 1552 example_2.0-3.debian.tar.xz 1464s ../example_2.0-3_source.changes already has appropriate .orig(s) (if any) 1464s push_tagwants: $VAR1 = [ 1464s '2.0-3', 1464s '282c3564ae1a8872cefacb527c7d9dbc05362dc5', 1464s undef, 1464s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1464s ]; 1464s $VAR2 = [ 1464s { 1464s 'Tag' => 'archive/test-dummy/2.0-3', 1464s 'TfSuffix' => '', 1464s 'Objid' => '282c3564ae1a8872cefacb527c7d9dbc05362dc5', 1464s 'TagFn' => sub { "DUMMY" }, 1464s 'Tfn' => sub { "DUMMY" }, 1464s 'View' => 'dgit' 1464s }, 1464s { 1464s 'Tag' => 'test-dummy/2.0-3', 1464s 'TfSuffix' => '-dgit', 1464s 'Objid' => '282c3564ae1a8872cefacb527c7d9dbc05362dc5', 1464s 'TagFn' => sub { "DUMMY" }, 1464s 'Tfn' => sub { "DUMMY" }, 1464s 'View' => 'dgit' 1464s } 1464s ]; 1464s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:03 +0000' 1464s => `1530000003 +0000' 1464s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1464s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1464s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1464s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1464s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1464s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1464s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1464s => `c93dd4ea0f100fad47ec94ef656d205385668cee' 1464s + git verify-tag c93dd4ea0f100fad47ec94ef656d205385668cee 1464s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1464s gpg: Signature made Mon Mar 31 23:11:34 2025 UTC 1464s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1464s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1464s gpg: WARNING: This key is not certified with a trusted signature! 1464s gpg: There is no indication that the signature belongs to the owner. 1464s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1464s + git update-ref refs/tags/archive/test-dummy/2.0-3 c93dd4ea0f100fad47ec94ef656d205385668cee 1464s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1464s => `2473e2a61e36063430df9c320184b2122d2322a7' 1464s + git verify-tag 2473e2a61e36063430df9c320184b2122d2322a7 1464s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1464s gpg: Signature made Mon Mar 31 23:11:34 2025 UTC 1464s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1464s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1464s gpg: WARNING: This key is not certified with a trusted signature! 1464s gpg: There is no indication that the signature belongs to the owner. 1464s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1464s + git update-ref refs/tags/test-dummy/2.0-3 2473e2a61e36063430df9c320184b2122d2322a7 1464s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1464s => `1' 1464s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 282c3564ae1a8872cefacb527c7d9dbc05362dc5:refs/dgit/sid refs/tags/archive/test-dummy/2.0-3 refs/tags/test-dummy/2.0-3 1464s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1464s 6b22dd5..282c356 282c3564ae1a8872cefacb527c7d9dbc05362dc5 -> refs/dgit/sid 1464s * [new tag] archive/test-dummy/2.0-3 -> archive/test-dummy/2.0-3 1464s * [new tag] test-dummy/2.0-3 -> test-dummy/2.0-3 1464s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1464s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-3_source.changes 1464s signfile dsc ../example_2.0-3.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1464s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1465s 1465s fixup_changes dsc ../example_2.0-3.dsc ../example_2.0-3_source.changes 1465s signfile changes ../example_2.0-3_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1465s 1465s Successfully signed dsc, changes files 1465s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-3_source.changes 1465s gpg: ../example_2.0-3_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1465s gpg: ../example_2.0-3.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1465s D: Setting host argument. 1465s Checking signature on .changes 1465s Checking signature on .dsc 1465s Uploading to test-dummy (via local to localhost): 1465s Successfully uploaded packages. 1465s dgit ok: pushed and uploaded 2.0-3 1465s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1465s del_lrfetchrefs... 1465s del_lrfetchrefs: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit-fetch/test-dummy/dgit/sid 1465s del_lrfetchrefs: 95163808096ecc72500a41bf930ff04d7f20b577 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1465s del_lrfetchrefs: eac015fbcec6042cef3a3de967f94bbde78a94d2 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1465s del_lrfetchrefs: 8fd01e541f0f80470af54cc3ccb229f586c2a7ef refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1465s del_lrfetchrefs: 1960e504e15369045525735aa7c0d6fb79f2c208 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1465s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1465s ' 1465s + t-gdr-good pushed-interop 1465s + local state=pushed-interop 1465s + local beforetag= 1465s + case $state in 1465s + t-gdr-made-patches 1465s + git log -n1 --pretty=format:%B 1465s + egrep '^\[git-debrebase' 1465s [git-debrebase pseudomerge: stitch] 1465s + git diff --quiet -- :. ':!debian/patches' 1465s + LC_MESSAGES=C 1465s + t-git-debrebase status 1465s + local gdr=git-debrebase 1465s + : ' 1465s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1465s + git-debrebase --dgit=dgit -D status 1465s git-debrebase get_differs cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 = 0 1465s git-debrebase get_differs 2a87115bc3f8ca826ea007ce753107074ca7c619 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 1465s git-debrebase classify 282c3564ae1a8872cefacb527c7d9dbc05362dc5 $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe/0 2a87115bc3f8ca826ea007ce753107074ca7c619/0x4 1465s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Parents" => [{"Ix" => 0,"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Differs" => 0},{"Ix" => 1,"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Differs" => 4}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe\nparent 2a87115bc3f8ca826ea007ce753107074ca7c619\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "282c3564ae1a8872cefacb527c7d9dbc05362dc5"} 1465s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 1465s git-debrebase classify cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0/0x4 1465s git-debrebase = AddPatches {"Type" => "AddPatches","Parents" => [{"Differs" => 4,"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Ix" => 0}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe"} 1465s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 1465s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 1465s git-debrebase = Upstream {"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"}],"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114"} 1465s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 1465s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 1465s git-debrebase = Upstream {"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Msg" => "UPSTREAM edit src.c (edits)\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Differs" => 2}]} 1465s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 1465s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 1465s git-debrebase = Upstream {"Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Parents" => [{"Differs" => 2,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Ix" => 0}],"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1465s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 1465s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 1465s git-debrebase = Upstream {"Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1465s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 1465s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 1465s git-debrebase = Upstream {"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" => "cd67898e896264914067d3c0dee667e61099f3c8"}],"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f"} 1465s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 1465s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 1465s git-debrebase = Changelog {"Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Type" => "Changelog","Parents" => [{"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n"} 1465s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 1465s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 1465s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Differs" => 32}],"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"} 1465s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 1465s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 1465s git-debrebase = Packaging {"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","Parents" => [{"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (edits)\n"} 1465s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 1465s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1465s 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","CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Msg" => "dch -v 2.0-3 -m testing\n"} 1465s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1465s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1465s git-debrebase = Changelog {"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16}],"Type" => "Changelog"} 1465s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1465s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1465s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"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 1530000003 +0100\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5"} 1465s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1465s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1465s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1465s git-debrebase = 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","Type" => "Anchor","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 1465s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1465s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1465s ' 1465s + case $state in 1465s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 1465s branch contains furniture (not laundered) 1465s + egrep '^ stitched$' ../status.check 1465s stitched 1465s + t-gdr-good-analyse HEAD pushed-interop 1465s + local head=HEAD 1465s + local state=pushed-interop 1465s + local wsfx= 1465s + local etypes bwtip 1465s + case $state in 1465s + etypes=Pseudomerge-AddPatchesInterop-Upstream 1465s + anal=../anal 1465s + t-git-debrebase analyse HEAD 1465s + local gdr=git-debrebase 1465s + : ' 1465s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1465s + git-debrebase --dgit=dgit -D analyse HEAD 1466s git-debrebase *** WALK 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1 *main::STDOUT 1466s git-debrebase get_differs cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 = 0 1466s git-debrebase get_differs 2a87115bc3f8ca826ea007ce753107074ca7c619 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 1466s git-debrebase classify 282c3564ae1a8872cefacb527c7d9dbc05362dc5 $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe/0 2a87115bc3f8ca826ea007ce753107074ca7c619/0x4 1466s git-debrebase = Pseudomerge {"Parents" => [{"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Differs" => 0,"Ix" => 0},{"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Differs" => 4,"Ix" => 1}],"Type" => "Pseudomerge","CommitId" => "282c3564ae1a8872cefacb527c7d9dbc05362dc5","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe\nparent 2a87115bc3f8ca826ea007ce753107074ca7c619\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59"} 1466s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 1466s git-debrebase classify cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0/0x4 1466s 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","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Type" => "AddPatches","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0"}]} 1466s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 1466s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 1466s git-debrebase = Upstream {"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Type" => "Upstream","Parents" => [{"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Differs" => 2,"Ix" => 0}],"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"} 1466s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 1466s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 1466s git-debrebase = Upstream {"Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","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","Parents" => [{"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Differs" => 2,"Ix" => 0}],"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Type" => "Upstream"} 1466s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 1466s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 1466s git-debrebase = Upstream {"Parents" => [{"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","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","Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef"} 1466s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 1466s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 1466s git-debrebase = Upstream {"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7"}],"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","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5"} 1466s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 1466s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 1466s git-debrebase = Upstream {"Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Type" => "Upstream","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Parents" => [{"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Differs" => 2,"Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1466s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 1466s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 1466s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"}],"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"} 1466s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 1466s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 1466s git-debrebase = Packaging {"Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","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","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"}],"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Type" => "Packaging"} 1466s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 1466s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 1466s git-debrebase = Packaging {"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84"}],"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","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d"} 1466s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 1466s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1466s 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","Msg" => "dch -v 2.0-3 -m testing\n","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16,"Ix" => 0}],"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Type" => "Changelog"} 1466s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1466s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1466s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","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","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1466s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1466s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1466s 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"} 1466s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1466s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1466s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1466s 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","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1466s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 15 pm 0 1466s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1466s ' 1466s ++ git rev-parse HEAD 1466s + expect=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1466s + exec 1466s + local cid ctype info nparents 1466s + read cid ctype info 1466s + : ===== 282c3564ae1a8872cefacb527c7d9dbc05362dc5 Pseudomerge Contributor=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe ===== 1466s + test 282c3564ae1a8872cefacb527c7d9dbc05362dc5 = 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1466s + local cetype=Pseudomerge 1466s + '[' xPseudomerge = xPseudomerge ']' 1466s + cetype=SAME 1466s ++ git log -n1 --pretty=format:%P 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1466s + local 'parents=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 1466s + expect='cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 1466s + enparents=1 1466s + : Pseudomerge/SAME 'cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s + expect=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1466s + expect=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1466s + enparents=2 1466s + git diff --quiet cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe..282c3564ae1a8872cefacb527c7d9dbc05362dc5 1466s + etypes=AddPatchesInterop-Upstream 1466s + : 'reject pointless pseudomerges' 1466s + local 'overwritten= 2a87115bc3f8ca826ea007ce753107074ca7c619' 1466s + overwritten=2a87115bc3f8ca826ea007ce753107074ca7c619 1466s + t-git-debrebase analyse 2a87115bc3f8ca826ea007ce753107074ca7c619 1466s + local gdr=git-debrebase 1466s + : ' 1466s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1466s + git-debrebase --dgit=dgit -D analyse 2a87115bc3f8ca826ea007ce753107074ca7c619 1466s git-debrebase *** WALK 2a87115bc3f8ca826ea007ce753107074ca7c619 1 *main::STDOUT 1466s git-debrebase get_differs cd1a73b0d571c79ca12a7d8b4a4a93b863931061 e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e = 0x10 1466s git-debrebase classify 2a87115bc3f8ca826ea007ce753107074ca7c619 $t=e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e @p cd1a73b0d571c79ca12a7d8b4a4a93b863931061/0x10 1466s git-debrebase = Changelog {"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Parents" => [{"Differs" => 16,"CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061","Ix" => 0}],"Hdr" => "tree e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e\nparent cd1a73b0d571c79ca12a7d8b4a4a93b863931061\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e","Msg" => "dch -r -D unstable\n","Type" => "Changelog"} 1466s git-debrebase get_differs 2ceed1229dd14a9c7bd40480c061a7e55243e34f d46f208b7607ba8804649163cd2bead722b3dcd1 = 0x22 1466s git-debrebase classify cd1a73b0d571c79ca12a7d8b4a4a93b863931061 $t=d46f208b7607ba8804649163cd2bead722b3dcd1 @p 2ceed1229dd14a9c7bd40480c061a7e55243e34f/0x22 1466s git-debrebase = Mixed {"Hdr" => "tree d46f208b7607ba8804649163cd2bead722b3dcd1\nparent 2ceed1229dd14a9c7bd40480c061a7e55243e34f\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Msg" => "MIXED add both() (edits)\n","Tree" => "d46f208b7607ba8804649163cd2bead722b3dcd1","Parents" => [{"Differs" => 34,"CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f","Ix" => 0}],"Type" => "Mixed","CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061"} 1466s git-debrebase get_differs 1ee5d138031b9e8febce2769522b7ff8faa92fe3 e0f113b557570441f656fe976c2e2317cf95b193 = 0x2 1466s git-debrebase classify 2ceed1229dd14a9c7bd40480c061a7e55243e34f $t=e0f113b557570441f656fe976c2e2317cf95b193 @p 1ee5d138031b9e8febce2769522b7ff8faa92fe3/0x2 1466s git-debrebase = Upstream {"CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f","Tree" => "e0f113b557570441f656fe976c2e2317cf95b193","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","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3"}],"Type" => "Upstream"} 1466s git-debrebase get_differs e3ea5bfb0516ddc14aa79d0498e07ca91defd33b f9239e94551063b14f3d1dca12ff06dbd096b2af = 0x20 1466s git-debrebase classify 1ee5d138031b9e8febce2769522b7ff8faa92fe3 $t=f9239e94551063b14f3d1dca12ff06dbd096b2af @p e3ea5bfb0516ddc14aa79d0498e07ca91defd33b/0x20 1466s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "f9239e94551063b14f3d1dca12ff06dbd096b2af","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","Parents" => [{"Differs" => 32,"CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b","Ix" => 0}],"CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3"} 1466s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 = 0x10 1466s git-debrebase classify e3ea5bfb0516ddc14aa79d0498e07ca91defd33b $t=367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 1466s git-debrebase = Changelog {"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","Tree" => "367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7","Parents" => [{"Ix" => 0,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Differs" => 16}]} 1466s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1466s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1466s git-debrebase = AddPatches {"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Parents" => [{"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Differs" => 4,"Ix" => 0}],"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","Type" => "AddPatches"} 1466s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1466s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1466s git-debrebase = Changelog {"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Differs" => 16,"Ix" => 0}],"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","Type" => "Changelog"} 1466s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1466s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1466s git-debrebase = Changelog {"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Parents" => [{"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Ix" => 0}],"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 1466s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1466s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1466s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1466s git-debrebase = Pseudomerge {"Contributor" => {"Differs" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0},"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Overwritten" => [{"Ix" => 1,"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","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]],"Type" => "Pseudomerge"} 1466s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1466s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1466s git-debrebase = Upstream {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","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","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2,"Ix" => 0}]} 1466s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1466s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1466s git-debrebase = Upstream {"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","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","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream"} 1466s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1466s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1466s git-debrebase = 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","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 1466s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1466s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1466s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1466s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [{"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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 1466s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 6 upp 6 proc 15 pm 0 1466s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1466s ' 1466s + local ocid otype oinfo 1466s + read ocid otype oinfo 1466s + case "$otype" in 1466s ++ printf %s 'cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 1466s ++ wc -w 1466s + local cnparents=2 1466s + test 2 = 2 1466s ++ for f in $parents 1466s ++ echo cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1466s ++ for f in $parents 1466s ++ echo 2a87115bc3f8ca826ea007ce753107074ca7c619 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=2 1466s + test 2 = 2 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe AddPatches ===== 1466s + test cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe = cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1466s + local cetype=AddPatchesInterop 1466s + '[' xAddPatches = xAddPatchesInterop ']' 1466s ++ git log -n1 --pretty=format:%P cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1466s + local parents=701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1466s + expect=701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1466s + enparents=1 1466s + : AddPatches/AddPatchesInterop 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + git log -n1 --pretty=format:%B 1466s + grep '^\[git-debrebase[ :]' 1466s [git-debrebase pseudomerge: stitch] 1466s + case "$ctype" in 1466s + git diff --quiet 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0..cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe -- :. ':!debian/patches' 1466s + etypes=Upstream 1466s ++ printf %s 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s ++ wc -w 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 Upstream ===== 1466s + test 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 = 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1466s + local cetype=Upstream 1466s + '[' xUpstream = xUpstream ']' 1466s + cetype=SAME 1466s ++ git log -n1 --pretty=format:%P 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1466s + local parents=ccfbba34db87d1958014a2d21910c0101c8899d6 1466s + expect=ccfbba34db87d1958014a2d21910c0101c8899d6 1466s + enparents=1 1466s + : Upstream/SAME ccfbba34db87d1958014a2d21910c0101c8899d6 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s ++ printf %s ccfbba34db87d1958014a2d21910c0101c8899d6 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo ccfbba34db87d1958014a2d21910c0101c8899d6 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== ccfbba34db87d1958014a2d21910c0101c8899d6 Upstream ===== 1466s + test ccfbba34db87d1958014a2d21910c0101c8899d6 = ccfbba34db87d1958014a2d21910c0101c8899d6 1466s + local cetype=Upstream 1466s + '[' xUpstream = xUpstream ']' 1466s + cetype=SAME 1466s ++ git log -n1 --pretty=format:%P ccfbba34db87d1958014a2d21910c0101c8899d6 1466s + local parents=57c5b974d287db76460be14f71b4dc55a9bf276e 1466s + expect=57c5b974d287db76460be14f71b4dc55a9bf276e 1466s + enparents=1 1466s + : Upstream/SAME 57c5b974d287db76460be14f71b4dc55a9bf276e 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s ++ printf %s 57c5b974d287db76460be14f71b4dc55a9bf276e 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo 57c5b974d287db76460be14f71b4dc55a9bf276e 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== 57c5b974d287db76460be14f71b4dc55a9bf276e Upstream ===== 1466s + test 57c5b974d287db76460be14f71b4dc55a9bf276e = 57c5b974d287db76460be14f71b4dc55a9bf276e 1466s + local cetype=Upstream 1466s + '[' xUpstream = xUpstream ']' 1466s + cetype=SAME 1466s ++ git log -n1 --pretty=format:%P 57c5b974d287db76460be14f71b4dc55a9bf276e 1466s + local parents=af4f554362ff02a1bbae558a182bb3c926512138 1466s + expect=af4f554362ff02a1bbae558a182bb3c926512138 1466s + enparents=1 1466s + : Upstream/SAME af4f554362ff02a1bbae558a182bb3c926512138 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s ++ printf %s af4f554362ff02a1bbae558a182bb3c926512138 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo af4f554362ff02a1bbae558a182bb3c926512138 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== af4f554362ff02a1bbae558a182bb3c926512138 Upstream ===== 1466s + test af4f554362ff02a1bbae558a182bb3c926512138 = af4f554362ff02a1bbae558a182bb3c926512138 1466s + local cetype=Upstream 1466s + '[' xUpstream = xUpstream ']' 1466s + cetype=SAME 1466s ++ git log -n1 --pretty=format:%P af4f554362ff02a1bbae558a182bb3c926512138 1466s + local parents=b013e77447acc11029f98a8aa19d74b4c2c315d7 1466s + expect=b013e77447acc11029f98a8aa19d74b4c2c315d7 1466s + enparents=1 1466s + : Upstream/SAME b013e77447acc11029f98a8aa19d74b4c2c315d7 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s ++ printf %s b013e77447acc11029f98a8aa19d74b4c2c315d7 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo b013e77447acc11029f98a8aa19d74b4c2c315d7 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== b013e77447acc11029f98a8aa19d74b4c2c315d7 Upstream ===== 1466s + test b013e77447acc11029f98a8aa19d74b4c2c315d7 = b013e77447acc11029f98a8aa19d74b4c2c315d7 1466s + local cetype=Upstream 1466s + '[' xUpstream = xUpstream ']' 1466s + cetype=SAME 1466s ++ git log -n1 --pretty=format:%P b013e77447acc11029f98a8aa19d74b4c2c315d7 1466s + local parents=cd67898e896264914067d3c0dee667e61099f3c8 1466s + expect=cd67898e896264914067d3c0dee667e61099f3c8 1466s + enparents=1 1466s + : Upstream/SAME cd67898e896264914067d3c0dee667e61099f3c8 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s ++ printf %s cd67898e896264914067d3c0dee667e61099f3c8 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo cd67898e896264914067d3c0dee667e61099f3c8 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== cd67898e896264914067d3c0dee667e61099f3c8 Changelog ===== 1466s + test cd67898e896264914067d3c0dee667e61099f3c8 = cd67898e896264914067d3c0dee667e61099f3c8 1466s + local cetype=Upstream 1466s + '[' xChangelog = xUpstream ']' 1466s ++ git log -n1 --pretty=format:%P cd67898e896264914067d3c0dee667e61099f3c8 1466s + local parents=8e4834ab8bffee2a148fe5e4a53f45b914afd569 1466s + expect=8e4834ab8bffee2a148fe5e4a53f45b914afd569 1466s + enparents=1 1466s + : Changelog/Upstream 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + '[' x '!=' x ']' 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s + git diff --quiet 8e4834ab8bffee2a148fe5e4a53f45b914afd569..cd67898e896264914067d3c0dee667e61099f3c8 -- :. ':!debian/changelog' 1466s + etypes=Packaging 1466s ++ printf %s 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== 8e4834ab8bffee2a148fe5e4a53f45b914afd569 Packaging ===== 1466s + test 8e4834ab8bffee2a148fe5e4a53f45b914afd569 = 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1466s + local cetype=Packaging 1466s + '[' xPackaging = xPackaging ']' 1466s + cetype=SAME 1466s ++ git log -n1 --pretty=format:%P 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1466s + local parents=a1a56f704487b6339119bdb910659f5519f0c84d 1466s + expect=a1a56f704487b6339119bdb910659f5519f0c84d 1466s + enparents=1 1466s + : Packaging/SAME a1a56f704487b6339119bdb910659f5519f0c84d 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :. ':!debian' 1466s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :debian/patches 1466s + etypes=Packaging 1466s ++ printf %s a1a56f704487b6339119bdb910659f5519f0c84d 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo a1a56f704487b6339119bdb910659f5519f0c84d 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== a1a56f704487b6339119bdb910659f5519f0c84d Packaging ===== 1466s + test a1a56f704487b6339119bdb910659f5519f0c84d = a1a56f704487b6339119bdb910659f5519f0c84d 1466s + local cetype=Packaging 1466s + '[' xPackaging = xPackaging ']' 1466s + cetype=SAME 1466s ++ git log -n1 --pretty=format:%P a1a56f704487b6339119bdb910659f5519f0c84d 1466s + local parents=c7dc423ffb995d941617811c9612ee6d65ee3b84 1466s + expect=c7dc423ffb995d941617811c9612ee6d65ee3b84 1466s + enparents=1 1466s + : Packaging/SAME c7dc423ffb995d941617811c9612ee6d65ee3b84 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :. ':!debian' 1466s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :debian/patches 1466s + etypes=Packaging 1466s ++ printf %s c7dc423ffb995d941617811c9612ee6d65ee3b84 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo c7dc423ffb995d941617811c9612ee6d65ee3b84 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== c7dc423ffb995d941617811c9612ee6d65ee3b84 Changelog ===== 1466s + test c7dc423ffb995d941617811c9612ee6d65ee3b84 = c7dc423ffb995d941617811c9612ee6d65ee3b84 1466s + local cetype=Packaging 1466s + '[' xChangelog = xPackaging ']' 1466s ++ git log -n1 --pretty=format:%P c7dc423ffb995d941617811c9612ee6d65ee3b84 1466s + local parents=32b1b8f0bdc575561b14de2ec9711d768a12d928 1466s + expect=32b1b8f0bdc575561b14de2ec9711d768a12d928 1466s + enparents=1 1466s + : Changelog/Packaging 32b1b8f0bdc575561b14de2ec9711d768a12d928 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s + git diff --quiet 32b1b8f0bdc575561b14de2ec9711d768a12d928..c7dc423ffb995d941617811c9612ee6d65ee3b84 -- :. ':!debian/changelog' 1466s + etypes=Packaging 1466s ++ printf %s 32b1b8f0bdc575561b14de2ec9711d768a12d928 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo 32b1b8f0bdc575561b14de2ec9711d768a12d928 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== 32b1b8f0bdc575561b14de2ec9711d768a12d928 Changelog ===== 1466s + test 32b1b8f0bdc575561b14de2ec9711d768a12d928 = 32b1b8f0bdc575561b14de2ec9711d768a12d928 1466s + local cetype=Packaging 1466s + '[' xChangelog = xPackaging ']' 1466s ++ git log -n1 --pretty=format:%P 32b1b8f0bdc575561b14de2ec9711d768a12d928 1466s + local parents=9214201f528bae71f4647709e2357407746739d5 1466s + expect=9214201f528bae71f4647709e2357407746739d5 1466s + enparents=1 1466s + : Changelog/Packaging 9214201f528bae71f4647709e2357407746739d5 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s + git diff --quiet 9214201f528bae71f4647709e2357407746739d5..32b1b8f0bdc575561b14de2ec9711d768a12d928 -- :. ':!debian/changelog' 1466s + etypes=Packaging 1466s ++ printf %s 9214201f528bae71f4647709e2357407746739d5 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ for f in $parents 1466s ++ echo 9214201f528bae71f4647709e2357407746739d5 1466s ++ wc -w 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== 9214201f528bae71f4647709e2357407746739d5 Changelog ===== 1466s + test 9214201f528bae71f4647709e2357407746739d5 = 9214201f528bae71f4647709e2357407746739d5 1466s + local cetype=Packaging 1466s + '[' xChangelog = xPackaging ']' 1466s ++ git log -n1 --pretty=format:%P 9214201f528bae71f4647709e2357407746739d5 1466s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1466s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1466s + enparents=1 1466s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..9214201f528bae71f4647709e2357407746739d5 -- :. ':!debian/changelog' 1466s + etypes=Packaging 1466s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1466s ++ wc -w 1466s + local cnparents=1 1466s + test 1 = 1 1466s ++ wc -w 1466s ++ for f in $parents 1466s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1466s ++ t-sort -u 1466s ++ LC_COLLATE=C 1466s ++ sort -u 1466s + local cndparents=1 1466s + test 1 = 1 1466s + case "$parents" in 1466s + case "$ctype" in 1466s + read cid ctype info 1466s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1466s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1466s + local cetype=Packaging 1466s + '[' xAnchor = xPackaging ']' 1466s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1466s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1466s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1466s + enparents=1 1466s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1466s + case "$ctype/$cetype" in 1466s + case "$ctype/$etypes" in 1466s + case "$cetype" in 1466s + case "$ctype" in 1466s + break 1466s + t-expect-fail 'E:add a new changelog stanza.*and try again' t-dgit push-source 1466s + local 'mpat=E:add a new changelog stanza.*and try again' 1466s + shift 1466s + set +o pipefail 1466s + LC_MESSAGES=C 1466s + LANGUAGE=C 1466s + t-dgit push-source 1466s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1466s + local dgit=dgit 1466s + pwd 1466s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1466s + : ' 1466s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1466s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push-source 1466s | git rev-parse --show-toplevel 1466s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1466s | git config -z --get-regexp --local '.*' 1466s | git config -z --get-regexp --local '.*' 1466s | git config -z --get-regexp --global '.*' 1466s | git config -z --get-regexp --system '.*' 1466s format 3.0 (quilt), quilt mode linear 1466s Format `3.0 (quilt)', need to check/update patch stack 1466s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1466s => `' 1466s + git diff --quiet HEAD 1466s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1466s canonical suite name for unstable is sid 1466s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1466s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1466s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1466s | git rev-parse 'HEAD~0' 1466s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1466s | git symbolic-ref -q HEAD 1466s => `refs/heads/master' 1466s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1466s CD work 1466s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1466s + git reset -q --hard 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1466s examining quilt state (multiple patches, linear mode) 1466s branch_is_gdr 282c3564ae1a8872cefacb527c7d9dbc05362dc5... 1466s branch_is_gdr 282c3564ae1a8872cefacb527c7d9dbc05362dc5 gdr pseudomerge YES 1466s + git reset -q --hard 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1466s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1467s | git rev-parse 'HEAD~0' 1467s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1467s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1467s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1467s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1467s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1467s CD fake 1467s | find -name .git -prune -print0 1467s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1467s + git checkout -f 282c3564ae1a8872cefacb527c7d9dbc05362dc5 -- debian 1467s + git add -Af . 1467s | git write-tree 1467s => `f904c66e1710e1151bce7bfcbc6763f6ea826c19' 1467s fake orig tree object f904c66e1710e1151bce7bfcbc6763f6ea826c19 1467s CD .. 1467s + git reset -q --hard 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1467s CD ../fake 1467s + git add -Af . 1467s | git write-tree 1467s => `02ab455c92be6f90e27681286d7d90d9169dff59' 1467s fake o+d/p tree object f904c66e1710e1151bce7bfcbc6763f6ea826c19 1467s CD ../work 1467s | git ls-tree --name-only -z 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1467s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1467s | git diff-tree -z --no-renames -r f904c66e1710e1151bce7bfcbc6763f6ea826c19 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1467s => `: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' 1467s quiltify_trees_differ f904c66e1710e1151bce7bfcbc6763f6ea826c19 282c3564ae1a8872cefacb527c7d9dbc05362dc5 => 1 1467s | git diff-tree -z --no-renames --name-only -r 282c3564ae1a8872cefacb527c7d9dbc05362dc5 02ab455c92be6f90e27681286d7d90d9169dff59 1467s => `' 1467s quiltify_trees_differ 282c3564ae1a8872cefacb527c7d9dbc05362dc5 02ab455c92be6f90e27681286d7d90d9169dff59 => 0 1467s | git diff-tree -z --no-renames --name-only -r f904c66e1710e1151bce7bfcbc6763f6ea826c19 02ab455c92be6f90e27681286d7d90d9169dff59 1467s => `lib.c\x00new-upstream-file\x00src.c\x00' 1467s quiltify_trees_differ f904c66e1710e1151bce7bfcbc6763f6ea826c19 02ab455c92be6f90e27681286d7d90d9169dff59 => 1 1467s differences @dl ## ## == == == ==. 1467s dgit: base trees orig=f904c66e1710e1151bce o+d/p=02ab455c92be6f90e276 1467s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1467s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1467s starting quiltify (multiple patches, linear mode) 1467s | git ls-tree --name-only 282c3564ae1a8872cefacb527c7d9dbc05362dc5 -- debian/rules debian/control 1467s => `debian/control'... 1467s quiltify investigate 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1467s | git diff-tree -z --no-renames --name-only 282c3564ae1a8872cefacb527c7d9dbc05362dc5 02ab455c92be6f90e27681286d7d90d9169dff59 1467s => `' 1467s quiltify_trees_differ 282c3564ae1a8872cefacb527c7d9dbc05362dc5 02ab455c92be6f90e27681286d7d90d9169dff59 => 0 1467s search finished hooray! 1467s quiltify linearisation planning successful, executing... 1467s + git checkout -q master 1467s | git status --ignored --porcelain 1467s => `?? .pc/' 1467s nothing quilty to commit, ok. 1467s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1467s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1467s | git rev-parse 'HEAD~0' 1467s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1467s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1467s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1467s CD work 1467s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1467s + git reset -q --hard 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1467s CD .. 1467s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1467s dpkg-source: info: using source format '3.0 (quilt)' 1467s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1467s dpkg-source: info: using patch list from debian/patches/series 1467s dpkg-source: info: building example in example_2.0-3.debian.tar.xz 1467s dpkg-source: info: building example in example_2.0-3.dsc 1467s CD work 1467s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1467s changelog will contain changes since 2.0-2 1467s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-3_source.changes dpkg-genchanges -S -v2.0-2 1468s dpkg-genchanges: info: not including original source code in upload 1468s CD .. 1468s moving example_2.0-3.dsc, example_2.0-3_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1468s renaming (Files) example_2.0.orig.tar.gz 1468s renaming (Files) example_2.0-3.debian.tar.xz 1468s renaming (dsc) example_2.0-3.dsc 1468s renaming (changes) example_2.0-3_source.changes 1468s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1468s actually entering push 1468s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1468s => `1' 1468s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1468s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1468s git_lrfetch_sane iteration 0 1468s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1468s => 282c3564ae1a8872cefacb527c7d9dbc05362dc5 refs/dgit/sid 1468s => 95163808096ecc72500a41bf930ff04d7f20b577 refs/tags/archive/test-dummy/2.0-1 1468s => eac015fbcec6042cef3a3de967f94bbde78a94d2 refs/tags/archive/test-dummy/2.0-2 1468s => c93dd4ea0f100fad47ec94ef656d205385668cee refs/tags/archive/test-dummy/2.0-3 1468s => 8fd01e541f0f80470af54cc3ccb229f586c2a7ef refs/tags/test-dummy/2.0-1 1468s => 1960e504e15369045525735aa7c0d6fb79f2c208 refs/tags/test-dummy/2.0-2 1468s => 2473e2a61e36063430df9c320184b2122d2322a7 refs/tags/test-dummy/2.0-3 1468s 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 1468s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1468s | git for-each-ref refs/dgit-fetch/test-dummy 1468s |> 282c3564ae1a8872cefacb527c7d9dbc05362dc5 commit refs/dgit-fetch/test-dummy/dgit/sid 1468s |> 95163808096ecc72500a41bf930ff04d7f20b577 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1468s |> eac015fbcec6042cef3a3de967f94bbde78a94d2 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1468s |> c93dd4ea0f100fad47ec94ef656d205385668cee tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 1468s |> 8fd01e541f0f80470af54cc3ccb229f586c2a7ef tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1468s |> 1960e504e15369045525735aa7c0d6fb79f2c208 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1468s |> 2473e2a61e36063430df9c320184b2122d2322a7 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 1468s git_lrfetch_sane: tidying any old suite lrfetchrefs 1468s | git for-each-ref refs/dgit-fetch/sid 1468s git_lrfetch_sane: git fetch --no-insane emulation complete 1468s $VAR1 = { 1468s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => '1960e504e15369045525735aa7c0d6fb79f2c208', 1468s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '95163808096ecc72500a41bf930ff04d7f20b577', 1468s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => 'eac015fbcec6042cef3a3de967f94bbde78a94d2', 1468s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3' => 'c93dd4ea0f100fad47ec94ef656d205385668cee', 1468s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '8fd01e541f0f80470af54cc3ccb229f586c2a7ef', 1468s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3' => '2473e2a61e36063430df9c320184b2122d2322a7', 1468s 'refs/dgit-fetch/test-dummy/dgit/sid' => '282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s }; 1468s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1468s |> 95163808096ecc72500a41bf930ff04d7f20b577 tag refs/tags/archive/test-dummy/2.0-1 1468s currently refs/tags/archive/test-dummy/2.0-1=95163808096ecc72500a41bf930ff04d7f20b577 1468s |> eac015fbcec6042cef3a3de967f94bbde78a94d2 tag refs/tags/archive/test-dummy/2.0-2 1468s currently refs/tags/archive/test-dummy/2.0-2=eac015fbcec6042cef3a3de967f94bbde78a94d2 1468s |> c93dd4ea0f100fad47ec94ef656d205385668cee tag refs/tags/archive/test-dummy/2.0-3 1468s currently refs/tags/archive/test-dummy/2.0-3=c93dd4ea0f100fad47ec94ef656d205385668cee 1468s |> 8fd01e541f0f80470af54cc3ccb229f586c2a7ef tag refs/tags/test-dummy/2.0-1 1468s currently refs/tags/test-dummy/2.0-1=8fd01e541f0f80470af54cc3ccb229f586c2a7ef 1468s |> 1960e504e15369045525735aa7c0d6fb79f2c208 tag refs/tags/test-dummy/2.0-2 1468s currently refs/tags/test-dummy/2.0-2=1960e504e15369045525735aa7c0d6fb79f2c208 1468s |> 2473e2a61e36063430df9c320184b2122d2322a7 tag refs/tags/test-dummy/2.0-3 1468s currently refs/tags/test-dummy/2.0-3=2473e2a61e36063430df9c320184b2122d2322a7 1468s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1468s |> 95163808096ecc72500a41bf930ff04d7f20b577 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1468s offered refs/tags/archive/test-dummy/2.0-1=95163808096ecc72500a41bf930ff04d7f20b577 1468s |> eac015fbcec6042cef3a3de967f94bbde78a94d2 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1468s offered refs/tags/archive/test-dummy/2.0-2=eac015fbcec6042cef3a3de967f94bbde78a94d2 1468s |> c93dd4ea0f100fad47ec94ef656d205385668cee tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 1468s offered refs/tags/archive/test-dummy/2.0-3=c93dd4ea0f100fad47ec94ef656d205385668cee 1468s |> 8fd01e541f0f80470af54cc3ccb229f586c2a7ef tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1468s offered refs/tags/test-dummy/2.0-1=8fd01e541f0f80470af54cc3ccb229f586c2a7ef 1468s |> 1960e504e15369045525735aa7c0d6fb79f2c208 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1468s offered refs/tags/test-dummy/2.0-2=1960e504e15369045525735aa7c0d6fb79f2c208 1468s |> 2473e2a61e36063430df9c320184b2122d2322a7 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 1468s offered refs/tags/test-dummy/2.0-3=2473e2a61e36063430df9c320184b2122d2322a7 1468s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1468s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_2.0-2.dsc... 1468s get_archive_dsc: Version 2.0-2 1468s last upload to archive: specified git info (test-dummy) 1468s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 1468s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 1468s GCF>| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1468s GCF<| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit 350 1468s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s previous reference hash=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s fetch_from_archive: lastfetch=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s using existing example_2.0.orig.tar.gz 1468s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1468s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1468s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1468s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 1468s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1468s 1468s Git commit in archive is behind the last version allegedly pushed/uploaded. 1468s Commit referred to by archive: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1468s Last version pushed with dgit: 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s Perhaps the upload is stuck in incoming. Using the version from git. 1468s 1468s | git merge-base 282c3564ae1a8872cefacb527c7d9dbc05362dc5 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s fetch mergeinfos: 1468s commit 282c3564ae1a8872cefacb527c7d9dbc05362dc5 dgit suite branch on dgit git server 1468s fetch hash=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s | git merge-base 282c3564ae1a8872cefacb527c7d9dbc05362dc5 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git merge-base 282c3564ae1a8872cefacb527c7d9dbc05362dc5 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s | git log -n2 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s => `commit 282c3564ae1a8872cefacb527c7d9dbc05362dc5'... 1468s | git ls-tree -lrz -- 282c3564ae1a8872cefacb527c7d9dbc05362dc5: 1468s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1468s + git check-ref-format archive/test-dummy/2.0-3 1468s | git symbolic-ref -q HEAD 1468s => `refs/heads/master' 1468s | git rev-parse 'HEAD~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s ffq_prev_branchinfo branch current refs/heads/master 1468s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1468s => `' 1468s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git merge-base 282c3564ae1a8872cefacb527c7d9dbc05362dc5 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git status --ignored --porcelain 1468s => `' 1468s nothing quilty to commit, ok. 1468s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1468s => `' 1468s + git diff --quiet HEAD 1468s | git merge-base 282c3564ae1a8872cefacb527c7d9dbc05362dc5 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 1468s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 1468s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-3' 1468s => `c93dd4ea0f100fad47ec94ef656d205385668cee' 1468s 1468s Version 2.0-3 has already been tagged (pushed?) 1468s If this was a failed (or incomplete or rejected) upload by you, just 1468s add a new changelog stanza for a new version number and try again. 1468s 1468s dgit: error: Tag archive/test-dummy/2.0-3 already exists. 1468s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1468s del_lrfetchrefs... 1468s del_lrfetchrefs: 282c3564ae1a8872cefacb527c7d9dbc05362dc5 refs/dgit-fetch/test-dummy/dgit/sid 1468s del_lrfetchrefs: 95163808096ecc72500a41bf930ff04d7f20b577 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1468s del_lrfetchrefs: eac015fbcec6042cef3a3de967f94bbde78a94d2 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 1468s del_lrfetchrefs: c93dd4ea0f100fad47ec94ef656d205385668cee refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 1468s del_lrfetchrefs: 8fd01e541f0f80470af54cc3ccb229f586c2a7ef refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1468s del_lrfetchrefs: 1960e504e15369045525735aa7c0d6fb79f2c208 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 1468s del_lrfetchrefs: 2473e2a61e36063430df9c320184b2122d2322a7 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 1468s + local 'ps=255 0' 1468s + set -o pipefail 1468s + case $ps in 1468s + t-grep-mpat 'E:add a new changelog stanza.*and try again' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1468s + local 'mpat=E:add a new changelog stanza.*and try again' 1468s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1468s + local grepper=fgrep 1468s + case "$mpat" in 1468s + case "$mpat" in 1468s + grepper=egrep 1468s + mpat='add a new changelog stanza.*and try again' 1468s + egrep -e 'add a new changelog stanza.*and try again' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1468s add a new changelog stanza for a new version number and try again. 1468s + git branch before-noop 1468s + t-git-next-date 1468s + GIT_COMMITTER_DATE='1530000004 +0100' 1468s + GIT_AUTHOR_DATE='1530000004 +0100' 1468s + t-git-debrebase 1468s + local gdr=git-debrebase 1468s + : ' 1468s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1468s + git-debrebase --dgit=dgit -D 1468s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1468s git-debrebase ffq check_specs * 1468s git-debrebase ffq merge master 1468s git-debrebase ffq check_remote origin remote fetch/merge branch 1468s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1468s OK, you are ahead of refs/remotes/origin/master 1468s git-debrebase ffq check_remote undef remote push branch 1468s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1468s OK, you are ahead of refs/remotes/dgit/dgit/sid 1468s git-debrebase *** WALK 282c3564ae1a8872cefacb527c7d9dbc05362dc5 0 - 1468s git-debrebase get_differs cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 = 0 1468s git-debrebase get_differs 2a87115bc3f8ca826ea007ce753107074ca7c619 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 1468s git-debrebase classify 282c3564ae1a8872cefacb527c7d9dbc05362dc5 $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe/0 2a87115bc3f8ca826ea007ce753107074ca7c619/0x4 1468s git-debrebase = Pseudomerge {"CommitId" => "282c3564ae1a8872cefacb527c7d9dbc05362dc5","Contributor" => {"Differs" => 0,"Ix" => 0,"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe"},"Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe\nparent 2a87115bc3f8ca826ea007ce753107074ca7c619\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Pseudomerge","Overwritten" => [{"Ix" => 1,"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Differs" => 4}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 1468s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 1468s git-debrebase classify cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0/0x4 1468s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0"}],"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Type" => "AddPatches","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1468s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 1468s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 1468s git-debrebase = Upstream {"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Parents" => [{"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Ix" => 0,"Differs" => 2}],"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Type" => "Upstream","Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1468s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 1468s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 1468s git-debrebase = Upstream {"Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Msg" => "UPSTREAM edit src.c (edits)\n","Parents" => [{"Ix" => 0,"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Differs" => 2}],"Type" => "Upstream","Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"} 1468s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 1468s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 1468s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Parents" => [{"Differs" => 2,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1468s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 1468s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 1468s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7"}],"Type" => "Upstream","Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"} 1468s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 1468s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 1468s git-debrebase = Upstream {"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Parents" => [{"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Ix" => 0,"Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1468s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 1468s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 1468s 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,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Ix" => 0}]} 1468s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 1468s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 1468s git-debrebase = Packaging {"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Ix" => 0}],"Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging"} 1468s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 1468s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 1468s git-debrebase = Packaging {"Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Parents" => [{"Differs" => 32,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Ix" => 0}],"Msg" => "DEBIAN add zorkmid (edits)\n","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d"} 1468s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 1468s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1468s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16}],"Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","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","Type" => "Changelog"} 1468s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1468s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1468s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog"} 1468s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1468s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1468s git-debrebase = Changelog {"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1468s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1468s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1468s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1468s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"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},$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"} 1468s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 15 pm 0 1468s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1468s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1468s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 1468s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1468s git-debrebase WALK BUILD 9214201f528bae71f4647709e2357407746739d5 Debian (rewriting=0) 1468s git-debrebase WALK BUILD 32b1b8f0bdc575561b14de2ec9711d768a12d928 Debian (rewriting=0) 1468s git-debrebase WALK BUILD c7dc423ffb995d941617811c9612ee6d65ee3b84 Debian (rewriting=0) 1468s git-debrebase WALK BUILD a1a56f704487b6339119bdb910659f5519f0c84d Debian (rewriting=0) 1468s git-debrebase WALK BUILD 8e4834ab8bffee2a148fe5e4a53f45b914afd569 Debian (rewriting=0) 1468s git-debrebase WALK BUILD cd67898e896264914067d3c0dee667e61099f3c8 Debian (rewriting=0) 1468s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1468s git-debrebase WALK BUILD b013e77447acc11029f98a8aa19d74b4c2c315d7 Upstream (rewriting=0) 1468s git-debrebase WALK BUILD af4f554362ff02a1bbae558a182bb3c926512138 Upstream (rewriting=0) 1468s git-debrebase WALK BUILD 57c5b974d287db76460be14f71b4dc55a9bf276e Upstream (rewriting=0) 1468s git-debrebase WALK BUILD ccfbba34db87d1958014a2d21910c0101c8899d6 Upstream (rewriting=0) 1468s git-debrebase WALK BUILD 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 Upstream (rewriting=0) 1468s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1468s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1468s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1468s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 282c3564ae1a8872cefacb527c7d9dbc05362dc5 = 0x4 1468s git-debrebase *** WALK RETURN 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 cd67898e896264914067d3c0dee667e61099f3c8 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1468s git-debrebase: laundered (head was 282c3564ae1a8872cefacb527c7d9dbc05362dc5) 1468s git-debrebase >= update refs/ffq-prev/heads/master 282c3564ae1a8872cefacb527c7d9dbc05362dc5 0000000000000000000000000000000000000000 1468s git-debrebase >= delete refs/debrebase-last/heads/master 1468s git-debrebase >= update HEAD 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s git-debrebase >$ 1468s Recorded previous head for preservation 1468s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1468s ' 1468s + t-git-debrebase stitch 1468s + local gdr=git-debrebase 1468s + : ' 1468s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1468s + git-debrebase --dgit=dgit -D stitch 1468s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1468s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 1468s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 1468s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"}],"Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Type" => "Upstream","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1468s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 1468s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 1468s git-debrebase = Upstream {"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (edits)\n","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Type" => "Upstream"} 1468s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 1468s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 1468s git-debrebase = Upstream {"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}],"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Type" => "Upstream","Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1468s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 1468s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 1468s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Type" => "Upstream","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7"}],"Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 1468s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 1468s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 1468s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Type" => "Upstream","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","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}]} 1468s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 1468s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 1468s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"}],"Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Type" => "Changelog","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","Msg" => "dch -r -D unstable\n"} 1468s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 1468s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 1468s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Differs" => 32}],"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"} 1468s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 1468s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 1468s git-debrebase = Packaging {"Type" => "Packaging","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","Parents" => [{"Differs" => 32,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Ix" => 0}],"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"} 1468s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 1468s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1468s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Hdr" => "tree b89348f5d96604173feba80c38b2d9346b49d90e\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Type" => "Changelog","Msg" => "dch -v 2.0-3 -m testing\n","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e"} 1468s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1468s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1468s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16,"Ix" => 0}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"} 1468s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1468s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1468s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","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"} 1468s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1468s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1468s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1468s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1468s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 282c3564ae1a8872cefacb527c7d9dbc05362dc5 = 0x4 1468s git-debrebase >= delete refs/ffq-prev/heads/master 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1468s git-debrebase >= update refs/debrebase-last/heads/master 282c3564ae1a8872cefacb527c7d9dbc05362dc5 0000000000000000000000000000000000000000 1468s git-debrebase >= update HEAD 282c3564ae1a8872cefacb527c7d9dbc05362dc5 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1468s git-debrebase >$ 1468s HEAD is now at 282c356 Declare fast forward / record previous work 1468s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1468s ' 1468s + t-gdr-good pushed-interop 1468s + local state=pushed-interop 1468s + local beforetag= 1468s + case $state in 1468s + t-gdr-made-patches 1468s + git log -n1 --pretty=format:%B 1468s + egrep '^\[git-debrebase' 1468s [git-debrebase pseudomerge: stitch] 1468s + git diff --quiet -- :. ':!debian/patches' 1468s + LC_MESSAGES=C 1468s + t-git-debrebase status 1468s + local gdr=git-debrebase 1468s + : ' 1468s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1468s + git-debrebase --dgit=dgit -D status 1468s git-debrebase get_differs cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 = 0 1468s git-debrebase get_differs 2a87115bc3f8ca826ea007ce753107074ca7c619 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 1468s git-debrebase classify 282c3564ae1a8872cefacb527c7d9dbc05362dc5 $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe/0 2a87115bc3f8ca826ea007ce753107074ca7c619/0x4 1468s git-debrebase = Pseudomerge {"Overwritten" => [{"Ix" => 1,"Differs" => 4,"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619"}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Type" => "Pseudomerge","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe\nparent 2a87115bc3f8ca826ea007ce753107074ca7c619\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Parents" => [{"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Differs" => 0,"Ix" => 0},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"CommitId" => "282c3564ae1a8872cefacb527c7d9dbc05362dc5"} 1468s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 1468s git-debrebase classify cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0/0x4 1468s 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","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0"}],"Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59"} 1468s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 1468s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 1468s git-debrebase = Upstream {"Parents" => [{"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Differs" => 2,"Ix" => 0}],"Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1468s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 1468s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 1468s git-debrebase = Upstream {"Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (edits)\n","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Parents" => [{"Differs" => 2,"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Ix" => 0}],"Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9"} 1468s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 1468s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 1468s git-debrebase = Upstream {"Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\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","Parents" => [{"Ix" => 0,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Differs" => 2}],"Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e"} 1468s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 1468s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 1468s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Parents" => [{"Differs" => 2,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Ix" => 0}],"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"} 1468s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 1468s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 1468s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8"}],"Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\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"} 1468s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 1468s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 1468s git-debrebase = Changelog {"Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","Parents" => [{"Ix" => 0,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Differs" => 16}],"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1468s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 1468s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 1468s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"}],"Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1468s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 1468s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 1468s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (edits)\n","Type" => "Packaging","Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d","Parents" => [{"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Differs" => 32,"Ix" => 0}],"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"} 1468s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 1468s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1468s 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","Msg" => "dch -v 2.0-3 -m testing\n","CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16,"Ix" => 0}],"Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e"} 1468s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1468s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1468s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","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"} 1468s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1468s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1468s 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","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5"} 1468s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1468s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1468s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1468s 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","Type" => "Anchor","OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 1468s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1468s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1468s ' 1468s + case $state in 1468s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 1468s branch contains furniture (not laundered) 1468s + egrep '^ stitched$' ../status.check 1468s stitched 1468s + t-gdr-good-analyse HEAD pushed-interop 1468s + local head=HEAD 1468s + local state=pushed-interop 1468s + local wsfx= 1468s + local etypes bwtip 1468s + case $state in 1468s + etypes=Pseudomerge-AddPatchesInterop-Upstream 1468s + anal=../anal 1468s + t-git-debrebase analyse HEAD 1468s + local gdr=git-debrebase 1468s + : ' 1468s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1468s + git-debrebase --dgit=dgit -D analyse HEAD 1469s git-debrebase *** WALK 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1 *main::STDOUT 1469s git-debrebase get_differs cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 = 0 1469s git-debrebase get_differs 2a87115bc3f8ca826ea007ce753107074ca7c619 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 1469s git-debrebase classify 282c3564ae1a8872cefacb527c7d9dbc05362dc5 $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe/0 2a87115bc3f8ca826ea007ce753107074ca7c619/0x4 1469s 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","CommitId" => "282c3564ae1a8872cefacb527c7d9dbc05362dc5","Overwritten" => [{"Ix" => 1,"Differs" => 4,"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619"}],"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe"},"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Type" => "Pseudomerge","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 1469s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 1469s git-debrebase classify cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0/0x4 1469s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0"}],"Type" => "AddPatches","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe"} 1469s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 1469s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 1469s 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","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"}],"Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1469s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 1469s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 1469s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e"}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (edits)\n","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"} 1469s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 1469s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 1469s git-debrebase = Upstream {"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"}],"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef"} 1469s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 1469s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 1469s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Ix" => 0}],"Type" => "Upstream","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 1469s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 1469s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 1469s git-debrebase = Upstream {"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8"}],"Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1469s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 1469s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 1469s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"}],"Type" => "Changelog","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","Msg" => "dch -r -D unstable\n","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1469s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 1469s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 1469s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"}],"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1469s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 1469s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 1469s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Ix" => 0}],"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","CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"} 1469s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 1469s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 1469s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16,"Ix" => 0}],"Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","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"} 1469s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1469s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 1469s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"} 1469s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1469s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1469s 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","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1469s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1469s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1469s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1469s git-debrebase = Anchor {"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},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"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]]} 1469s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 15 pm 0 1469s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1469s ' 1469s ++ git rev-parse HEAD 1469s + expect=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + exec 1469s + local cid ctype info nparents 1469s + read cid ctype info 1469s + : ===== 282c3564ae1a8872cefacb527c7d9dbc05362dc5 Pseudomerge Contributor=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe ===== 1469s + test 282c3564ae1a8872cefacb527c7d9dbc05362dc5 = 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + local cetype=Pseudomerge 1469s + '[' xPseudomerge = xPseudomerge ']' 1469s + cetype=SAME 1469s ++ git log -n1 --pretty=format:%P 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + local 'parents=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 1469s + expect='cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 1469s + enparents=1 1469s + : Pseudomerge/SAME 'cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s + expect=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1469s + expect=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1469s + enparents=2 1469s + git diff --quiet cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe..282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + etypes=AddPatchesInterop-Upstream 1469s + : 'reject pointless pseudomerges' 1469s + local 'overwritten= 2a87115bc3f8ca826ea007ce753107074ca7c619' 1469s + overwritten=2a87115bc3f8ca826ea007ce753107074ca7c619 1469s + t-git-debrebase analyse 2a87115bc3f8ca826ea007ce753107074ca7c619 1469s + local gdr=git-debrebase 1469s + : ' 1469s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1469s + git-debrebase --dgit=dgit -D analyse 2a87115bc3f8ca826ea007ce753107074ca7c619 1469s git-debrebase *** WALK 2a87115bc3f8ca826ea007ce753107074ca7c619 1 *main::STDOUT 1469s git-debrebase get_differs cd1a73b0d571c79ca12a7d8b4a4a93b863931061 e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e = 0x10 1469s git-debrebase classify 2a87115bc3f8ca826ea007ce753107074ca7c619 $t=e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e @p cd1a73b0d571c79ca12a7d8b4a4a93b863931061/0x10 1469s git-debrebase = Changelog {"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061","Differs" => 16}],"Msg" => "dch -r -D unstable\n","Tree" => "e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e","Hdr" => "tree e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e\nparent cd1a73b0d571c79ca12a7d8b4a4a93b863931061\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1469s git-debrebase get_differs 2ceed1229dd14a9c7bd40480c061a7e55243e34f d46f208b7607ba8804649163cd2bead722b3dcd1 = 0x22 1469s git-debrebase classify cd1a73b0d571c79ca12a7d8b4a4a93b863931061 $t=d46f208b7607ba8804649163cd2bead722b3dcd1 @p 2ceed1229dd14a9c7bd40480c061a7e55243e34f/0x22 1469s git-debrebase = Mixed {"Type" => "Mixed","CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061","Parents" => [{"Ix" => 0,"CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f","Differs" => 34}],"Tree" => "d46f208b7607ba8804649163cd2bead722b3dcd1","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"} 1469s git-debrebase get_differs 1ee5d138031b9e8febce2769522b7ff8faa92fe3 e0f113b557570441f656fe976c2e2317cf95b193 = 0x2 1469s git-debrebase classify 2ceed1229dd14a9c7bd40480c061a7e55243e34f $t=e0f113b557570441f656fe976c2e2317cf95b193 @p 1ee5d138031b9e8febce2769522b7ff8faa92fe3/0x2 1469s git-debrebase = Upstream {"CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (edits)\n","Tree" => "e0f113b557570441f656fe976c2e2317cf95b193","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"} 1469s git-debrebase get_differs e3ea5bfb0516ddc14aa79d0498e07ca91defd33b f9239e94551063b14f3d1dca12ff06dbd096b2af = 0x20 1469s git-debrebase classify 1ee5d138031b9e8febce2769522b7ff8faa92fe3 $t=f9239e94551063b14f3d1dca12ff06dbd096b2af @p e3ea5bfb0516ddc14aa79d0498e07ca91defd33b/0x20 1469s git-debrebase = Packaging {"Hdr" => "tree f9239e94551063b14f3d1dca12ff06dbd096b2af\nparent e3ea5bfb0516ddc14aa79d0498e07ca91defd33b\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (edits)\n","Tree" => "f9239e94551063b14f3d1dca12ff06dbd096b2af","Parents" => [{"Differs" => 32,"CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b","Ix" => 0}]} 1469s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 = 0x10 1469s git-debrebase classify e3ea5bfb0516ddc14aa79d0498e07ca91defd33b $t=367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 1469s git-debrebase = Changelog {"Hdr" => "tree 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Type" => "Changelog","CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b","Tree" => "367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7","Msg" => "dch -v 2.0-3 -m testing\n","Parents" => [{"Ix" => 0,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Differs" => 16}]} 1469s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1469s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1469s git-debrebase = AddPatches {"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Type" => "AddPatches","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1469s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1469s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1469s git-debrebase = Changelog {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 1469s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1469s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1469s 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"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Type" => "Changelog","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"} 1469s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1469s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1469s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1469s git-debrebase = Pseudomerge {"Overwritten" => [{"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8,"Ix" => 1}],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Type" => "Pseudomerge","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","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},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1469s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1469s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1469s git-debrebase = Upstream {"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,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0}],"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Type" => "Upstream"} 1469s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1469s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1469s git-debrebase = Upstream {"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","Parents" => [{"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0}],"Type" => "Upstream","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"} 1469s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1469s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1469s git-debrebase = Upstream {"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2}]} 1469s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1469s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1469s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1469s 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","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},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]]} 1469s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 6 upp 6 proc 15 pm 0 1469s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1469s ' 1469s + local ocid otype oinfo 1469s + read ocid otype oinfo 1469s + case "$otype" in 1469s ++ printf %s 'cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 1469s ++ wc -w 1469s + local cnparents=2 1469s + test 2 = 2 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s ++ wc -w 1469s ++ for f in $parents 1469s ++ echo cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1469s ++ for f in $parents 1469s ++ echo 2a87115bc3f8ca826ea007ce753107074ca7c619 1469s + local cndparents=2 1469s + test 2 = 2 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe AddPatches ===== 1469s + test cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe = cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1469s + local cetype=AddPatchesInterop 1469s + '[' xAddPatches = xAddPatchesInterop ']' 1469s ++ git log -n1 --pretty=format:%P cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 1469s + local parents=701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1469s + expect=701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1469s + enparents=1 1469s + : AddPatches/AddPatchesInterop 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + git log -n1 --pretty=format:%B 1469s + grep '^\[git-debrebase[ :]' 1469s [git-debrebase pseudomerge: stitch] 1469s + case "$ctype" in 1469s + git diff --quiet 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0..cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe -- :. ':!debian/patches' 1469s + etypes=Upstream 1469s ++ printf %s 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s ++ wc -w 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 Upstream ===== 1469s + test 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 = 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1469s + local cetype=Upstream 1469s + '[' xUpstream = xUpstream ']' 1469s + cetype=SAME 1469s ++ git log -n1 --pretty=format:%P 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1469s + local parents=ccfbba34db87d1958014a2d21910c0101c8899d6 1469s + expect=ccfbba34db87d1958014a2d21910c0101c8899d6 1469s + enparents=1 1469s + : Upstream/SAME ccfbba34db87d1958014a2d21910c0101c8899d6 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s ++ printf %s ccfbba34db87d1958014a2d21910c0101c8899d6 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo ccfbba34db87d1958014a2d21910c0101c8899d6 1469s ++ wc -w 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== ccfbba34db87d1958014a2d21910c0101c8899d6 Upstream ===== 1469s + test ccfbba34db87d1958014a2d21910c0101c8899d6 = ccfbba34db87d1958014a2d21910c0101c8899d6 1469s + local cetype=Upstream 1469s + '[' xUpstream = xUpstream ']' 1469s + cetype=SAME 1469s ++ git log -n1 --pretty=format:%P ccfbba34db87d1958014a2d21910c0101c8899d6 1469s + local parents=57c5b974d287db76460be14f71b4dc55a9bf276e 1469s + expect=57c5b974d287db76460be14f71b4dc55a9bf276e 1469s + enparents=1 1469s + : Upstream/SAME 57c5b974d287db76460be14f71b4dc55a9bf276e 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s ++ printf %s 57c5b974d287db76460be14f71b4dc55a9bf276e 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo 57c5b974d287db76460be14f71b4dc55a9bf276e 1469s ++ wc -w 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== 57c5b974d287db76460be14f71b4dc55a9bf276e Upstream ===== 1469s + test 57c5b974d287db76460be14f71b4dc55a9bf276e = 57c5b974d287db76460be14f71b4dc55a9bf276e 1469s + local cetype=Upstream 1469s + '[' xUpstream = xUpstream ']' 1469s + cetype=SAME 1469s ++ git log -n1 --pretty=format:%P 57c5b974d287db76460be14f71b4dc55a9bf276e 1469s + local parents=af4f554362ff02a1bbae558a182bb3c926512138 1469s + expect=af4f554362ff02a1bbae558a182bb3c926512138 1469s + enparents=1 1469s + : Upstream/SAME af4f554362ff02a1bbae558a182bb3c926512138 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s ++ printf %s af4f554362ff02a1bbae558a182bb3c926512138 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo af4f554362ff02a1bbae558a182bb3c926512138 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s ++ wc -w 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== af4f554362ff02a1bbae558a182bb3c926512138 Upstream ===== 1469s + test af4f554362ff02a1bbae558a182bb3c926512138 = af4f554362ff02a1bbae558a182bb3c926512138 1469s + local cetype=Upstream 1469s + '[' xUpstream = xUpstream ']' 1469s + cetype=SAME 1469s ++ git log -n1 --pretty=format:%P af4f554362ff02a1bbae558a182bb3c926512138 1469s + local parents=b013e77447acc11029f98a8aa19d74b4c2c315d7 1469s + expect=b013e77447acc11029f98a8aa19d74b4c2c315d7 1469s + enparents=1 1469s + : Upstream/SAME b013e77447acc11029f98a8aa19d74b4c2c315d7 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s ++ printf %s b013e77447acc11029f98a8aa19d74b4c2c315d7 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo b013e77447acc11029f98a8aa19d74b4c2c315d7 1469s ++ wc -w 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== b013e77447acc11029f98a8aa19d74b4c2c315d7 Upstream ===== 1469s + test b013e77447acc11029f98a8aa19d74b4c2c315d7 = b013e77447acc11029f98a8aa19d74b4c2c315d7 1469s + local cetype=Upstream 1469s + '[' xUpstream = xUpstream ']' 1469s + cetype=SAME 1469s ++ git log -n1 --pretty=format:%P b013e77447acc11029f98a8aa19d74b4c2c315d7 1469s + local parents=cd67898e896264914067d3c0dee667e61099f3c8 1469s + expect=cd67898e896264914067d3c0dee667e61099f3c8 1469s + enparents=1 1469s + : Upstream/SAME cd67898e896264914067d3c0dee667e61099f3c8 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s ++ printf %s cd67898e896264914067d3c0dee667e61099f3c8 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo cd67898e896264914067d3c0dee667e61099f3c8 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s ++ wc -w 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== cd67898e896264914067d3c0dee667e61099f3c8 Changelog ===== 1469s + test cd67898e896264914067d3c0dee667e61099f3c8 = cd67898e896264914067d3c0dee667e61099f3c8 1469s + local cetype=Upstream 1469s + '[' xChangelog = xUpstream ']' 1469s ++ git log -n1 --pretty=format:%P cd67898e896264914067d3c0dee667e61099f3c8 1469s + local parents=8e4834ab8bffee2a148fe5e4a53f45b914afd569 1469s + expect=8e4834ab8bffee2a148fe5e4a53f45b914afd569 1469s + enparents=1 1469s + : Changelog/Upstream 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + '[' x '!=' x ']' 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s + git diff --quiet 8e4834ab8bffee2a148fe5e4a53f45b914afd569..cd67898e896264914067d3c0dee667e61099f3c8 -- :. ':!debian/changelog' 1469s + etypes=Packaging 1469s ++ printf %s 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1469s ++ t-sort -u 1469s ++ wc -w 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== 8e4834ab8bffee2a148fe5e4a53f45b914afd569 Packaging ===== 1469s + test 8e4834ab8bffee2a148fe5e4a53f45b914afd569 = 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1469s + local cetype=Packaging 1469s + '[' xPackaging = xPackaging ']' 1469s + cetype=SAME 1469s ++ git log -n1 --pretty=format:%P 8e4834ab8bffee2a148fe5e4a53f45b914afd569 1469s + local parents=a1a56f704487b6339119bdb910659f5519f0c84d 1469s + expect=a1a56f704487b6339119bdb910659f5519f0c84d 1469s + enparents=1 1469s + : Packaging/SAME a1a56f704487b6339119bdb910659f5519f0c84d 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :. ':!debian' 1469s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :debian/patches 1469s + etypes=Packaging 1469s ++ printf %s a1a56f704487b6339119bdb910659f5519f0c84d 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo a1a56f704487b6339119bdb910659f5519f0c84d 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s ++ wc -w 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== a1a56f704487b6339119bdb910659f5519f0c84d Packaging ===== 1469s + test a1a56f704487b6339119bdb910659f5519f0c84d = a1a56f704487b6339119bdb910659f5519f0c84d 1469s + local cetype=Packaging 1469s + '[' xPackaging = xPackaging ']' 1469s + cetype=SAME 1469s ++ git log -n1 --pretty=format:%P a1a56f704487b6339119bdb910659f5519f0c84d 1469s + local parents=c7dc423ffb995d941617811c9612ee6d65ee3b84 1469s + expect=c7dc423ffb995d941617811c9612ee6d65ee3b84 1469s + enparents=1 1469s + : Packaging/SAME c7dc423ffb995d941617811c9612ee6d65ee3b84 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :. ':!debian' 1469s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :debian/patches 1469s + etypes=Packaging 1469s ++ printf %s c7dc423ffb995d941617811c9612ee6d65ee3b84 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo c7dc423ffb995d941617811c9612ee6d65ee3b84 1469s ++ t-sort -u 1469s ++ wc -w 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== c7dc423ffb995d941617811c9612ee6d65ee3b84 Changelog ===== 1469s + test c7dc423ffb995d941617811c9612ee6d65ee3b84 = c7dc423ffb995d941617811c9612ee6d65ee3b84 1469s + local cetype=Packaging 1469s + '[' xChangelog = xPackaging ']' 1469s ++ git log -n1 --pretty=format:%P c7dc423ffb995d941617811c9612ee6d65ee3b84 1469s + local parents=32b1b8f0bdc575561b14de2ec9711d768a12d928 1469s + expect=32b1b8f0bdc575561b14de2ec9711d768a12d928 1469s + enparents=1 1469s + : Changelog/Packaging 32b1b8f0bdc575561b14de2ec9711d768a12d928 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s + git diff --quiet 32b1b8f0bdc575561b14de2ec9711d768a12d928..c7dc423ffb995d941617811c9612ee6d65ee3b84 -- :. ':!debian/changelog' 1469s + etypes=Packaging 1469s ++ printf %s 32b1b8f0bdc575561b14de2ec9711d768a12d928 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo 32b1b8f0bdc575561b14de2ec9711d768a12d928 1469s ++ wc -w 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== 32b1b8f0bdc575561b14de2ec9711d768a12d928 Changelog ===== 1469s + test 32b1b8f0bdc575561b14de2ec9711d768a12d928 = 32b1b8f0bdc575561b14de2ec9711d768a12d928 1469s + local cetype=Packaging 1469s + '[' xChangelog = xPackaging ']' 1469s ++ git log -n1 --pretty=format:%P 32b1b8f0bdc575561b14de2ec9711d768a12d928 1469s + local parents=9214201f528bae71f4647709e2357407746739d5 1469s + expect=9214201f528bae71f4647709e2357407746739d5 1469s + enparents=1 1469s + : Changelog/Packaging 9214201f528bae71f4647709e2357407746739d5 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s + git diff --quiet 9214201f528bae71f4647709e2357407746739d5..32b1b8f0bdc575561b14de2ec9711d768a12d928 -- :. ':!debian/changelog' 1469s + etypes=Packaging 1469s ++ printf %s 9214201f528bae71f4647709e2357407746739d5 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo 9214201f528bae71f4647709e2357407746739d5 1469s ++ wc -w 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== 9214201f528bae71f4647709e2357407746739d5 Changelog ===== 1469s + test 9214201f528bae71f4647709e2357407746739d5 = 9214201f528bae71f4647709e2357407746739d5 1469s + local cetype=Packaging 1469s + '[' xChangelog = xPackaging ']' 1469s ++ git log -n1 --pretty=format:%P 9214201f528bae71f4647709e2357407746739d5 1469s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1469s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1469s + enparents=1 1469s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..9214201f528bae71f4647709e2357407746739d5 -- :. ':!debian/changelog' 1469s + etypes=Packaging 1469s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1469s ++ wc -w 1469s + local cnparents=1 1469s + test 1 = 1 1469s ++ for f in $parents 1469s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1469s ++ wc -w 1469s ++ t-sort -u 1469s ++ LC_COLLATE=C 1469s ++ sort -u 1469s + local cndparents=1 1469s + test 1 = 1 1469s + case "$parents" in 1469s + case "$ctype" in 1469s + read cid ctype info 1469s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1469s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1469s + local cetype=Packaging 1469s + '[' xAnchor = xPackaging ']' 1469s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1469s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1469s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1469s + enparents=1 1469s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1469s + case "$ctype/$cetype" in 1469s + case "$ctype/$etypes" in 1469s + case "$cetype" in 1469s + case "$ctype" in 1469s + break 1469s + t-refs-same-start 1469s + unset t_ref_val 1469s + t_ref_names=() 1469s + t-ref-same refs/heads/before-noop 1469s + local name=refs/heads/before-noop 1469s + local val 1469s ++ t-git-get-ref refs/heads/before-noop 1469s ++ local ref=refs/heads/before-noop 1469s ++ case "$ref" in 1469s ++ git show-ref -d refs/heads/before-noop 1469s ++ perl -ne ' 1469s $x = $1 if m#^(\w+) \Qrefs/heads/before-noop\E(?:\^\{\})?$#; 1469s END { print "$x\n" if length $x; } 1469s ' 1469s + val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + t-ref-same-val refs/heads/before-noop 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + local name=refs/heads/before-noop 1469s + local val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + case "${t_ref_val-unset}" in 1469s + t_ref_val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + t_ref_names+=("$name") 1469s + t-ref-head 1469s + local val 1469s ++ git rev-parse HEAD 1469s + val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + t-ref-same-val HEAD 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + local name=HEAD 1469s + local val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + case "${t_ref_val-unset}" in 1469s + t_ref_val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 1469s + t_ref_names+=("$name") 1469s + git checkout -b some-new-branch 1469s Switched to a new branch 'some-new-branch' 1469s + t-some-changes 2nd-maintainer 1469s + local token=2nd-maintainer 1469s + local which=dum 1469s + local fsuffix= 1469s + t-git-next-date 1469s + GIT_COMMITTER_DATE='1530000005 +0100' 1469s + GIT_AUTHOR_DATE='1530000005 +0100' 1469s + case "$which" in 1469s + echo '// debian 2nd-maintainer' 1469s + git add debian/zorkmid 1469s + git commit -m 'DEBIAN add zorkmid (2nd-maintainer)' 1469s [some-new-branch e5f51ca] DEBIAN add zorkmid (2nd-maintainer) 1469s 1 file changed, 1 insertion(+) 1469s + case "$which" in 1469s + echo '// upstream 2nd-maintainer' 1469s + git add src.c 1469s + git commit -m 'UPSTREAM edit src.c (2nd-maintainer)' 1469s [some-new-branch b7ab765] UPSTREAM edit src.c (2nd-maintainer) 1469s 1 file changed, 1 insertion(+) 1469s + case "$which" in 1469s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1469s + echo '// both! 2nd-maintainer' 1469s + git add debian/zorkmid 1469s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1469s + echo '// both! 2nd-maintainer' 1469s + git add src.c 1469s + git commit -m 'MIXED add both() (2nd-maintainer)' 1469s [some-new-branch 9825434] MIXED add both() (2nd-maintainer) 1469s 2 files changed, 2 insertions(+) 1469s + t-git-next-date 1469s + GIT_COMMITTER_DATE='1530000006 +0100' 1469s + GIT_AUTHOR_DATE='1530000006 +0100' 1469s + t-dgit quilt-fixup 1469s + local dgit=dgit 1469s + pwd 1469s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1469s + : ' 1469s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1469s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A quilt-fixup 1469s | git rev-parse --show-toplevel 1469s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1469s | git config -z --get-regexp --local '.*' 1469s | git config -z --get-regexp --local '.*' 1469s | git config -z --get-regexp --global '.*' 1469s | git config -z --get-regexp --system '.*' 1469s format 3.0 (quilt), quilt mode linear 1469s Format `3.0 (quilt)', need to check/update patch stack 1469s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1469s => `' 1469s + git diff --quiet HEAD 1469s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 1469s dpkg-buildpackage: info: source package example 1469s dpkg-buildpackage: info: source version 2.0-3 1469s dpkg-buildpackage: info: source distribution unstable 1469s dpkg-buildpackage: info: source changed by dgit test git user 1469s fakeroot debian/rules clean 1469s EXAMPLE RULES TARGET clean 1469s dh_clean 1469s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 1469s | git clean -dn 1469s => `' 1469s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1469s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1469s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1469s | git rev-parse 'HEAD~0' 1469s => `98254340cd9a78095ae96287fad0e8a131d0d94d' 1469s | git symbolic-ref -q HEAD 1469s => `refs/heads/some-new-branch' 1469s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1469s CD work 1469s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1470s + git reset -q --hard 98254340cd9a78095ae96287fad0e8a131d0d94d 1470s examining quilt state (multiple patches, linear mode) 1470s branch_is_gdr 98254340cd9a78095ae96287fad0e8a131d0d94d... 1470s branch_is_gdr 282c3564ae1a8872cefacb527c7d9dbc05362dc5 gdr pseudomerge YES 1470s + git reset -q --hard 98254340cd9a78095ae96287fad0e8a131d0d94d 1470s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1470s git-debrebase: snag ignored (-funclean-mixed): found mixed upstream/packaging commit (98254340cd9a78095ae96287fad0e8a131d0d94d) 1470s git-debrebase: snag ignored (-funclean-ordering): packaging change (e5f51cad32cde61921399fae2d3b4026e127031e) follows upstream change (eg 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0) 1470s git-debrebase: snags: 2 overriden by individual -f options 1470s HEAD is now at 959f253 Commit patch queue (exported by git-debrebase) 1470s | git rev-parse 'HEAD~0' 1470s => `959f253da81a94e2348c21f5026c6dcc53274027' 1470s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1470s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1470s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1470s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1470s CD fake 1470s | find -name .git -prune -print0 1470s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1470s + git checkout -f 959f253da81a94e2348c21f5026c6dcc53274027 -- debian 1470s + git add -Af . 1470s | git write-tree 1470s => `0656de82f5ba28624a42a01bf6f06c10a66abebc' 1470s fake orig tree object 0656de82f5ba28624a42a01bf6f06c10a66abebc 1470s CD .. 1470s + git reset -q --hard 959f253da81a94e2348c21f5026c6dcc53274027 1470s CD ../fake 1470s + git add -Af . 1470s | git write-tree 1471s => `c9bb90a388a4224fbe0402d107756b300f698fda' 1471s fake o+d/p tree object 0656de82f5ba28624a42a01bf6f06c10a66abebc 1471s CD ../work 1471s | git ls-tree --name-only -z 959f253da81a94e2348c21f5026c6dcc53274027 1471s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1471s | git diff-tree -z --no-renames -r 0656de82f5ba28624a42a01bf6f06c10a66abebc 959f253da81a94e2348c21f5026c6dcc53274027 1471s => `: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' 1471s quiltify_trees_differ 0656de82f5ba28624a42a01bf6f06c10a66abebc 959f253da81a94e2348c21f5026c6dcc53274027 => 1 1471s | git diff-tree -z --no-renames --name-only -r 959f253da81a94e2348c21f5026c6dcc53274027 c9bb90a388a4224fbe0402d107756b300f698fda 1471s => `' 1471s quiltify_trees_differ 959f253da81a94e2348c21f5026c6dcc53274027 c9bb90a388a4224fbe0402d107756b300f698fda => 0 1471s | git diff-tree -z --no-renames --name-only -r 0656de82f5ba28624a42a01bf6f06c10a66abebc c9bb90a388a4224fbe0402d107756b300f698fda 1471s => `lib.c\x00new-upstream-file\x00src.c\x00' 1471s quiltify_trees_differ 0656de82f5ba28624a42a01bf6f06c10a66abebc c9bb90a388a4224fbe0402d107756b300f698fda => 1 1471s differences @dl ## ## == == == ==. 1471s dgit: base trees orig=0656de82f5ba28624a42 o+d/p=c9bb90a388a4224fbe04 1471s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1471s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1471s starting quiltify (multiple patches, linear mode) 1471s | git ls-tree --name-only 959f253da81a94e2348c21f5026c6dcc53274027 -- debian/rules debian/control 1471s => `debian/control'... 1471s quiltify investigate 959f253da81a94e2348c21f5026c6dcc53274027 1471s | git diff-tree -z --no-renames --name-only 959f253da81a94e2348c21f5026c6dcc53274027 c9bb90a388a4224fbe0402d107756b300f698fda 1471s => `' 1471s quiltify_trees_differ 959f253da81a94e2348c21f5026c6dcc53274027 c9bb90a388a4224fbe0402d107756b300f698fda => 0 1471s search finished hooray! 1471s quiltify linearisation planning successful, executing... 1471s + git checkout -q master 1471s | git status --ignored --porcelain 1471s => `?? .pc/' 1471s nothing quilty to commit, ok. 1471s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1471s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1471s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1471s ' 1471s + t-gdr-made-patches 1471s + git log -n1 --pretty=format:%B 1471s + egrep '^\[git-debrebase' 1471s [git-debrebase make-patches: export and commit patches] 1471s + t-ok 1471s + : ======================================== 1471s + t-check-only-bpd 1471s + '[' .. = .. ']' 1471s + return 1471s + t-fscks 1471s + shopt -s nullglob 1471s + for d in $tmp/*/.git $tmp/git/*.git 1471s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1471s + t-git-fsck 1471s ++ git rev-parse --git-dir 1471s + local fsckerrs=.git/dgit-test-fsck.errs 1471s + set +e 1471s + LC_MESSAGES=C 1471s + git fsck --no-dangling --strict 1471s + tee .git/dgit-test-fsck.errs 1471s + ps='0 0' 1471s + set -e 1471s + local pats 1471s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1471s + test '0 0' = '0 0' 1471s + pats+=(-e 'notice: HEAD points to an unborn branch') 1471s + pats+=(-e 'notice: No default references') 1471s + set +e 1471s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1471s + rc=1 1471s + set -e 1471s + case $rc in 1471s + for d in $tmp/*/.git $tmp/git/*.git 1471s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1471s + t-git-fsck 1471s ++ git rev-parse --git-dir 1471s + local fsckerrs=./dgit-test-fsck.errs 1471s + set +e 1471s + LC_MESSAGES=C 1471s + git fsck --no-dangling --strict 1471s + tee ./dgit-test-fsck.errs 1471s notice: HEAD points to an unborn branch (master) 1471s + ps='0 0' 1471s + set -e 1471s + local pats 1471s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1471s + test '0 0' = '0 0' 1471s + pats+=(-e 'notice: HEAD points to an unborn branch') 1471s + pats+=(-e 'notice: No default references') 1471s + set +e 1471s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1471s + rc=1 1471s + set -e 1471s + case $rc in 1471s + t-save-artifacts 1471s + artifacts=/tmp/autopkgtest.XK8uun/gdr-edits-artifacts 1471s + '[' x/tmp/autopkgtest.XK8uun/gdr-edits-artifacts = x ']' 1471s + '[' xtmp = x ']' 1471s + GZIP=-1v 1471s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-edits-artifacts/gdr-edits.tar.gz '--exclude=*.tar' . 1471s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1471s 80.7% 1471s + echo ok. 1471s ok. 1471s + rc=0 1471s + set +x 1471s + set +e 1471s + pwd 1471s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1471s + '[' x '!=' x ']' 1471s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1471s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1471s + set -e 1471s + test 0 = 0 1471s autopkgtest [23:11:41]: test gdr-edits: -----------------------] 1472s gdr-edits PASS 1472s autopkgtest [23:11:42]: test gdr-edits: - - - - - - - - - - results - - - - - - - - - - 1472s autopkgtest [23:11:42]: test gdr-fresh: preparing testbed 1472s Reading package lists... 1472s Building dependency tree... 1472s Reading state information... 1473s Starting pkgProblemResolver with broken count: 0 1473s Starting 2 pkgProblemResolver with broken count: 0 1473s Done 1473s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1474s autopkgtest [23:11:44]: test gdr-fresh: [----------------------- 1474s ++ set -o pipefail 1474s ++ . tests/lib-core 1474s ++ . tests/lib-restricts 1474s ++ trap ' 1474s rc=$? 1474s set +x 1474s test $rc = 0 || echo " 1474s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1474s 1474s Most relevant logs are just before assignment rc=$rc 1474s Will now do cleanup etc. 1474s " 1474s set -x 1474s set +e 1474s pwd 1474s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1474s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1474s set -e 1474s test $rc = 0 || t-report-failure 1474s ' EXIT 1474s ++ t-filter-out-git-hyphen-dir 1474s ++ local pathent 1474s +++ type -p git-rev-parse 1474s +++ : 1474s ++ pathent= 1474s ++ case "$pathent" in 1474s ++ return 1474s ++ t-set-intree 1474s ++ '[' x = x ']' 1474s ++ return 1474s ++ : -D 1474s ++ export DGIT_TEST_DEBUG 1474s ++ : x 1474s ++ export DGIT_TEST_DEBPUSH_DEBUG 1474s ++ : 1474s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1474s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1474s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1474s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1474s ++ export LC_CTYPE=C.UTF-8 1474s ++ LC_CTYPE=C.UTF-8 1474s ++ unset CDPATH 1474s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1474s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1474s +++ pwd 1474s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1474s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1474s ++ testname=gdr-fresh 1474s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1474s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1474s ++ bpd=.. 1474s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1474s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1474s ++ '[' x '!=' x ']' 1474s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1474s +++ pwd 1474s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1474s ++ t-set-using-tmp 1474s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1474s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1474s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1474s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1474s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1474s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1474s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1474s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1474s ++ export 'DEBFULLNAME=dgit test git user' 1474s ++ DEBFULLNAME='dgit test git user' 1474s ++ git config --global user.email dgit-test@debian.example.net 1474s ++ git config --global user.name 'dgit test git user' 1474s ++ git config --global protocol.ext.allow always 1474s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1474s ++ env -0 1474s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1474s ++ export DEBCHANGE_VENDOR=dpkg 1474s ++ DEBCHANGE_VENDOR=dpkg 1474s ++ unset VISUAL 1474s ++ unset GIT_EDITOR 1474s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1474s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1474s ++ cat 1474s ++ schroot=build 1474s ++ : aq 1474s ++ : archive/test-dummy 1474s ++ : sid:unstable 1474s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1474s ++ git config --global dgit.default.old-dsc-distro test-dummy 1474s + . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1474s ++ : -D 1474s ++ export GDR_TEST_DEBUG 1474s ++ t-tstunt debchange 1474s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1474s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1474s ++ local var=PATH 1474s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1474s ++ eval ' 1474s case "$PATH" in 1474s "$tstunt:"*) ;; 1474s *":$tstunt:"*) ;; 1474s "") PATH="$tstunt" ;; 1474s *) PATH="$tstunt:$PATH" ;; 1474s esac 1474s export PATH 1474s ' 1474s +++ case "$PATH" in 1474s +++ PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1474s +++ export PATH 1474s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1474s ++ local var=PERLLIB 1474s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1474s ++ eval ' 1474s case "$PERLLIB" in 1474s "$tstunt:"*) ;; 1474s *":$tstunt:"*) ;; 1474s "") PERLLIB="$tstunt" ;; 1474s *) PERLLIB="$tstunt:$PERLLIB" ;; 1474s esac 1474s export PERLLIB 1474s ' 1474s +++ case "$PERLLIB" in 1474s +++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1474s +++ export PERLLIB 1474s ++ local f 1474s ++ for f in "$@" 1474s ++ t-tstunt--save-real debchange 1474s ++ local f=debchange 1474s ++ case "$f" in 1474s ++ local rc 1474s ++ local real 1474s ++ set +e 1474s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1474s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1474s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1474s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1474s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1474s +++ type -p debchange 1474s ++ real=/usr/bin/debchange 1474s ++ rc=0 1474s ++ set -e 1474s ++ case $rc in 1474s ++ local varname=debchange 1474s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1474s ++ eval ' 1474s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1474s export DGIT_TEST_REAL_DEBCHANGE 1474s ' 1474s +++ : /usr/bin/debchange 1474s +++ export DGIT_TEST_REAL_DEBCHANGE 1474s ++ f=./debchange 1474s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1474s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1474s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1474s + t-dependencies GDR 1474s + : 'Hopefully installed: GDR' 1474s + t-gdr-gbp-import-core 1474s + p=example 1474s + t-worktree 1.1 1474s + rm -rf example 1474s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1 1474s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 1474s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 1474s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 1474s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 1474s + cd example 1474s + : 'fake up some kind of upstream' 1474s + git checkout -b upstream quilt-tip 1474s Switched to a new branch 'upstream' 1474s + rm -rf debian 1474s + mkdir debian 1474s + echo junk 1474s + git add debian 1474s + git commit -m 'an upstream retcon (/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-fresh)' 1474s [upstream 6a4664c] an upstream retcon (/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-fresh) 1474s 6 files changed, 1 insertion(+), 36 deletions(-) 1474s delete mode 100644 debian/changelog 1474s delete mode 100644 debian/compat 1474s delete mode 100644 debian/control 1474s delete mode 100644 debian/example.install 1474s mode change 100755 => 100644 debian/rules 1474s delete mode 100644 debian/source/format 1474s + git tag v1.0 1474s + t-git-next-date 1474s + GIT_COMMITTER_DATE='1530000001 +0100' 1474s + GIT_AUTHOR_DATE='1530000001 +0100' 1474s + git rm debian/rules 1474s rm 'debian/rules' 1474s + git commit -m 'strip upstream rules' 1474s [upstream 24ce791] strip upstream rules 1474s 1 file changed, 1 deletion(-) 1474s delete mode 100644 debian/rules 1474s + git tag -f v1.0 1474s Updated tag 'v1.0' (was 6a4664c) 1474s + git branch -m master master.old 1474s + git checkout -b master 1474s Switched to a new branch 'master' 1474s + t-git-next-date 1474s + GIT_COMMITTER_DATE='1530000002 +0100' 1474s + GIT_AUTHOR_DATE='1530000002 +0100' 1474s + git checkout quilt-tip debian 1474s Updated 6 paths from 20c64eb 1474s + git commit -m 'initial debianisation' 1474s [master e44291e] initial debianisation 1474s 6 files changed, 36 insertions(+) 1474s create mode 100644 debian/changelog 1474s create mode 100644 debian/compat 1474s create mode 100644 debian/control 1474s create mode 100644 debian/example.install 1474s create mode 100755 debian/rules 1474s create mode 100644 debian/source/format 1474s + t-make-orig example 1.0 1474s + local p=example 1474s + local v=1.0 1474s + local tag=v1.0 1474s + ust=example_1.0.orig.tar.gz 1474s + GZIP=-1 1474s + git archive -o ../example_1.0.orig.tar.gz --prefix=example-1.0/ v1.0 1474s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1474s + dgit-quilt-fixup-uses-gdr 1474s + t-git-next-date 1474s + GIT_COMMITTER_DATE='1530000003 +0100' 1474s + GIT_AUTHOR_DATE='1530000003 +0100' 1474s + DGIT_TEST_DEBUG=-DD 1474s + t-dgit quilt-fixup 1474s + tee ../fixup.out 1474s + local dgit=dgit 1474s + pwd 1474s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1474s + : ' 1474s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1474s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -DD -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A quilt-fixup 1475s | git rev-parse --show-toplevel 1475s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1475s | git config -z --get-regexp --local '.*' 1475s | git config -z --get-regexp --local '.*' 1475s | git config -z --get-regexp --global '.*' 1475s | git config -z --get-regexp --system '.*' 1475s format 3.0 (quilt), quilt mode linear 1475s Format `3.0 (quilt)', need to check/update patch stack 1475s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1475s => `' 1475s + git diff --quiet HEAD 1475s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 1475s dpkg-buildpackage: info: source package example 1475s dpkg-buildpackage: info: source version 1.0-1 1475s dpkg-buildpackage: info: source distribution unstable 1475s dpkg-buildpackage: info: source changed by Ian Jackson 1475s fakeroot debian/rules clean 1475s EXAMPLE RULES TARGET clean 1475s dh_clean 1475s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 1475s | git clean -dn 1475s => `' 1475s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1475s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1475s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1475s | git rev-parse 'HEAD~0' 1475s => `e44291ee4e680865a1295cbe14e6dab85e81d730' 1475s | git symbolic-ref -q HEAD 1475s => `refs/heads/master' 1475s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1475s CD work 1475s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1475s + git reset -q --hard e44291ee4e680865a1295cbe14e6dab85e81d730 1475s examining quilt state (multiple patches, linear mode) 1475s branch_is_gdr e44291ee4e680865a1295cbe14e6dab85e81d730... 1475s quiltify_trees_differ e44291ee4e680865a1295cbe14e6dab85e81d730~ e44291ee4e680865a1295cbe14e6dab85e81d730 => 0 1475s branch_is_gdr e44291ee4e680865a1295cbe14e6dab85e81d730 unmarked BreakwaterStart YES 1475s + git reset -q --hard e44291ee4e680865a1295cbe14e6dab85e81d730 1475s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1476s | git rev-parse 'HEAD~0' 1476s => `e44291ee4e680865a1295cbe14e6dab85e81d730' 1476s QF linkorigs bpd ., /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../. ? 1476s QF linkorigs bpd .save-env, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../.save-env ? 1476s QF linkorigs bpd fixup.out, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../fixup.out ? 1476s QF linkorigs bpd dput.cf, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../dput.cf ? 1476s QF linkorigs bpd .gitconfig, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../.gitconfig ? 1476s QF linkorigs bpd .., /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../.. ? 1476s QF linkorigs bpd must-clean, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../must-clean ? 1476s QF linkorigs bpd incoming, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../incoming ? 1476s QF linkorigs bpd example, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example ? 1476s QF linkorigs bpd ssh, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../ssh ? 1476s QF linkorigs bpd tstunt, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../tstunt ? 1476s QF linkorigs bpd example_1.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.gz ? 1476s QF linkorigs example_1.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.gz Y 1476s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1476s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 1476s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1476s CD fake 1476s | find -name .git -prune -print0 1476s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1476s + git checkout -f e44291ee4e680865a1295cbe14e6dab85e81d730 -- debian 1476s + git add -Af . 1476s | git write-tree 1476s => `20c64ebe6600e246d9769e072e25be7fdf7db102' 1476s fake orig tree object 20c64ebe6600e246d9769e072e25be7fdf7db102 1476s CD .. 1476s + git reset -q --hard e44291ee4e680865a1295cbe14e6dab85e81d730 1476s CD ../fake 1476s + git add -Af . 1476s | git write-tree 1476s => `20c64ebe6600e246d9769e072e25be7fdf7db102' 1476s fake o+d/p tree object 20c64ebe6600e246d9769e072e25be7fdf7db102 1476s CD ../work 1476s | git ls-tree --name-only -z e44291ee4e680865a1295cbe14e6dab85e81d730 1476s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 1476s | git diff-tree -z --no-renames -r 20c64ebe6600e246d9769e072e25be7fdf7db102 e44291ee4e680865a1295cbe14e6dab85e81d730 1476s => `' 1476s quiltify_trees_differ 20c64ebe6600e246d9769e072e25be7fdf7db102 e44291ee4e680865a1295cbe14e6dab85e81d730 => 0 1476s | git diff-tree -z --no-renames --name-only -r e44291ee4e680865a1295cbe14e6dab85e81d730 20c64ebe6600e246d9769e072e25be7fdf7db102 1476s => `' 1476s quiltify_trees_differ e44291ee4e680865a1295cbe14e6dab85e81d730 20c64ebe6600e246d9769e072e25be7fdf7db102 => 0 1476s | git diff-tree -z --no-renames --name-only -r 20c64ebe6600e246d9769e072e25be7fdf7db102 20c64ebe6600e246d9769e072e25be7fdf7db102 1476s => `' 1476s quiltify_trees_differ 20c64ebe6600e246d9769e072e25be7fdf7db102 20c64ebe6600e246d9769e072e25be7fdf7db102 => 0 1476s differences @dl == == == == == ==. 1476s dgit: base trees orig=20c64ebe6600e246d976 o+d/p=20c64ebe6600e246d976 1476s dgit: quilt differences: src: == orig == gitignores: == orig == 1476s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1476s starting quiltify (multiple patches, linear mode) 1476s | git ls-tree --name-only e44291ee4e680865a1295cbe14e6dab85e81d730 -- debian/rules debian/control 1476s => `debian/control'... 1476s quiltify investigate e44291ee4e680865a1295cbe14e6dab85e81d730 1476s | git diff-tree -z --no-renames --name-only e44291ee4e680865a1295cbe14e6dab85e81d730 20c64ebe6600e246d9769e072e25be7fdf7db102 1476s => `' 1476s quiltify_trees_differ e44291ee4e680865a1295cbe14e6dab85e81d730 20c64ebe6600e246d9769e072e25be7fdf7db102 => 0 1476s search finished hooray! 1476s quiltify linearisation planning successful, executing... 1476s + git checkout -q master 1476s | git status --ignored --porcelain 1476s => `?? .pc/' 1476s nothing quilty to commit, ok. 1476s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1476s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1476s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1476s ' 1476s + grep '^branch_is_gdr .* YES$' ../fixup.out 1476s branch_is_gdr e44291ee4e680865a1295cbe14e6dab85e81d730 unmarked BreakwaterStart YES 1476s + git checkout --detach patch-queue/quilt-tip 1476s HEAD is now at d843a68 Add another new upstream file 1476s + git rebase master 1476s Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Successfully rebased and updated detached HEAD. 1476s + git push . HEAD:master 1476s To . 1476s e44291e..c61666a HEAD -> master 1476s + git checkout master 1476s Switched to branch 'master' 1476s + dgit-quilt-fixup-uses-gdr 1476s + t-git-next-date 1476s + GIT_COMMITTER_DATE='1530000004 +0100' 1476s + GIT_AUTHOR_DATE='1530000004 +0100' 1476s + DGIT_TEST_DEBUG=-DD 1476s + t-dgit quilt-fixup 1476s + tee ../fixup.out 1476s + local dgit=dgit 1476s + pwd 1476s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1476s + : ' 1476s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1476s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -DD -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A quilt-fixup 1476s | git rev-parse --show-toplevel 1476s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1476s | git config -z --get-regexp --local '.*' 1476s | git config -z --get-regexp --local '.*' 1476s | git config -z --get-regexp --global '.*' 1476s | git config -z --get-regexp --system '.*' 1476s format 3.0 (quilt), quilt mode linear 1476s Format `3.0 (quilt)', need to check/update patch stack 1476s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1476s => `' 1476s + git diff --quiet HEAD 1476s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 1476s dpkg-buildpackage: info: source package example 1476s dpkg-buildpackage: info: source version 1.0-1 1476s dpkg-buildpackage: info: source distribution unstable 1476s dpkg-buildpackage: info: source changed by Ian Jackson 1477s fakeroot debian/rules clean 1477s EXAMPLE RULES TARGET clean 1477s dh_clean 1477s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 1477s | git clean -dn 1477s => `' 1477s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1477s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1477s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1477s | git rev-parse 'HEAD~0' 1477s => `c61666ad7364a1d0d83040c60704c95ee069b24f' 1477s | git symbolic-ref -q HEAD 1477s => `refs/heads/master' 1477s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1477s CD work 1477s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1477s + git reset -q --hard c61666ad7364a1d0d83040c60704c95ee069b24f 1477s examining quilt state (multiple patches, linear mode) 1477s branch_is_gdr c61666ad7364a1d0d83040c60704c95ee069b24f... 1477s branch_is_gdr c61666ad7364a1d0d83040c60704c95ee069b24f plain 1477s branch_is_gdr e9e9af6e00549f940cac70deaa53e9d5981022cd plain 1477s branch_is_gdr 9795b8302692b3ef4383909331a507798ddd5507 plain 1477s quiltify_trees_differ e44291ee4e680865a1295cbe14e6dab85e81d730~ e44291ee4e680865a1295cbe14e6dab85e81d730 => 0 1477s branch_is_gdr e44291ee4e680865a1295cbe14e6dab85e81d730 unmarked BreakwaterStart YES 1477s + git reset -q --hard c61666ad7364a1d0d83040c60704c95ee069b24f 1477s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1477s HEAD is now at d9cd016 Commit patch queue (exported by git-debrebase) 1477s | git rev-parse 'HEAD~0' 1477s => `d9cd01676d6e28fa24f7612c2c86ca1ca02d6287' 1477s QF linkorigs bpd ., /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../. ? 1477s QF linkorigs bpd .save-env, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../.save-env ? 1477s QF linkorigs bpd fixup.out, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../fixup.out ? 1477s QF linkorigs bpd dput.cf, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../dput.cf ? 1477s QF linkorigs bpd .gitconfig, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../.gitconfig ? 1477s QF linkorigs bpd .., /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../.. ? 1477s QF linkorigs bpd must-clean, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../must-clean ? 1477s QF linkorigs bpd incoming, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../incoming ? 1477s QF linkorigs bpd example, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example ? 1477s QF linkorigs bpd ssh, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../ssh ? 1477s QF linkorigs bpd tstunt, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../tstunt ? 1477s QF linkorigs bpd example_1.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.gz ? 1477s QF linkorigs example_1.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_1.0.orig.tar.gz Y 1477s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1477s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 1477s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1477s CD fake 1477s | find -name .git -prune -print0 1477s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1478s + git checkout -f d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 -- debian 1478s + git add -Af . 1478s | git write-tree 1478s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 1478s fake orig tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 1478s CD .. 1478s + git reset -q --hard d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 1478s CD ../fake 1478s + git add -Af . 1478s | git write-tree 1478s => `763a72c3d91f517f4a54c0759ccf4876f1fbb304' 1478s fake o+d/p tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 1478s CD ../work 1478s | git ls-tree --name-only -z d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 1478s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1478s | git diff-tree -z --no-renames -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 1478s => `: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' 1478s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 => 1 1478s | git diff-tree -z --no-renames --name-only -r d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 763a72c3d91f517f4a54c0759ccf4876f1fbb304 1478s => `' 1478s quiltify_trees_differ d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 0 1478s | git diff-tree -z --no-renames --name-only -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 1478s => `lib.c\x00new-upstream-file\x00src.c\x00' 1478s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 1478s differences @dl ## ## == == == ==. 1478s dgit: base trees orig=bf7987f1ad573f033a09 o+d/p=763a72c3d91f517f4a54 1478s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1478s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1478s starting quiltify (multiple patches, linear mode) 1478s | git ls-tree --name-only d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 -- debian/rules debian/control 1478s => `debian/control'... 1478s quiltify investigate d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 1478s | git diff-tree -z --no-renames --name-only d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 763a72c3d91f517f4a54c0759ccf4876f1fbb304 1478s => `' 1478s quiltify_trees_differ d9cd01676d6e28fa24f7612c2c86ca1ca02d6287 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 0 1478s search finished hooray! 1478s quiltify linearisation planning successful, executing... 1478s + git checkout -q master 1478s | git status --ignored --porcelain 1478s => `?? .pc/' 1478s nothing quilty to commit, ok. 1478s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1478s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1478s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1478s ' 1478s + grep '^branch_is_gdr .* YES$' ../fixup.out 1478s branch_is_gdr e44291ee4e680865a1295cbe14e6dab85e81d730 unmarked BreakwaterStart YES 1478s + t-gdr-made-patches 1478s + egrep '^\[git-debrebase' 1478s + git log -n1 --pretty=format:%B 1478s [git-debrebase make-patches: export and commit patches] 1478s + t-ok 1478s + : ======================================== 1478s + t-check-only-bpd 1478s + '[' .. = .. ']' 1478s + return 1478s + t-fscks 1478s + shopt -s nullglob 1478s + for d in $tmp/*/.git $tmp/git/*.git 1478s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1478s + t-git-fsck 1478s ++ git rev-parse --git-dir 1478s + local fsckerrs=.git/dgit-test-fsck.errs 1478s + set +e 1478s + tee .git/dgit-test-fsck.errs 1478s + LC_MESSAGES=C 1478s + git fsck --no-dangling --strict 1478s + ps='0 0' 1478s + set -e 1478s + local pats 1478s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1478s + test '0 0' = '0 0' 1478s + pats+=(-e 'notice: HEAD points to an unborn branch') 1478s + pats+=(-e 'notice: No default references') 1478s + set +e 1478s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1478s + rc=1 1478s + set -e 1478s + case $rc in 1478s + t-save-artifacts 1478s + artifacts=/tmp/autopkgtest.XK8uun/gdr-fresh-artifacts 1478s + '[' x/tmp/autopkgtest.XK8uun/gdr-fresh-artifacts = x ']' 1478s + '[' xtmp = x ']' 1478s + GZIP=-1v 1478s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-fresh-artifacts/gdr-fresh.tar.gz '--exclude=*.tar' . 1478s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1478s 80.3% 1478s + echo ok. 1478s ok. 1478s + rc=0 1478s + set +x 1478s + set +e 1478s + pwd 1478s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1478s + '[' x '!=' x ']' 1478s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1478s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1478s + set -e 1478s + test 0 = 0 1478s autopkgtest [23:11:48]: test gdr-fresh: -----------------------] 1479s gdr-fresh PASS 1479s autopkgtest [23:11:49]: test gdr-fresh: - - - - - - - - - - results - - - - - - - - - - 1479s autopkgtest [23:11:49]: test gdr-import-dgitview: preparing testbed 1479s Reading package lists... 1480s Building dependency tree... 1480s Reading state information... 1480s Starting pkgProblemResolver with broken count: 0 1480s Starting 2 pkgProblemResolver with broken count: 0 1480s Done 1480s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1481s autopkgtest [23:11:51]: test gdr-import-dgitview: [----------------------- 1481s ++ set -o pipefail 1481s ++ . tests/lib-core 1481s ++ . tests/lib-restricts 1481s ++ trap ' 1481s rc=$? 1481s set +x 1481s test $rc = 0 || echo " 1481s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1481s 1481s Most relevant logs are just before assignment rc=$rc 1481s Will now do cleanup etc. 1481s " 1481s set -x 1481s set +e 1481s pwd 1481s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1481s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1481s set -e 1481s test $rc = 0 || t-report-failure 1481s ' EXIT 1481s ++ t-filter-out-git-hyphen-dir 1481s ++ local pathent 1481s +++ type -p git-rev-parse 1481s +++ : 1481s ++ pathent= 1481s ++ case "$pathent" in 1481s ++ return 1481s ++ t-set-intree 1481s ++ '[' x = x ']' 1481s ++ return 1481s ++ : -D 1481s ++ export DGIT_TEST_DEBUG 1481s ++ : x 1481s ++ export DGIT_TEST_DEBPUSH_DEBUG 1481s ++ : 1481s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1481s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1481s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1481s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1481s ++ export LC_CTYPE=C.UTF-8 1481s ++ LC_CTYPE=C.UTF-8 1481s ++ unset CDPATH 1481s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1481s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1481s +++ pwd 1481s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1481s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1481s ++ testname=gdr-import-dgitview 1481s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1481s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1481s ++ bpd=.. 1481s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1481s ++ '[' x '!=' x ']' 1481s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s +++ pwd 1481s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ t-set-using-tmp 1481s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1481s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1481s ++ export 'DEBFULLNAME=dgit test git user' 1481s ++ DEBFULLNAME='dgit test git user' 1481s ++ git config --global user.email dgit-test@debian.example.net 1481s ++ git config --global user.name 'dgit test git user' 1481s ++ git config --global protocol.ext.allow always 1481s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1481s ++ env -0 1481s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1481s ++ export DEBCHANGE_VENDOR=dpkg 1481s ++ DEBCHANGE_VENDOR=dpkg 1481s ++ unset VISUAL 1481s ++ unset GIT_EDITOR 1481s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1481s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1481s ++ cat 1481s ++ schroot=build 1481s ++ : aq 1481s ++ : archive/test-dummy 1481s ++ : sid:unstable 1481s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1481s ++ git config --global dgit.default.old-dsc-distro test-dummy 1481s ++ for import in ${autoimport-gnupg} 1481s ++ case "$0" in 1481s ++ t-setup-import gnupg 1481s ++ local setupname=gnupg 1481s ++ local setupsrc 1481s ++ local lock 1481s ++ '[' x = x ']' 1481s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1481s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1481s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1481s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1481s cd "$1"; shift 1481s setupname="$1"; shift 1481s simport="$1"; shift 1481s if [ -e "$simport" ]; then exit 0; fi 1481s env - "$@" \ 1481s "tests/setup/$setupname" 1481s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1481s + cd /tmp/autopkgtest.XK8uun/build.980/src 1481s + shift 1481s + setupname=gnupg 1481s + shift 1481s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1481s + shift 1481s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1481s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-import-dgitview-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-import-dgitview-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-import-dgitview-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-import-dgitview -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-import-dgitview' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-import-dgitview-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1481s ++ set -o pipefail 1481s ++ . tests/lib-core 1481s ++ . tests/lib-restricts 1481s ++ trap ' 1481s rc=$? 1481s set +x 1481s test $rc = 0 || echo " 1481s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1481s 1481s Most relevant logs are just before assignment rc=$rc 1481s Will now do cleanup etc. 1481s " 1481s set -x 1481s set +e 1481s pwd 1481s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1481s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1481s set -e 1481s test $rc = 0 || t-report-failure 1481s ' EXIT 1481s ++ t-filter-out-git-hyphen-dir 1481s ++ local pathent 1481s +++ type -p git-rev-parse 1481s +++ : 1481s ++ pathent= 1481s ++ case "$pathent" in 1481s ++ return 1481s ++ t-set-intree 1481s ++ '[' x = x ']' 1481s ++ return 1481s ++ : -D 1481s ++ export DGIT_TEST_DEBUG 1481s ++ : x 1481s ++ export DGIT_TEST_DEBPUSH_DEBUG 1481s ++ : 1481s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1481s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1481s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1481s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1481s ++ export LC_CTYPE=C.UTF-8 1481s ++ LC_CTYPE=C.UTF-8 1481s ++ unset CDPATH 1481s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1481s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1481s +++ pwd 1481s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1481s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1481s ++ testname=gnupg 1481s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1481s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1481s ++ bpd=.. 1481s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1481s ++ '[' x '!=' x ']' 1481s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s +++ pwd 1481s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ t-set-using-tmp 1481s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1481s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1481s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1481s ++ export 'DEBFULLNAME=dgit test git user' 1481s ++ DEBFULLNAME='dgit test git user' 1481s ++ git config --global user.email dgit-test@debian.example.net 1481s ++ git config --global user.name 'dgit test git user' 1481s ++ git config --global protocol.ext.allow always 1481s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1481s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1481s ++ export DEBCHANGE_VENDOR=dpkg 1481s ++ DEBCHANGE_VENDOR=dpkg 1481s ++ unset VISUAL 1481s ++ unset GIT_EDITOR 1481s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1481s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1481s ++ cat 1482s ++ schroot=build 1482s ++ : aq 1482s ++ : archive/test-dummy 1482s ++ : sid:unstable 1482s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1482s ++ git config --global dgit.default.old-dsc-distro test-dummy 1482s ++ for import in ${autoimport-gnupg} 1482s ++ case "$0" in 1482s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1482s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1482s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1482s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1482s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1482s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1482s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1482s + setup=' 1482s export GNUPGHOME=$tmp/gnupg 1482s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1482s 1482s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1482s ssb rsa2048 2013-11-17 [E] 1482s 1482s sec rsa2048 2014-01-26 [SC] 1482s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1482s uid [ultimate] Populus Romanus (test key) 1482s ssb rsa2048 2014-01-26 [E] 1482s 1482s sec rsa2048 2014-01-26 [SC] 1482s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1482s uid [ unknown] Hannibal (test key) 1482s ssb rsa2048 2014-01-26 [E] 1482s 1482s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1482s export GNUPGHOME=$tmp/gnupg 1482s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1482s 1482s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 1482s "sha256sum" => "$2", 1482s "component" => "$3", 1482s "filename" => "$4", 1482s }; 1482s END { 1482s my $json = JSON->new->canonical(); 1482s print $json->encode(\@v) or die $!; 1482s } 1482s ' 1482s + t-aq-archive-updated new example 1482s + local suite=new 1482s + local p=example 1482s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1482s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1482s + perl -wne ' 1482s use JSON; 1482s use strict; 1482s our @v; 1482s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1482s push @v, { 1482s "version" => "$1", 1482s "sha256sum" => "$2", 1482s "component" => "$3", 1482s "filename" => "$4", 1482s }; 1482s END { 1482s my $json = JSON->new->canonical(); 1482s print $json->encode(\@v) or die $!; 1482s } 1482s ' 1482s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1482s + cat 1482s + jsondelim=' },' 1482s + cat 1482s + v=1.0-1 1482s + local dscf=example_1.0-1.dsc 1482s + rm -f '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/example_*' 1482s + ln -s /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1+absurd.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1+brokenmeta.debian.tar.xz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1+brokenmeta.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1.100.debian.tar.xz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1.100.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1.debian.tar.xz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0-1.dsc /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0.orig-docs.tar.gz /tmp/autopkgtest.XK8uun/build.980/src/tests/pkg-srcs/example_1.0.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1482s + t-archive-query 1482s + local suite=sid 1482s + local dscf=main/example_1.0-1.dsc 1482s + t-archive-query-aq sid example 1.0-1 main/example_1.0-1.dsc 1482s + local suite=sid 1482s + local p=example 1482s + local v=1.0-1 1482s + local dscf=main/example_1.0-1.dsc 1482s + local sha 1482s ++ sha256sum 1482s + sha='f58be8985abfc91613b38db1263979e53cf9172276fcdee68d20e930e681a0a4 -' 1482s + echo '1.0-1 f58be8985abfc91613b38db1263979e53cf9172276fcdee68d20e930e681a0a4 main/example_1.0-1.dsc' 1482s + t-aq-archive-updated sid example 1482s + local suite=sid 1482s + local p=example 1482s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1482s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1482s + perl -wne ' 1482s use JSON; 1482s use strict; 1482s our @v; 1482s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1482s push @v, { 1482s "version" => "$1", 1482s "sha256sum" => "$2", 1482s "component" => "$3", 1482s "filename" => "$4", 1482s }; 1482s END { 1482s my $json = JSON->new->canonical(); 1482s print $json->encode(\@v) or die $!; 1482s } 1482s ' 1482s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1482s + mkdir /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1482s + set -e 1482s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/extract 1482s + dpkg-source -x ../mirror/pool/main/example_1.0-1.dsc 1482s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/example_1.0-1.dsc) 1482s dpkg-source: info: extracting example in example-1.0 1482s dpkg-source: info: unpacking example_1.0.orig.tar.gz 1482s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 1482s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 1482s dpkg-source: info: using patch list from debian/patches/series 1482s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1482s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1482s dpkg-source: info: applying auto-gitignore 1482s + t-git-none 1482s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1482s + set -e 1482s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1482s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1482s + t-dgit clone example 1482s + local dgit=dgit 1482s + pwd 1482s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1482s + : ' 1482s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1482s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone example 1482s | git config -z --get-regexp --global '.*' 1482s | git config -z --get-regexp --system '.*' 1482s clone main body 1482s CD example 1482s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1482s canonical suite name for unstable is sid 1482s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1482s => `0' 1482s + git init -q 1482s | git config -z --get-regexp --local '.*' 1482s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 1482s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 1482s + git config user.name 'dgit test git user' 1482s is_gitattrs_setup: found nothing 1482s starting new git history 1482s + git config remote.dgit.skipdefaultupdate true 1482s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1482s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_1.0-1.dsc... 1482s get_archive_dsc: Version 1.0-1 1482s last upload to archive: NO git hash 1482s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1482s => `' 1482s previous reference hash= 1482s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1482s => `' 1482s fetch_from_archive: lastfetch= 1482s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1482s considering reusing example_1.0.orig-docs.tar.gz: (No such file or directory) (No such file or directory) absent. 1482s ./example_1.0.orig-docs.tar.gz does not exist, need to fetch 1482s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig-docs.tar.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_1.0.orig-docs.tar.gz 1482s % Total % Received % Xferd Average Speed Time Time Time Current 1482s Dload Upload Total Spent Left Speed 1482s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 236 100 236 0 0 859k 0 --:--:-- --:--:-- --:--:-- 859k 1482s considering saving example_1.0.orig-docs.tar.gz: linked. 1482s considering reusing example_1.0.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 1482s ./example_1.0.orig.tar.gz does not exist, need to fetch 1482s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig.tar.gz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_1.0.orig.tar.gz 1482s % Total % Received % Xferd Average Speed Time Time Time Current 1482s Dload Upload Total Spent Left Speed 1482s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 373 100 373 0 0 2985k 0 --:--:-- --:--:-- --:--:-- 2985k 1483s considering saving example_1.0.orig.tar.gz: linked. 1483s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) (No such file or directory) absent. 1483s ./example_1.0-1.debian.tar.xz does not exist, need to fetch 1483s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0-1.debian.tar.xz -- file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror//pool/main/example_1.0-1.debian.tar.xz 1483s % Total % Received % Xferd Average Speed Time Time Time Current 1483s Dload Upload Total Spent Left Speed 1483s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 1300 100 1300 0 0 10.9M 0 --:--:-- --:--:-- --:--:-- 10.9M 1483s considering saving example_1.0-1.debian.tar.xz: linked. 1483s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 1483s + chmod -R '+rwX' _unpack-tar 1483s CD _unpack-tar 1483s | find -name .git -prune -print0 1483s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1483s + git add -Af . 1483s | git write-tree 1483s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 1483s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 1483s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 1483s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 1483s CD .. 1483s import considering example_1.0.orig.tar.gz Y .gz orig 1483s + chmod -R '+rwX' _unpack-tar 1483s CD _unpack-tar 1483s | find -name .git -prune -print0 1483s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1483s + git add -Af . 1483s | git write-tree 1483s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 1483s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 1483s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 1483s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 1483s CD .. 1483s import considering example_1.0-1.debian.tar.xz Y .xz (none) 1483s + chmod -R '+rwX' _unpack-tar 1483s CD _unpack-tar 1483s | find -name .git -prune -print0 1483s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1483s + git add -Af . 1483s | git write-tree 1483s => `2e32e7dba6662d7204cb623f0685496d9e18ed39' 1483s | git ls-tree -z 2e32e7dba6662d7204cb623f0685496d9e18ed39 1483s => `040000 tree 4fdcc744fa631b40c7178eee72a6f59c8ca72600\x09debian\x00' 1483s one subtree 4fdcc744fa631b40c7178eee72a6f59c8ca72600 1483s CD .. 1483s + dpkg-source --no-check --skip-patches -x -- example.dsc 1483s dpkg-source: info: extracting example in example-1.0 1483s dpkg-source: info: unpacking example_1.0.orig.tar.gz 1483s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 1483s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 1483s CD example-1.0 1483s | find -name .git -prune -print0 1483s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1483s + git add -Af . 1483s | git write-tree 1483s => `faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4' 1483s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1483s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1483s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1483s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 1483s + git add -Af . 1483s | git write-tree 1483s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 1483s import clog search... 1483s | dpkg-parsechangelog --format rfc822 --all 1483s import clog 1.0-1 package changelog, entry no.1... 1483s import clog 1.0-1 vs 1.0... 1483s import clog 1.0-1 becomes r1 1483s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 1483s => `1431548802 +0000' 1483s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 1483s => `1431548802 +0000' 1483s import tartrees authline Ian Jackson 1431548802 +0000 1483s import tartrees r1authline Ian Jackson 1431548802 +0000 1483s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 1483s | git hash-object -w -t commit --stdin 1483s => 94c010931d011cbd6c1861bb9d453aa12d826298 1483s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 1483s | git hash-object -w -t commit --stdin 1483s => a5bb1f49c872a76a5d703570fd5352e424719bda 1483s import tartree example_1.0-1.debian.tar.xz 4fdcc744fa631b40c7178eee72a6f59c8ca72600 1483s | git hash-object -w -t commit --stdin 1483s => c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 1483s import main commit 1483s | git hash-object -w -t commit ../commit.tmp 1483s => `1d9c1ab6696b5b0b297493e1cce63577b4834b04' 1483s import apply patches... 1483s | git hash-object -w -t commit --stdin 1483s => 8a6a176760396ad6e2e096974469aa6cf7671956 1483s + git checkout -q -b dapplied 8a6a176760396ad6e2e096974469aa6cf7671956 1483s + git checkout -q -b unpa 1d9c1ab6696b5b0b297493e1cce63577b4834b04 1483s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 1483s => `1431548802 +0000' 1483s + git checkout -q unpa 1483s + git update-ref -d refs/heads/patch-queue/unpa 1483s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 1483s | git rev-parse 'HEAD~0' 1483s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 1483s | git rev-parse HEAD: 1483s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 1483s synthesised git commit from .dsc 1.0-1 1483s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1483s fetch mergeinfos: 1483s commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 Import of source package 1483s fetch hash=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1483s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1483s | git log -n2 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1483s => `commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6'... 1483s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1483s => `' 1483s + git reset --hard refs/remotes/dgit/dgit/sid 1483s HEAD is now at 9af62d3 Update .gitignore from Debian packaging branch 1483s + bash -ec ' set -o pipefail 1483s git ls-tree -r --name-only -z HEAD | '\\' 1483s xargs -0r touch -h -r . -- 1483s ' 1483s dgit ok: ready for work in example 1483s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1483s del_lrfetchrefs... 1483s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1483s ' 1483s + cd example 1483s + t-git-debrebase status 1483s + local gdr=git-debrebase 1483s + : ' 1483s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1483s + git-debrebase --dgit=dgit -D status 1484s git-debrebase get_differs d961783a7941d93057e1f45f793ecf9506db7604 11828cc23fd68a215b9c13cebc16724e51ea1942 = 0x2 1484s git-debrebase classify 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 $t=11828cc23fd68a215b9c13cebc16724e51ea1942 @p d961783a7941d93057e1f45f793ecf9506db7604/0x2 1484s git-debrebase = Upstream {"Hdr" => "tree 11828cc23fd68a215b9c13cebc16724e51ea1942\nparent d961783a7941d93057e1f45f793ecf9506db7604\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "11828cc23fd68a215b9c13cebc16724e51ea1942","CommitId" => "9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604"}],"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"} 1484s git-debrebase get_differs ed6bc7897ac272261988a7c5843a45732583b8c3 d0edc8316a360beb4536ba9ee0f9e7686d942168 = 0x2 1484s git-debrebase classify d961783a7941d93057e1f45f793ecf9506db7604 $t=d0edc8316a360beb4536ba9ee0f9e7686d942168 @p ed6bc7897ac272261988a7c5843a45732583b8c3/0x2 1484s git-debrebase = Upstream {"Tree" => "d0edc8316a360beb4536ba9ee0f9e7686d942168","Hdr" => "tree d0edc8316a360beb4536ba9ee0f9e7686d942168\nparent ed6bc7897ac272261988a7c5843a45732583b8c3\nauthor Ian Jackson 1449445839 +0000\ncommitter Ian Jackson 1431548802 +0000\n","CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Type" => "Upstream","Parents" => [{"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Ix" => 0,"Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1484s git-debrebase get_differs 1d9c1ab6696b5b0b297493e1cce63577b4834b04 4d14e6df29441875898d6e92be6a3ecbe9ca4656 = 0x2 1484s git-debrebase classify ed6bc7897ac272261988a7c5843a45732583b8c3 $t=4d14e6df29441875898d6e92be6a3ecbe9ca4656 @p 1d9c1ab6696b5b0b297493e1cce63577b4834b04/0x2 1484s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 4d14e6df29441875898d6e92be6a3ecbe9ca4656\nparent 1d9c1ab6696b5b0b297493e1cce63577b4834b04\nauthor Ian Jackson 1449445808 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "4d14e6df29441875898d6e92be6a3ecbe9ca4656","CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04"}]} 1484s git-debrebase get_differs 94c010931d011cbd6c1861bb9d453aa12d826298 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase get_differs a5bb1f49c872a76a5d703570fd5352e424719bda faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase get_differs c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase classify 1d9c1ab6696b5b0b297493e1cce63577b4834b04 $t=faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 @p 94c010931d011cbd6c1861bb9d453aa12d826298/0x36 a5bb1f49c872a76a5d703570fd5352e424719bda/0x36 c4cc1785ce51e34becb04fc42ff2e2931bdb3b74/0x36 1484s git-debrebase = DgitImportUnpatched {"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Hdr" => "tree faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4\nparent 94c010931d011cbd6c1861bb9d453aa12d826298\nparent a5bb1f49c872a76a5d703570fd5352e424719bda\nparent c4cc1785ce51e34becb04fc42ff2e2931bdb3b74\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","OrigParents" => [{"IsDgitImport" => "orig","CommitId" => "94c010931d011cbd6c1861bb9d453aa12d826298","Ix" => 0,"Differs" => 54,"IsOrigin" => 1},{"CommitId" => "a5bb1f49c872a76a5d703570fd5352e424719bda","IsDgitImport" => "orig","Differs" => 54,"Ix" => 1,"IsOrigin" => 1}],"Msg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[dgit import unpatched example 1.0-1]\n","Type" => "DgitImportUnpatched","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","Parents" => [$VAR1->{"OrigParents"}[0],$VAR1->{"OrigParents"}[1],{"Differs" => 54,"Ix" => 2,"IsDgitImport" => "tarball","CommitId" => "c4cc1785ce51e34becb04fc42ff2e2931bdb3b74","IsOrigin" => 1}]} 1484s current branch contents, in git-debrebase terms: 1484s branch not in git-debrebase form 1484s found bare dgit dsc import with no prior history 1484s 1d9c1ab example (1.0-1) unstable; urgency=low 1484s key git-debrebase commits: 1484s anchor is not well-defined 1484s breakwater is not well-defined 1484s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1484s branch and ref status, in git-debrebase terms: 1484s stitched? (no record of git-debrebase work) 1484s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1484s ' 1484s + t-expect-fail 'E:bare dgit dsc import' t-git-debrebase 1484s + local 'mpat=E:bare dgit dsc import' 1484s + shift 1484s + set +o pipefail 1484s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1484s + LC_MESSAGES=C 1484s + LANGUAGE=C 1484s + t-git-debrebase 1484s + local gdr=git-debrebase 1484s + : ' 1484s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1484s + git-debrebase --dgit=dgit -D 1484s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1484s git-debrebase ffq check_specs * 1484s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch) 1484s OK, you are ahead of refs/remotes/dgit/dgit/sid 1484s git-debrebase *** WALK 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 0 - 1484s git-debrebase get_differs d961783a7941d93057e1f45f793ecf9506db7604 11828cc23fd68a215b9c13cebc16724e51ea1942 = 0x2 1484s git-debrebase classify 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 $t=11828cc23fd68a215b9c13cebc16724e51ea1942 @p d961783a7941d93057e1f45f793ecf9506db7604/0x2 1484s git-debrebase = Upstream {"Tree" => "11828cc23fd68a215b9c13cebc16724e51ea1942","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","CommitId" => "9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604"}]} 1484s git-debrebase get_differs ed6bc7897ac272261988a7c5843a45732583b8c3 d0edc8316a360beb4536ba9ee0f9e7686d942168 = 0x2 1484s git-debrebase classify d961783a7941d93057e1f45f793ecf9506db7604 $t=d0edc8316a360beb4536ba9ee0f9e7686d942168 @p ed6bc7897ac272261988a7c5843a45732583b8c3/0x2 1484s git-debrebase = Upstream {"Hdr" => "tree d0edc8316a360beb4536ba9ee0f9e7686d942168\nparent ed6bc7897ac272261988a7c5843a45732583b8c3\nauthor Ian Jackson 1449445839 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "d0edc8316a360beb4536ba9ee0f9e7686d942168","Parents" => [{"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604"} 1484s git-debrebase get_differs 1d9c1ab6696b5b0b297493e1cce63577b4834b04 4d14e6df29441875898d6e92be6a3ecbe9ca4656 = 0x2 1484s git-debrebase classify ed6bc7897ac272261988a7c5843a45732583b8c3 $t=4d14e6df29441875898d6e92be6a3ecbe9ca4656 @p 1d9c1ab6696b5b0b297493e1cce63577b4834b04/0x2 1484s git-debrebase = Upstream {"Hdr" => "tree 4d14e6df29441875898d6e92be6a3ecbe9ca4656\nparent 1d9c1ab6696b5b0b297493e1cce63577b4834b04\nauthor Ian Jackson 1449445808 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "4d14e6df29441875898d6e92be6a3ecbe9ca4656","Parents" => [{"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3"} 1484s git-debrebase get_differs 94c010931d011cbd6c1861bb9d453aa12d826298 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase get_differs a5bb1f49c872a76a5d703570fd5352e424719bda faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase get_differs c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase classify 1d9c1ab6696b5b0b297493e1cce63577b4834b04 $t=faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 @p 94c010931d011cbd6c1861bb9d453aa12d826298/0x36 a5bb1f49c872a76a5d703570fd5352e424719bda/0x36 c4cc1785ce51e34becb04fc42ff2e2931bdb3b74/0x36 1484s git-debrebase = DgitImportUnpatched {"Tree" => "faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4","Hdr" => "tree faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4\nparent 94c010931d011cbd6c1861bb9d453aa12d826298\nparent a5bb1f49c872a76a5d703570fd5352e424719bda\nparent c4cc1785ce51e34becb04fc42ff2e2931bdb3b74\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","NewMsg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[was: dgit import unpatched example 1.0-1]\n","Msg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[dgit import unpatched example 1.0-1]\n","CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","OrigParents" => [{"CommitId" => "94c010931d011cbd6c1861bb9d453aa12d826298","Differs" => 54,"IsDgitImport" => "orig","IsOrigin" => 1,"Ix" => 0},{"CommitId" => "a5bb1f49c872a76a5d703570fd5352e424719bda","Differs" => 54,"IsDgitImport" => "orig","Ix" => 1,"IsOrigin" => 1}],"Type" => "DgitImportUnpatched","Parents" => [$VAR1->{"OrigParents"}[0],$VAR1->{"OrigParents"}[1],{"IsDgitImport" => "tarball","Differs" => 54,"Ix" => 2,"IsOrigin" => 1,"CommitId" => "c4cc1785ce51e34becb04fc42ff2e2931bdb3b74"}]} 1484s git-debrebase *** WALK BOMB bare dgit import 1484s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1484s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1484s 1484s git-debrebase: error: found unprocessable commit, cannot cope; bare dgit dsc import: (commit 1d9c1ab6696b5b0b297493e1cce63577b4834b04) (d.0x36 0x36 0x36) 1484s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1484s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1484s + local 'ps=255 0' 1484s + set -o pipefail 1484s + case $ps in 1484s + t-grep-mpat 'E:bare dgit dsc import' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1484s + local 'mpat=E:bare dgit dsc import' 1484s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1484s + local grepper=fgrep 1484s + case "$mpat" in 1484s + case "$mpat" in 1484s + grepper=egrep 1484s + mpat='bare dgit dsc import' 1484s + egrep -e 'bare dgit dsc import' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1484s git-debrebase: error: found unprocessable commit, cannot cope; bare dgit dsc import: (commit 1d9c1ab6696b5b0b297493e1cce63577b4834b04) (d.0x36 0x36 0x36) 1484s + tee ../bare-output 1484s + LC_MESSAGES=C 1484s + t-git-debrebase status 1484s + local gdr=git-debrebase 1484s + : ' 1484s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1484s + git-debrebase --dgit=dgit -D status 1484s git-debrebase get_differs d961783a7941d93057e1f45f793ecf9506db7604 11828cc23fd68a215b9c13cebc16724e51ea1942 = 0x2 1484s git-debrebase classify 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 $t=11828cc23fd68a215b9c13cebc16724e51ea1942 @p d961783a7941d93057e1f45f793ecf9506db7604/0x2 1484s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Ix" => 0}],"Hdr" => "tree 11828cc23fd68a215b9c13cebc16724e51ea1942\nparent d961783a7941d93057e1f45f793ecf9506db7604\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Type" => "Upstream","CommitId" => "9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6","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"} 1484s git-debrebase get_differs ed6bc7897ac272261988a7c5843a45732583b8c3 d0edc8316a360beb4536ba9ee0f9e7686d942168 = 0x2 1484s git-debrebase classify d961783a7941d93057e1f45f793ecf9506db7604 $t=d0edc8316a360beb4536ba9ee0f9e7686d942168 @p ed6bc7897ac272261988a7c5843a45732583b8c3/0x2 1484s git-debrebase = Upstream {"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Type" => "Upstream","Hdr" => "tree d0edc8316a360beb4536ba9ee0f9e7686d942168\nparent ed6bc7897ac272261988a7c5843a45732583b8c3\nauthor Ian Jackson 1449445839 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Parents" => [{"Ix" => 0,"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "d0edc8316a360beb4536ba9ee0f9e7686d942168"} 1484s git-debrebase get_differs 1d9c1ab6696b5b0b297493e1cce63577b4834b04 4d14e6df29441875898d6e92be6a3ecbe9ca4656 = 0x2 1484s git-debrebase classify ed6bc7897ac272261988a7c5843a45732583b8c3 $t=4d14e6df29441875898d6e92be6a3ecbe9ca4656 @p 1d9c1ab6696b5b0b297493e1cce63577b4834b04/0x2 1484s git-debrebase = Upstream {"Hdr" => "tree 4d14e6df29441875898d6e92be6a3ecbe9ca4656\nparent 1d9c1ab6696b5b0b297493e1cce63577b4834b04\nauthor Ian Jackson 1449445808 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Parents" => [{"Differs" => 2,"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Ix" => 0}],"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Type" => "Upstream","Tree" => "4d14e6df29441875898d6e92be6a3ecbe9ca4656","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1484s git-debrebase get_differs 94c010931d011cbd6c1861bb9d453aa12d826298 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase get_differs a5bb1f49c872a76a5d703570fd5352e424719bda faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase get_differs c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase classify 1d9c1ab6696b5b0b297493e1cce63577b4834b04 $t=faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 @p 94c010931d011cbd6c1861bb9d453aa12d826298/0x36 a5bb1f49c872a76a5d703570fd5352e424719bda/0x36 c4cc1785ce51e34becb04fc42ff2e2931bdb3b74/0x36 1484s 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" => [{"CommitId" => "94c010931d011cbd6c1861bb9d453aa12d826298","Differs" => 54,"IsOrigin" => 1,"Ix" => 0,"IsDgitImport" => "orig"},{"CommitId" => "a5bb1f49c872a76a5d703570fd5352e424719bda","Differs" => 54,"Ix" => 1,"IsOrigin" => 1,"IsDgitImport" => "orig"},{"CommitId" => "c4cc1785ce51e34becb04fc42ff2e2931bdb3b74","Differs" => 54,"IsOrigin" => 1,"Ix" => 2,"IsDgitImport" => "tarball"}],"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","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"} 1484s current branch contents, in git-debrebase terms: 1484s branch not in git-debrebase form 1484s found bare dgit dsc import with no prior history 1484s 1d9c1ab example (1.0-1) unstable; urgency=low 1484s key git-debrebase commits: 1484s anchor is not well-defined 1484s breakwater is not well-defined 1484s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1484s branch and ref status, in git-debrebase terms: 1484s stitched? (no record of git-debrebase work) 1484s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1484s ' 1484s + grep 'bare dgit dsc import with no prior history' ../bare-output 1484s found bare dgit dsc import with no prior history 1484s + git branch before 1484s + t-expect-fail 'E:Could not find or construct a suitable upstream commit' t-git-debrebase convert-from-dgit-view --no-origs 1484s + local 'mpat=E:Could not find or construct a suitable upstream commit' 1484s + shift 1484s + set +o pipefail 1484s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1484s + LC_MESSAGES=C 1484s + LANGUAGE=C 1484s + t-git-debrebase convert-from-dgit-view --no-origs 1484s + local gdr=git-debrebase 1484s + : ' 1484s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1484s + git-debrebase --dgit=dgit -D convert-from-dgit-view --no-origs 1484s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1484s git-debrebase get_differs d961783a7941d93057e1f45f793ecf9506db7604 11828cc23fd68a215b9c13cebc16724e51ea1942 = 0x2 1484s git-debrebase classify 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 $t=11828cc23fd68a215b9c13cebc16724e51ea1942 @p d961783a7941d93057e1f45f793ecf9506db7604/0x2 1484s git-debrebase = Upstream {"Tree" => "11828cc23fd68a215b9c13cebc16724e51ea1942","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","Type" => "Upstream","Parents" => [{"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 11828cc23fd68a215b9c13cebc16724e51ea1942\nparent d961783a7941d93057e1f45f793ecf9506db7604\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n"} 1484s git-debrebase get_differs ed6bc7897ac272261988a7c5843a45732583b8c3 d0edc8316a360beb4536ba9ee0f9e7686d942168 = 0x2 1484s git-debrebase classify d961783a7941d93057e1f45f793ecf9506db7604 $t=d0edc8316a360beb4536ba9ee0f9e7686d942168 @p ed6bc7897ac272261988a7c5843a45732583b8c3/0x2 1484s git-debrebase = Upstream {"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Tree" => "d0edc8316a360beb4536ba9ee0f9e7686d942168","Hdr" => "tree d0edc8316a360beb4536ba9ee0f9e7686d942168\nparent ed6bc7897ac272261988a7c5843a45732583b8c3\nauthor Ian Jackson 1449445839 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Parents" => [{"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1484s git-debrebase get_differs 1d9c1ab6696b5b0b297493e1cce63577b4834b04 4d14e6df29441875898d6e92be6a3ecbe9ca4656 = 0x2 1484s git-debrebase classify ed6bc7897ac272261988a7c5843a45732583b8c3 $t=4d14e6df29441875898d6e92be6a3ecbe9ca4656 @p 1d9c1ab6696b5b0b297493e1cce63577b4834b04/0x2 1484s git-debrebase = Upstream {"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","Type" => "Upstream","Parents" => [{"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Ix" => 0,"Differs" => 2}],"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Tree" => "4d14e6df29441875898d6e92be6a3ecbe9ca4656"} 1484s git-debrebase get_differs 94c010931d011cbd6c1861bb9d453aa12d826298 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase get_differs a5bb1f49c872a76a5d703570fd5352e424719bda faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase get_differs c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase classify 1d9c1ab6696b5b0b297493e1cce63577b4834b04 $t=faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 @p 94c010931d011cbd6c1861bb9d453aa12d826298/0x36 a5bb1f49c872a76a5d703570fd5352e424719bda/0x36 c4cc1785ce51e34becb04fc42ff2e2931bdb3b74/0x36 1484s git-debrebase = DgitImportUnpatched {"Hdr" => "tree faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4\nparent 94c010931d011cbd6c1861bb9d453aa12d826298\nparent a5bb1f49c872a76a5d703570fd5352e424719bda\nparent c4cc1785ce51e34becb04fc42ff2e2931bdb3b74\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","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","Parents" => [{"IsDgitImport" => "orig","CommitId" => "94c010931d011cbd6c1861bb9d453aa12d826298","Differs" => 54,"Ix" => 0,"IsOrigin" => 1},{"IsDgitImport" => "orig","CommitId" => "a5bb1f49c872a76a5d703570fd5352e424719bda","IsOrigin" => 1,"Differs" => 54,"Ix" => 1},{"IsDgitImport" => "tarball","IsOrigin" => 1,"Ix" => 2,"Differs" => 54,"CommitId" => "c4cc1785ce51e34becb04fc42ff2e2931bdb3b74"}],"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]],"Tree" => "faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4","CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04"} 1484s git-debrebase troubles=1 1484s Considering possible commits corresponding to upstream: 1484s git tag: no suitable tag found (tried 1.0 v1.0 upstream/1.0) 1484s Evaluating possible commits corresponding to upstream: 1484s 1484s git-debrebase: error: Could not find or construct a suitable upstream commit. 1484s git-debrebase: Rerun adding --diagnose after convert-from-dgit-view, or pass a 1484s git-debrebase: upstream commmit explicitly or provide suitable origs. 1484s + local 'ps=255 0' 1484s + set -o pipefail 1484s + case $ps in 1484s + t-grep-mpat 'E:Could not find or construct a suitable upstream commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1484s + local 'mpat=E:Could not find or construct a suitable upstream commit' 1484s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1484s + local grepper=fgrep 1484s + case "$mpat" in 1484s + case "$mpat" in 1484s + grepper=egrep 1484s + mpat='Could not find or construct a suitable upstream commit' 1484s + egrep -e 'Could not find or construct a suitable upstream commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1484s git-debrebase: error: Could not find or construct a suitable upstream commit. 1484s + t-git-debrebase convert-from-dgit-view 1484s + local gdr=git-debrebase 1484s + : ' 1484s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1484s + git-debrebase --dgit=dgit -D convert-from-dgit-view 1484s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1484s git-debrebase get_differs d961783a7941d93057e1f45f793ecf9506db7604 11828cc23fd68a215b9c13cebc16724e51ea1942 = 0x2 1484s git-debrebase classify 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 $t=11828cc23fd68a215b9c13cebc16724e51ea1942 @p d961783a7941d93057e1f45f793ecf9506db7604/0x2 1484s 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","CommitId" => "9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6","Tree" => "11828cc23fd68a215b9c13cebc16724e51ea1942","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604"}],"Type" => "Upstream","Hdr" => "tree 11828cc23fd68a215b9c13cebc16724e51ea1942\nparent d961783a7941d93057e1f45f793ecf9506db7604\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n"} 1484s git-debrebase get_differs ed6bc7897ac272261988a7c5843a45732583b8c3 d0edc8316a360beb4536ba9ee0f9e7686d942168 = 0x2 1484s git-debrebase classify d961783a7941d93057e1f45f793ecf9506db7604 $t=d0edc8316a360beb4536ba9ee0f9e7686d942168 @p ed6bc7897ac272261988a7c5843a45732583b8c3/0x2 1484s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "d0edc8316a360beb4536ba9ee0f9e7686d942168","CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Parents" => [{"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Hdr" => "tree d0edc8316a360beb4536ba9ee0f9e7686d942168\nparent ed6bc7897ac272261988a7c5843a45732583b8c3\nauthor Ian Jackson 1449445839 +0000\ncommitter Ian Jackson 1431548802 +0000\n"} 1484s git-debrebase get_differs 1d9c1ab6696b5b0b297493e1cce63577b4834b04 4d14e6df29441875898d6e92be6a3ecbe9ca4656 = 0x2 1484s git-debrebase classify ed6bc7897ac272261988a7c5843a45732583b8c3 $t=4d14e6df29441875898d6e92be6a3ecbe9ca4656 @p 1d9c1ab6696b5b0b297493e1cce63577b4834b04/0x2 1484s git-debrebase = Upstream {"Parents" => [{"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","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","Tree" => "4d14e6df29441875898d6e92be6a3ecbe9ca4656","CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3"} 1484s git-debrebase get_differs 94c010931d011cbd6c1861bb9d453aa12d826298 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase get_differs a5bb1f49c872a76a5d703570fd5352e424719bda faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase get_differs c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 1484s git-debrebase classify 1d9c1ab6696b5b0b297493e1cce63577b4834b04 $t=faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 @p 94c010931d011cbd6c1861bb9d453aa12d826298/0x36 a5bb1f49c872a76a5d703570fd5352e424719bda/0x36 c4cc1785ce51e34becb04fc42ff2e2931bdb3b74/0x36 1484s git-debrebase = DgitImportUnpatched {"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Parents" => [{"CommitId" => "94c010931d011cbd6c1861bb9d453aa12d826298","IsOrigin" => 1,"IsDgitImport" => "orig","Ix" => 0,"Differs" => 54},{"IsOrigin" => 1,"Ix" => 1,"Differs" => 54,"IsDgitImport" => "orig","CommitId" => "a5bb1f49c872a76a5d703570fd5352e424719bda"},{"Differs" => 54,"Ix" => 2,"IsDgitImport" => "tarball","IsOrigin" => 1,"CommitId" => "c4cc1785ce51e34becb04fc42ff2e2931bdb3b74"}],"Hdr" => "tree faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4\nparent 94c010931d011cbd6c1861bb9d453aa12d826298\nparent a5bb1f49c872a76a5d703570fd5352e424719bda\nparent c4cc1785ce51e34becb04fc42ff2e2931bdb3b74\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Msg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[dgit import unpatched example 1.0-1]\n","Tree" => "faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4","OrigParents" => [$VAR1->{"Parents"}[0],$VAR1->{"Parents"}[1]],"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"} 1484s git-debrebase troubles=1 1484s Considering possible commits corresponding to upstream: 1484s git tag: no suitable tag found (tried 1.0 v1.0 upstream/1.0) 1484s orig: found what looks like a .orig, ../example_1.0.orig-docs.tar.gz 1486s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1486s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1486s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1486s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1486s Evaluating possible commits corresponding to upstream: 1486s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1486s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1486s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1486s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1486s Yes, will base new branch on orig(s) imported via dgit 1486s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1486s git-debrebase ffq check_specs * 1486s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch) 1486s OK, you are ahead of refs/remotes/dgit/dgit/sid 1486s git-debrebase >= update refs/debrebase-last/heads/dgit/sid 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 0000000000000000000000000000000000000000 1486s git-debrebase >= update HEAD 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 1486s git-debrebase >$ 1486s HEAD is now at 5f4fc22 Update .gitignore from Debian packaging branch 1486s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1486s ' 1486s + t-gdr-good laundered 1486s + local state=laundered 1486s + local beforetag= 1486s + case $state in 1486s + git diff --quiet -- :. ':!debian/patches' 1486s + LC_MESSAGES=C 1486s + t-git-debrebase status 1486s + local gdr=git-debrebase 1486s + : ' 1486s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1486s + git-debrebase --dgit=dgit -D status 1486s git-debrebase get_differs 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 = 0x2 1486s git-debrebase classify 5f4fc22e40465aefaa231960eddbd3e37ff96d8c $t=e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 @p 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b/0x2 1486s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b"}],"CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","Hdr" => "tree e5dd0e087a1ed7cb0f120374cb6300ae51cbf893\nparent 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b\nauthor Ian Jackson 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","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","Type" => "Upstream"} 1486s git-debrebase get_differs 9649a7170321f0642a52e2f5ba557fdc57923dc5 b062247c1b40e1417326d151508e24e26e03d88b = 0x2 1486s git-debrebase classify 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b $t=b062247c1b40e1417326d151508e24e26e03d88b @p 9649a7170321f0642a52e2f5ba557fdc57923dc5/0x2 1486s git-debrebase = Upstream {"Hdr" => "tree b062247c1b40e1417326d151508e24e26e03d88b\nparent 9649a7170321f0642a52e2f5ba557fdc57923dc5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Parents" => [{"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "b062247c1b40e1417326d151508e24e26e03d88b","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1486s git-debrebase get_differs c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 3682658481e8d1d1923af1ad45b101aff6a74a26 = 0x2 1486s git-debrebase classify 9649a7170321f0642a52e2f5ba557fdc57923dc5 $t=3682658481e8d1d1923af1ad45b101aff6a74a26 @p c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4/0x2 1486s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "3682658481e8d1d1923af1ad45b101aff6a74a26","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" => [{"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Differs" => 2,"Ix" => 0}],"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5"} 1486s git-debrebase get_differs bd26902a24e988020d5219e39d2413096d29d883 3d455942a13d254c6b2f81505c8beca11ef09619 = 0 1486s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 1486s git-debrebase classify c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p bd26902a24e988020d5219e39d2413096d29d883/0 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 1486s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "bd26902a24e988020d5219e39d2413096d29d883"},{"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Ix" => 1,"Differs" => 48}],"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","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","CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Type" => "Anchor"} 1486s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1486s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1486s ' 1486s + case $state in 1486s + egrep '^ *branch is laundered' ../status.check 1486s branch is laundered 1486s + t-gdr-good-analyse HEAD laundered 1486s + local head=HEAD 1486s + local state=laundered 1486s + local wsfx= 1486s + local etypes bwtip 1486s + case $state in 1486s + etypes=Upstream 1486s ++ t-git-debrebase breakwater 1486s ++ local gdr=git-debrebase 1486s ++ : ' 1486s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1486s ++ git-debrebase --dgit=dgit -D breakwater 1487s git-debrebase get_differs 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 = 0x2 1487s git-debrebase classify 5f4fc22e40465aefaa231960eddbd3e37ff96d8c $t=e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 @p 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b/0x2 1487s git-debrebase = Upstream {"Tree" => "e5dd0e087a1ed7cb0f120374cb6300ae51cbf893","CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","Parents" => [{"Ix" => 0,"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Differs" => 2}],"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","Hdr" => "tree e5dd0e087a1ed7cb0f120374cb6300ae51cbf893\nparent 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b\nauthor Ian Jackson 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1487s git-debrebase get_differs 9649a7170321f0642a52e2f5ba557fdc57923dc5 b062247c1b40e1417326d151508e24e26e03d88b = 0x2 1487s git-debrebase classify 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b $t=b062247c1b40e1417326d151508e24e26e03d88b @p 9649a7170321f0642a52e2f5ba557fdc57923dc5/0x2 1487s git-debrebase = Upstream {"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","Tree" => "b062247c1b40e1417326d151508e24e26e03d88b"} 1487s git-debrebase get_differs c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 3682658481e8d1d1923af1ad45b101aff6a74a26 = 0x2 1487s git-debrebase classify 9649a7170321f0642a52e2f5ba557fdc57923dc5 $t=3682658481e8d1d1923af1ad45b101aff6a74a26 @p c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4/0x2 1487s git-debrebase = Upstream {"Hdr" => "tree 3682658481e8d1d1923af1ad45b101aff6a74a26\nparent c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4"}],"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Tree" => "3682658481e8d1d1923af1ad45b101aff6a74a26"} 1487s git-debrebase get_differs bd26902a24e988020d5219e39d2413096d29d883 3d455942a13d254c6b2f81505c8beca11ef09619 = 0 1487s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 1487s git-debrebase classify c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p bd26902a24e988020d5219e39d2413096d29d883/0 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 1487s 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","Parents" => [{"Differs" => 0,"CommitId" => "bd26902a24e988020d5219e39d2413096d29d883","Ix" => 0},{"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Differs" => 48,"Ix" => 1}],"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","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"} 1487s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1487s ' 1487s + bwtip=Y:c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 1487s + anal=../anal 1487s + t-git-debrebase analyse HEAD 1487s + local gdr=git-debrebase 1487s + : ' 1487s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1487s + git-debrebase --dgit=dgit -D analyse HEAD 1487s git-debrebase *** WALK 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1 *main::STDOUT 1487s git-debrebase get_differs 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 = 0x2 1487s git-debrebase classify 5f4fc22e40465aefaa231960eddbd3e37ff96d8c $t=e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 @p 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b/0x2 1487s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b"}],"CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","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","Type" => "Upstream","Hdr" => "tree e5dd0e087a1ed7cb0f120374cb6300ae51cbf893\nparent 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b\nauthor Ian Jackson 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1487s git-debrebase get_differs 9649a7170321f0642a52e2f5ba557fdc57923dc5 b062247c1b40e1417326d151508e24e26e03d88b = 0x2 1487s git-debrebase classify 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b $t=b062247c1b40e1417326d151508e24e26e03d88b @p 9649a7170321f0642a52e2f5ba557fdc57923dc5/0x2 1487s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Tree" => "b062247c1b40e1417326d151508e24e26e03d88b","Type" => "Upstream","Hdr" => "tree b062247c1b40e1417326d151508e24e26e03d88b\nparent 9649a7170321f0642a52e2f5ba557fdc57923dc5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1487s git-debrebase get_differs c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 3682658481e8d1d1923af1ad45b101aff6a74a26 = 0x2 1487s git-debrebase classify 9649a7170321f0642a52e2f5ba557fdc57923dc5 $t=3682658481e8d1d1923af1ad45b101aff6a74a26 @p c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4/0x2 1487s git-debrebase = Upstream {"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Tree" => "3682658481e8d1d1923af1ad45b101aff6a74a26","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Hdr" => "tree 3682658481e8d1d1923af1ad45b101aff6a74a26\nparent c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1487s git-debrebase get_differs bd26902a24e988020d5219e39d2413096d29d883 3d455942a13d254c6b2f81505c8beca11ef09619 = 0 1487s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 1487s git-debrebase classify c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p bd26902a24e988020d5219e39d2413096d29d883/0 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 1487s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","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","Parents" => [{"Differs" => 0,"CommitId" => "bd26902a24e988020d5219e39d2413096d29d883","Ix" => 0},{"Differs" => 48,"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Ix" => 1}],"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"} 1487s git-debrebase *** WALK prep done cur=c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 brw -1 upp 2 proc 3 pm -1 1487s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1487s ' 1487s ++ git rev-parse HEAD 1487s + expect=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + exec 1487s + local cid ctype info nparents 1487s + read cid ctype info 1487s + : ===== 5f4fc22e40465aefaa231960eddbd3e37ff96d8c Upstream ===== 1487s + test 5f4fc22e40465aefaa231960eddbd3e37ff96d8c = 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + local cetype=Upstream 1487s + '[' xUpstream = xUpstream ']' 1487s + cetype=SAME 1487s ++ git log -n1 --pretty=format:%P 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + local parents=7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 1487s + expect=7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 1487s + enparents=1 1487s + : Upstream/SAME 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 1487s + case "$ctype/$cetype" in 1487s + case "$ctype/$etypes" in 1487s + case "$cetype" in 1487s + case "$ctype" in 1487s ++ printf %s 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 1487s ++ wc -w 1487s + local cnparents=1 1487s + test 1 = 1 1487s ++ for f in $parents 1487s ++ echo 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 1487s ++ wc -w 1487s ++ t-sort -u 1487s ++ LC_COLLATE=C 1487s ++ sort -u 1487s + local cndparents=1 1487s + test 1 = 1 1487s + case "$parents" in 1487s + case "$ctype" in 1487s + read cid ctype info 1487s + : ===== 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b Upstream ===== 1487s + test 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b = 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 1487s + local cetype=Upstream 1487s + '[' xUpstream = xUpstream ']' 1487s + cetype=SAME 1487s ++ git log -n1 --pretty=format:%P 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 1487s + local parents=9649a7170321f0642a52e2f5ba557fdc57923dc5 1487s + expect=9649a7170321f0642a52e2f5ba557fdc57923dc5 1487s + enparents=1 1487s + : Upstream/SAME 9649a7170321f0642a52e2f5ba557fdc57923dc5 1487s + case "$ctype/$cetype" in 1487s + case "$ctype/$etypes" in 1487s + case "$cetype" in 1487s + case "$ctype" in 1487s ++ printf %s 9649a7170321f0642a52e2f5ba557fdc57923dc5 1487s ++ wc -w 1487s + local cnparents=1 1487s + test 1 = 1 1487s ++ for f in $parents 1487s ++ echo 9649a7170321f0642a52e2f5ba557fdc57923dc5 1487s ++ wc -w 1487s ++ t-sort -u 1487s ++ LC_COLLATE=C 1487s ++ sort -u 1487s + local cndparents=1 1487s + test 1 = 1 1487s + case "$parents" in 1487s + case "$ctype" in 1487s + read cid ctype info 1487s + : ===== 9649a7170321f0642a52e2f5ba557fdc57923dc5 Upstream ===== 1487s + test 9649a7170321f0642a52e2f5ba557fdc57923dc5 = 9649a7170321f0642a52e2f5ba557fdc57923dc5 1487s + local cetype=Upstream 1487s + '[' xUpstream = xUpstream ']' 1487s + cetype=SAME 1487s ++ git log -n1 --pretty=format:%P 9649a7170321f0642a52e2f5ba557fdc57923dc5 1487s + local parents=c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 1487s + expect=c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 1487s + enparents=1 1487s + : Upstream/SAME c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 1487s + case "$ctype/$cetype" in 1487s + case "$ctype/$etypes" in 1487s + case "$cetype" in 1487s + case "$ctype" in 1487s ++ printf %s c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 1487s ++ wc -w 1487s + local cnparents=1 1487s + test 1 = 1 1487s ++ for f in $parents 1487s ++ echo c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 1487s ++ wc -w 1487s ++ t-sort -u 1487s ++ LC_COLLATE=C 1487s ++ sort -u 1487s + local cndparents=1 1487s + test 1 = 1 1487s + case "$parents" in 1487s + case "$ctype" in 1487s + read cid ctype info 1487s + : ===== c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 Anchor ===== 1487s + test c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 = c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 1487s + local cetype=Upstream 1487s + '[' xAnchor = xUpstream ']' 1487s ++ git log -n1 --pretty=format:%P c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 1487s + local 'parents=bd26902a24e988020d5219e39d2413096d29d883 3c905ddc77266a886108a516cf92a1a8f195e235' 1487s + expect='bd26902a24e988020d5219e39d2413096d29d883 3c905ddc77266a886108a516cf92a1a8f195e235' 1487s + enparents=1 1487s + : Anchor/Upstream 'bd26902a24e988020d5219e39d2413096d29d883 3c905ddc77266a886108a516cf92a1a8f195e235' 1487s + case "$ctype/$cetype" in 1487s + case "$ctype/$etypes" in 1487s + case "$cetype" in 1487s + case "$ctype" in 1487s + break 1487s + t-expect-fail 'E:already seems to be in git-debrebase format' t-git-debrebase convert-from-dgit-view 1487s + local 'mpat=E:already seems to be in git-debrebase format' 1487s + shift 1487s + set +o pipefail 1487s + LC_MESSAGES=C 1487s + LANGUAGE=C 1487s + t-git-debrebase convert-from-dgit-view 1487s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1487s + local gdr=git-debrebase 1487s + : ' 1487s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1487s + git-debrebase --dgit=dgit -D convert-from-dgit-view 1487s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1487s git-debrebase: snag detected (-falready-converted): ahead of debrebase-last, this is already managed by git-debrebase! 1487s git-debrebase get_differs 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 = 0x2 1487s git-debrebase classify 5f4fc22e40465aefaa231960eddbd3e37ff96d8c $t=e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 @p 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b/0x2 1487s git-debrebase = Upstream {"Type" => "Upstream","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","Parents" => [{"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Ix" => 0,"Differs" => 2}],"CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c"} 1487s git-debrebase get_differs 9649a7170321f0642a52e2f5ba557fdc57923dc5 b062247c1b40e1417326d151508e24e26e03d88b = 0x2 1487s git-debrebase classify 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b $t=b062247c1b40e1417326d151508e24e26e03d88b @p 9649a7170321f0642a52e2f5ba557fdc57923dc5/0x2 1487s git-debrebase = Upstream {"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","Ix" => 0,"Differs" => 2}],"Tree" => "b062247c1b40e1417326d151508e24e26e03d88b"} 1487s git-debrebase get_differs c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 3682658481e8d1d1923af1ad45b101aff6a74a26 = 0x2 1487s git-debrebase classify 9649a7170321f0642a52e2f5ba557fdc57923dc5 $t=3682658481e8d1d1923af1ad45b101aff6a74a26 @p c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4/0x2 1487s git-debrebase = Upstream {"Tree" => "3682658481e8d1d1923af1ad45b101aff6a74a26","Parents" => [{"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Ix" => 0,"Differs" => 2}],"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Type" => "Upstream","Hdr" => "tree 3682658481e8d1d1923af1ad45b101aff6a74a26\nparent c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4\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"} 1487s git-debrebase get_differs bd26902a24e988020d5219e39d2413096d29d883 3d455942a13d254c6b2f81505c8beca11ef09619 = 0 1487s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 1487s git-debrebase classify c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p bd26902a24e988020d5219e39d2413096d29d883/0 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 1487s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235"}],"Parents" => [{"Differs" => 0,"CommitId" => "bd26902a24e988020d5219e39d2413096d29d883","Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","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","Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent bd26902a24e988020d5219e39d2413096d29d883\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1487s git-debrebase troubles=0 1487s git-debrebase: Branch already seems to be in git-debrebase format! 1487s git-debrebase: --always-convert-anyway would do the conversion operation anyway 1487s git-debrebase: but is probably a bad idea. Probably, you wanted to do nothing. 1487s 1487s git-debrebase: error: Branch already in git-debrebase format. 1487s + local 'ps=255 0' 1487s + set -o pipefail 1487s + case $ps in 1487s + t-grep-mpat 'E:already seems to be in git-debrebase format' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1487s + local 'mpat=E:already seems to be in git-debrebase format' 1487s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1487s + local grepper=fgrep 1487s + case "$mpat" in 1487s + case "$mpat" in 1487s + grepper=egrep 1487s + mpat='already seems to be in git-debrebase format' 1487s + egrep -e 'already seems to be in git-debrebase format' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1487s git-debrebase: Branch already seems to be in git-debrebase format! 1487s + t-refs-same-start 1487s + unset t_ref_val 1487s + t_ref_names=() 1487s + t-ref-head 1487s + local val 1487s ++ git rev-parse HEAD 1487s + val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + t-ref-same-val HEAD 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + local name=HEAD 1487s + local val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + case "${t_ref_val-unset}" in 1487s + t_ref_val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + t_ref_names+=("$name") 1487s + t-git-debrebase --noop-ok convert-from-dgit-view 1487s + local gdr=git-debrebase 1487s + : ' 1487s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1487s + git-debrebase --dgit=dgit -D --noop-ok convert-from-dgit-view 1487s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1487s git-debrebase: snag detected (-falready-converted): ahead of debrebase-last, this is already managed by git-debrebase! 1487s git-debrebase get_differs 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 = 0x2 1487s git-debrebase classify 5f4fc22e40465aefaa231960eddbd3e37ff96d8c $t=e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 @p 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b/0x2 1487s git-debrebase = Upstream {"Hdr" => "tree e5dd0e087a1ed7cb0f120374cb6300ae51cbf893\nparent 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b\nauthor Ian Jackson 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Differs" => 2}],"Type" => "Upstream","Tree" => "e5dd0e087a1ed7cb0f120374cb6300ae51cbf893","CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","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"} 1487s git-debrebase get_differs 9649a7170321f0642a52e2f5ba557fdc57923dc5 b062247c1b40e1417326d151508e24e26e03d88b = 0x2 1487s git-debrebase classify 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b $t=b062247c1b40e1417326d151508e24e26e03d88b @p 9649a7170321f0642a52e2f5ba557fdc57923dc5/0x2 1487s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Differs" => 2,"Ix" => 0}],"Hdr" => "tree b062247c1b40e1417326d151508e24e26e03d88b\nparent 9649a7170321f0642a52e2f5ba557fdc57923dc5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "b062247c1b40e1417326d151508e24e26e03d88b"} 1487s git-debrebase get_differs c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 3682658481e8d1d1923af1ad45b101aff6a74a26 = 0x2 1487s git-debrebase classify 9649a7170321f0642a52e2f5ba557fdc57923dc5 $t=3682658481e8d1d1923af1ad45b101aff6a74a26 @p c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4/0x2 1487s git-debrebase = Upstream {"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "3682658481e8d1d1923af1ad45b101aff6a74a26","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Differs" => 2}],"Hdr" => "tree 3682658481e8d1d1923af1ad45b101aff6a74a26\nparent c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1487s git-debrebase get_differs bd26902a24e988020d5219e39d2413096d29d883 3d455942a13d254c6b2f81505c8beca11ef09619 = 0 1487s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 1487s git-debrebase classify c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p bd26902a24e988020d5219e39d2413096d29d883/0 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 1487s 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","CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235"}],"Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","Type" => "Anchor","Parents" => [{"Differs" => 0,"CommitId" => "bd26902a24e988020d5219e39d2413096d29d883","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent bd26902a24e988020d5219e39d2413096d29d883\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1487s git-debrebase troubles=0 1487s git-debrebase: Branch already seems to be in git-debrebase format! 1487s git-debrebase: --always-convert-anyway would do the conversion operation anyway 1487s git-debrebase: but is probably a bad idea. Probably, you wanted to do nothing. 1487s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1487s ' 1487s + t-ref-head 1487s + local val 1487s ++ git rev-parse HEAD 1487s + val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + t-ref-same-val HEAD 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + local name=HEAD 1487s + local val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + case "${t_ref_val-unset}" in 1487s + t_ref_val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1487s + t_ref_names+=("$name") 1487s + t-git-debrebase -falready-converted convert-from-dgit-view --always-convert-anyway 1487s + local gdr=git-debrebase 1487s + : ' 1487s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1487s + git-debrebase --dgit=dgit -D -falready-converted convert-from-dgit-view --always-convert-anyway 1487s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1487s git-debrebase: snag ignored (-falready-converted): ahead of debrebase-last, this is already managed by git-debrebase! 1487s Considering possible commits corresponding to upstream: 1487s git tag: no suitable tag found (tried 1.0 v1.0 upstream/1.0) 1487s orig: found what looks like a .orig, ../example_1.0.orig-docs.tar.gz 1489s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1489s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1489s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1489s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1489s Evaluating possible commits corresponding to upstream: 1489s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1489s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1489s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1489s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1489s Yes, will base new branch on orig(s) imported via dgit 1489s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1489s git-debrebase ffq check_specs * 1489s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch) 1489s OK, you are ahead of refs/remotes/dgit/dgit/sid 1489s git-debrebase: snags: 1 overriden by individual -f options 1489s git-debrebase >= update refs/debrebase-last/heads/dgit/sid c1ef594fe0023d58f7bfa24a1d43155d230cef24 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1489s git-debrebase >= update HEAD c1ef594fe0023d58f7bfa24a1d43155d230cef24 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1489s git-debrebase >$ 1489s HEAD is now at c1ef594 git-debrebase convert-from-dgit-view: declare upstream 1489s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1489s ' 1489s + t-expect-fail 'E:ref varies' t-ref-head 1489s + local 'mpat=E:ref varies' 1489s + shift 1489s + set +o pipefail 1489s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1489s + LC_MESSAGES=C 1489s + LANGUAGE=C 1489s + t-ref-head 1489s + local val 1489s ++ git rev-parse HEAD 1489s + val=c1ef594fe0023d58f7bfa24a1d43155d230cef24 1489s + t-ref-same-val HEAD c1ef594fe0023d58f7bfa24a1d43155d230cef24 1489s + local name=HEAD 1489s + local val=c1ef594fe0023d58f7bfa24a1d43155d230cef24 1489s + case "${t_ref_val-unset}" in 1489s + fail 'ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD)' 1489s + echo 'failed: ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD)' 1489s failed: ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD) 1489s + exit 1 1489s + local 'ps=1 0' 1489s + set -o pipefail 1489s + case $ps in 1489s + t-grep-mpat 'E:ref varies' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1489s + local 'mpat=E:ref varies' 1489s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1489s + local grepper=fgrep 1489s + case "$mpat" in 1489s + case "$mpat" in 1489s + grepper=egrep 1489s + mpat='ref varies' 1489s + egrep -e 'ref varies' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1489s + fail 'ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD)' 1489s + echo 'failed: ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD)' 1489s failed: ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD) 1489s + t-gdr-good laundered 1489s + local state=laundered 1489s + local beforetag= 1489s + case $state in 1489s + git diff --quiet -- :. ':!debian/patches' 1489s + LC_MESSAGES=C 1489s + t-git-debrebase status 1489s + local gdr=git-debrebase 1489s + : ' 1489s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1489s + git-debrebase --dgit=dgit -D status 1489s git-debrebase get_differs 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x2 1489s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 1489s git-debrebase classify c1ef594fe0023d58f7bfa24a1d43155d230cef24 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p 5f4fc22e40465aefaa231960eddbd3e37ff96d8c/0x2 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 1489s 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" => [{"Differs" => 48,"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Ix" => 1}],"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","Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c"},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 1489s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 1489s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1489s ' 1489s + case $state in 1489s + egrep '^ *branch is laundered' ../status.check 1489s branch is laundered 1489s + t-gdr-good-analyse HEAD laundered 1489s + local head=HEAD 1489s + local state=laundered 1489s + local wsfx= 1489s + local etypes bwtip 1489s + case $state in 1489s + etypes=Upstream 1489s ++ t-git-debrebase breakwater 1489s ++ local gdr=git-debrebase 1489s ++ : ' 1489s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1489s ++ git-debrebase --dgit=dgit -D breakwater 1489s git-debrebase get_differs 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x2 1489s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 1489s git-debrebase classify c1ef594fe0023d58f7bfa24a1d43155d230cef24 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p 5f4fc22e40465aefaa231960eddbd3e37ff96d8c/0x2 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 1489s 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","OrigParents" => [{"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Differs" => 48,"Ix" => 1}],"Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent 5f4fc22e40465aefaa231960eddbd3e37ff96d8c\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","Type" => "Anchor","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c"},$VAR1->{"OrigParents"}[0]],"CommitId" => "c1ef594fe0023d58f7bfa24a1d43155d230cef24"} 1489s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1489s ' 1489s + bwtip=Y:c1ef594fe0023d58f7bfa24a1d43155d230cef24 1489s + anal=../anal 1489s + t-git-debrebase analyse HEAD 1489s + local gdr=git-debrebase 1489s + : ' 1489s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1489s + git-debrebase --dgit=dgit -D analyse HEAD 1489s git-debrebase *** WALK c1ef594fe0023d58f7bfa24a1d43155d230cef24 1 *main::STDOUT 1489s git-debrebase get_differs 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x2 1489s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 1489s git-debrebase classify c1ef594fe0023d58f7bfa24a1d43155d230cef24 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p 5f4fc22e40465aefaa231960eddbd3e37ff96d8c/0x2 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 1489s 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","Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","CommitId" => "c1ef594fe0023d58f7bfa24a1d43155d230cef24","Parents" => [{"CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","Differs" => 2,"Ix" => 0},{"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Differs" => 48,"Ix" => 1}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]]} 1489s git-debrebase *** WALK prep done cur=c1ef594fe0023d58f7bfa24a1d43155d230cef24 brw -1 upp -1 proc 0 pm -1 1489s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1489s ' 1489s ++ git rev-parse HEAD 1489s + expect=c1ef594fe0023d58f7bfa24a1d43155d230cef24 1489s + exec 1489s + local cid ctype info nparents 1489s + read cid ctype info 1489s + : ===== c1ef594fe0023d58f7bfa24a1d43155d230cef24 Anchor ===== 1489s + test c1ef594fe0023d58f7bfa24a1d43155d230cef24 = c1ef594fe0023d58f7bfa24a1d43155d230cef24 1489s + local cetype=Upstream 1489s + '[' xAnchor = xUpstream ']' 1489s ++ git log -n1 --pretty=format:%P c1ef594fe0023d58f7bfa24a1d43155d230cef24 1489s + local 'parents=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3c905ddc77266a886108a516cf92a1a8f195e235' 1489s + expect='5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3c905ddc77266a886108a516cf92a1a8f195e235' 1489s + enparents=1 1489s + : Anchor/Upstream '5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3c905ddc77266a886108a516cf92a1a8f195e235' 1489s + case "$ctype/$cetype" in 1489s + case "$ctype/$etypes" in 1489s + case "$cetype" in 1489s + case "$ctype" in 1489s + break 1489s + t-ok 1489s + : ======================================== 1489s + t-check-only-bpd 1489s + '[' .. = .. ']' 1489s + return 1489s + t-fscks 1489s + shopt -s nullglob 1489s + for d in $tmp/*/.git $tmp/git/*.git 1489s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1489s + t-git-fsck 1489s ++ git rev-parse --git-dir 1489s + local fsckerrs=.git/dgit-test-fsck.errs 1489s + set +e 1489s + LC_MESSAGES=C 1489s + git fsck --no-dangling --strict 1489s + tee .git/dgit-test-fsck.errs 1489s + ps='0 0' 1489s + set -e 1489s + local pats 1489s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1489s + test '0 0' = '0 0' 1489s + pats+=(-e 'notice: HEAD points to an unborn branch') 1489s + pats+=(-e 'notice: No default references') 1489s + set +e 1489s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1489s + rc=1 1489s + set -e 1489s + case $rc in 1489s + t-save-artifacts 1489s + artifacts=/tmp/autopkgtest.XK8uun/gdr-import-dgitview-artifacts 1489s + '[' x/tmp/autopkgtest.XK8uun/gdr-import-dgitview-artifacts = x ']' 1489s + '[' xtmp = x ']' 1489s + GZIP=-1v 1489s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-import-dgitview-artifacts/gdr-import-dgitview.tar.gz '--exclude=*.tar' . 1489s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1489s 78.7% 1489s + echo ok. 1489s ok. 1489s + rc=0 1489s + set +x 1489s + set +e 1489s + pwd 1489s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1489s + '[' x '!=' x ']' 1489s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1489s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1489s + set -e 1489s + test 0 = 0 1489s autopkgtest [23:11:59]: test gdr-import-dgitview: -----------------------] 1490s autopkgtest [23:12:00]: test gdr-import-dgitview: - - - - - - - - - - results - - - - - - - - - - 1490s gdr-import-dgitview PASS 1490s autopkgtest [23:12:00]: test gdr-import-nostitch: preparing testbed 1491s Reading package lists... 1491s Building dependency tree... 1491s Reading state information... 1491s Starting pkgProblemResolver with broken count: 0 1491s Starting 2 pkgProblemResolver with broken count: 0 1491s Done 1491s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1493s autopkgtest [23:12:03]: test gdr-import-nostitch: [----------------------- 1493s ++ set -o pipefail 1493s ++ . tests/lib-core 1493s ++ . tests/lib-restricts 1493s ++ trap ' 1493s rc=$? 1493s set +x 1493s test $rc = 0 || echo " 1493s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1493s 1493s Most relevant logs are just before assignment rc=$rc 1493s Will now do cleanup etc. 1493s " 1493s set -x 1493s set +e 1493s pwd 1493s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1493s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1493s set -e 1493s test $rc = 0 || t-report-failure 1493s ' EXIT 1493s ++ t-filter-out-git-hyphen-dir 1493s ++ local pathent 1493s +++ type -p git-rev-parse 1493s +++ : 1493s ++ pathent= 1493s ++ case "$pathent" in 1493s ++ return 1493s ++ t-set-intree 1493s ++ '[' x = x ']' 1493s ++ return 1493s ++ : -D 1493s ++ export DGIT_TEST_DEBUG 1493s ++ : x 1493s ++ export DGIT_TEST_DEBPUSH_DEBUG 1493s ++ : 1493s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1493s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1493s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1493s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1493s ++ export LC_CTYPE=C.UTF-8 1493s ++ LC_CTYPE=C.UTF-8 1493s ++ unset CDPATH 1493s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1493s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1493s +++ pwd 1493s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1493s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1493s ++ testname=gdr-import-nostitch 1493s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1493s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1493s ++ bpd=.. 1493s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1493s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1493s ++ '[' x '!=' x ']' 1493s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1493s +++ pwd 1493s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1493s ++ t-set-using-tmp 1493s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1493s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1493s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1493s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1493s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1493s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1493s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1493s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1493s ++ export 'DEBFULLNAME=dgit test git user' 1493s ++ DEBFULLNAME='dgit test git user' 1493s ++ git config --global user.email dgit-test@debian.example.net 1493s ++ git config --global user.name 'dgit test git user' 1493s ++ git config --global protocol.ext.allow always 1493s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1493s ++ env -0 1493s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1493s ++ export DEBCHANGE_VENDOR=dpkg 1493s ++ DEBCHANGE_VENDOR=dpkg 1493s ++ unset VISUAL 1493s ++ unset GIT_EDITOR 1493s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1493s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1493s ++ cat 1493s ++ schroot=build 1493s ++ : aq 1493s ++ : archive/test-dummy 1493s ++ : sid:unstable 1493s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1493s ++ git config --global dgit.default.old-dsc-distro test-dummy 1493s + . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1493s ++ : -D 1493s ++ export GDR_TEST_DEBUG 1493s ++ t-tstunt debchange 1493s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s ++ local var=PATH 1493s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s ++ eval ' 1493s case "$PATH" in 1493s "$tstunt:"*) ;; 1493s *":$tstunt:"*) ;; 1493s "") PATH="$tstunt" ;; 1493s *) PATH="$tstunt:$PATH" ;; 1493s esac 1493s export PATH 1493s ' 1493s +++ case "$PATH" in 1493s +++ PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1493s +++ export PATH 1493s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s ++ local var=PERLLIB 1493s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s ++ eval ' 1493s case "$PERLLIB" in 1493s "$tstunt:"*) ;; 1493s *":$tstunt:"*) ;; 1493s "") PERLLIB="$tstunt" ;; 1493s *) PERLLIB="$tstunt:$PERLLIB" ;; 1493s esac 1493s export PERLLIB 1493s ' 1493s +++ case "$PERLLIB" in 1493s +++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s +++ export PERLLIB 1493s ++ local f 1493s ++ for f in "$@" 1493s ++ t-tstunt--save-real debchange 1493s ++ local f=debchange 1493s ++ case "$f" in 1493s ++ local rc 1493s ++ local real 1493s ++ set +e 1493s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1493s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1493s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1493s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1493s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1493s +++ type -p debchange 1493s ++ real=/usr/bin/debchange 1493s ++ rc=0 1493s ++ set -e 1493s ++ case $rc in 1493s ++ local varname=debchange 1493s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1493s ++ eval ' 1493s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1493s export DGIT_TEST_REAL_DEBCHANGE 1493s ' 1493s +++ : /usr/bin/debchange 1493s +++ export DGIT_TEST_REAL_DEBCHANGE 1493s ++ f=./debchange 1493s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1493s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1493s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1493s + t-dependencies GDR 1493s + : 'Hopefully installed: GDR' 1493s + t-tstunt-parsechangelog 1493s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1493s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s + local var=PATH 1493s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s + eval ' 1493s case "$PATH" in 1493s "$tstunt:"*) ;; 1493s *":$tstunt:"*) ;; 1493s "") PATH="$tstunt" ;; 1493s *) PATH="$tstunt:$PATH" ;; 1493s esac 1493s export PATH 1493s ' 1493s ++ case "$PATH" in 1493s ++ export PATH 1493s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s + local var=PERLLIB 1493s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s + eval ' 1493s case "$PERLLIB" in 1493s "$tstunt:"*) ;; 1493s *":$tstunt:"*) ;; 1493s "") PERLLIB="$tstunt" ;; 1493s *) PERLLIB="$tstunt:$PERLLIB" ;; 1493s esac 1493s export PERLLIB 1493s ' 1493s ++ case "$PERLLIB" in 1493s ++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1493s ++ export PERLLIB 1493s + local f 1493s + for f in "$@" 1493s + t-tstunt--save-real dpkg-parsechangelog 1493s + local f=dpkg-parsechangelog 1493s + case "$f" in 1493s + local rc 1493s + local real 1493s + set +e 1493s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1493s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1493s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1493s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1493s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1493s ++ type -p dpkg-parsechangelog 1493s + real=/usr/bin/dpkg-parsechangelog 1493s + rc=0 1493s + set -e 1493s + case $rc in 1493s + local varname=dpkg_parsechangelog 1493s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1493s + eval ' 1493s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1493s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1493s ' 1493s ++ : /usr/bin/dpkg-parsechangelog 1493s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1493s + f=./dpkg-parsechangelog 1493s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1493s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1493s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1493s + for f in "$@" 1493s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 1493s + local f=Dpkg/Changelog/Parse.pm 1493s + case "$f" in 1493s + return 1493s + f=./Dpkg/Changelog/Parse.pm 1493s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1493s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1493s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1493s + t-gdr-gbp-import-core-with-queue 1493s + t-gdr-gbp-import-core 1493s + p=example 1493s + t-worktree 1.1 1493s + rm -rf example 1493s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1 1493s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 1493s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 1493s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 1493s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 1493s + cd example 1493s + : 'fake up some kind of upstream' 1493s + git checkout -b upstream quilt-tip 1493s Switched to a new branch 'upstream' 1493s + rm -rf debian 1493s + mkdir debian 1493s + echo junk 1493s + git add debian 1493s + git commit -m 'an upstream retcon (/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-import-nostitch)' 1493s [upstream 90709c5] an upstream retcon (/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-import-nostitch) 1493s 6 files changed, 1 insertion(+), 36 deletions(-) 1493s delete mode 100644 debian/changelog 1493s delete mode 100644 debian/compat 1493s delete mode 100644 debian/control 1493s delete mode 100644 debian/example.install 1493s mode change 100755 => 100644 debian/rules 1493s delete mode 100644 debian/source/format 1493s + git tag v1.0 1493s + : 'fake up that our quilt-tip was descended from upstream' 1493s + git checkout quilt-tip 1493s Switched to branch 'quilt-tip' 1493s + git merge --no-edit -s ours upstream 1493s Merge made by the 'ours' strategy. 1493s + : 'fake up that our quilt-tip had the patch queue in it' 1493s + git checkout patch-queue/quilt-tip 1493s Switched to branch 'patch-queue/quilt-tip' 1493s + gbp pq export 1493s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1493s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1493s + git add debian/patches 1493s + git commit -m 'patch queue update (/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-import-nostitch)' 1493s [quilt-tip ca2506f] patch queue update (/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-import-nostitch) 1493s 4 files changed, 50 insertions(+) 1493s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1493s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1493s create mode 100644 debian/patches/series 1493s create mode 100644 debian/patches/subdir/addnewups 1493s + : 'make branch names more conventional' 1493s + git branch -D master 1493s Deleted branch master (was 17d67db). 1493s + git branch -m quilt-tip master 1493s + git checkout master 1493s Already on 'master' 1493s + git tag -m synthetic debian/1.0-1 1493s + echo '# comment' 1493s + git add debian/patches/series 1493s + git commit -m 'add a comment' 1493s [master d38a74b] add a comment 1493s 1 file changed, 1 insertion(+) 1493s + t-expect-fail F:-fseries-comments t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1493s + local mpat=F:-fseries-comments 1493s + shift 1493s + set +o pipefail 1493s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1493s + LC_MESSAGES=C 1493s + LANGUAGE=C 1493s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1493s + local gdr=git-debrebase 1493s + : ' 1493s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1493s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1493s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1493s git-debrebase get_differs 90709c536af4c07cbf0d0dab621163fdee4c2fd0 d38a74b041348cd23e5df6866143f04c59d60218 = 0x34 1493s git-debrebase: snag ignored (-fupstream-has-debian): upstream (90709c536af4c07cbf0d0dab621163fdee4c2fd0) contains debian/ directory 1493s git-debrebase: snag detected (-fseries-comments): debian/patches/series contains comments, which will be discarded 1493s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1493s $VAR2 = bless( do{\(my $o = { 1493s 'out_order' => [], 1493s 'keep_duplicate' => 0, 1493s 'name' => 'debian/changelog, entry no.1', 1493s 'allow_duplicate' => 0, 1493s 'fields' => { 1493s 'Source' => 'example', 1493s 'Version' => '1.0-1', 1493s 'Distribution' => 'unstable', 1493s 'Urgency' => 'low', 1493s 'Maintainer' => 'Ian Jackson ', 1493s 'Timestamp' => '1431548802', 1493s 'Date' => 'Wed, 13 May 2015 21:26:42 +0100', 1493s 'Changes' => ' 1493s example (1.0-1) unstable; urgency=low 1493s 1493s * Test package.' 1493s }, 1493s 'allow_pgp' => 1, 1493s 'in_order' => [ 1493s 'Source', 1493s 'Version', 1493s 'Distribution', 1493s 'Urgency', 1493s 'Maintainer', 1493s 'Timestamp', 1493s 'Date', 1493s 'Changes' 1493s ], 1493s 'drop_empty' => 0, 1493s 'is_pgp_signed' => 0 1493s })}, 'Dpkg::Control::Hash' ); 1493s last finished-looking changelog entry: (1.0-1) unstable 1493s Cannot confirm dgit view: dgit view tag archive/debian/1.0-1 not found 1493s Failed to stitch in dgit view (see messages above). 1493s dgit --overwrite will be needed on the first dgit push after conversion. 1493s git-debrebase: snags: 1 overriden by individual -f options 1493s 1493s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1493s + local 'ps=255 0' 1493s + set -o pipefail 1493s + case $ps in 1493s + t-grep-mpat F:-fseries-comments /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1493s + local mpat=F:-fseries-comments 1493s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1493s + local grepper=fgrep 1493s + case "$mpat" in 1493s + case "$mpat" in 1493s + grepper=fgrep 1493s + mpat=-fseries-comments 1493s + fgrep -e -fseries-comments /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1493s git-debrebase: snag detected (-fseries-comments): debian/patches/series contains comments, which will be discarded 1493s + tee ../convert-msg 1493s + t-git-debrebase -fupstream-has-debian -funused-patches -fseries-comments convert-from-gbp 1493s + local gdr=git-debrebase 1493s + : ' 1493s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1493s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches -fseries-comments convert-from-gbp 1493s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1493s git-debrebase get_differs 90709c536af4c07cbf0d0dab621163fdee4c2fd0 d38a74b041348cd23e5df6866143f04c59d60218 = 0x34 1493s git-debrebase: snag ignored (-fupstream-has-debian): upstream (90709c536af4c07cbf0d0dab621163fdee4c2fd0) contains debian/ directory 1493s git-debrebase: snag ignored (-fseries-comments): debian/patches/series contains comments, which will be discarded 1493s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1493s $VAR2 = bless( do{\(my $o = { 1493s 'drop_empty' => 0, 1493s 'out_order' => [], 1493s 'name' => 'debian/changelog, entry no.1', 1493s 'fields' => { 1493s 'Source' => 'example', 1493s 'Version' => '1.0-1', 1493s 'Distribution' => 'unstable', 1493s 'Urgency' => 'low', 1493s 'Maintainer' => 'Ian Jackson ', 1493s 'Timestamp' => '1431548802', 1493s 'Date' => 'Wed, 13 May 2015 21:26:42 +0100', 1493s 'Changes' => ' 1493s example (1.0-1) unstable; urgency=low 1493s 1493s * Test package.' 1493s }, 1493s 'keep_duplicate' => 0, 1493s 'in_order' => [ 1493s 'Source', 1493s 'Version', 1493s 'Distribution', 1493s 'Urgency', 1493s 'Maintainer', 1493s 'Timestamp', 1493s 'Date', 1493s 'Changes' 1493s ], 1493s 'allow_duplicate' => 0, 1493s 'is_pgp_signed' => 0, 1493s 'allow_pgp' => 1 1493s })}, 'Dpkg::Control::Hash' ); 1493s last finished-looking changelog entry: (1.0-1) unstable 1493s Cannot confirm dgit view: dgit view tag archive/debian/1.0-1 not found 1493s Failed to stitch in dgit view (see messages above). 1493s dgit --overwrite will be needed on the first dgit push after conversion. 1493s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1494s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1494s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1494s gbp:info: Trying to apply patches at 'd38a74b041348cd23e5df6866143f04c59d60218' 1494s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1494s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1494s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1494s git-debrebase ffq check_specs * 1494s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1494s git-debrebase: snags: 2 overriden by individual -f options 1494s git-debrebase >= update refs/debrebase-last/heads/master 03942e66ae9df698c6c2982b7660039099a041cf 0000000000000000000000000000000000000000 1494s git-debrebase >= update HEAD 03942e66ae9df698c6c2982b7660039099a041cf d38a74b041348cd23e5df6866143f04c59d60218 1494s git-debrebase >$ 1494s HEAD is now at 03942e6 Add another new upstream file 1494s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1494s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1494s ' 1494s + grep -e 'dgit --overwrite will be needed' ../convert-msg 1494s + t-ok 1494s + : ======================================== 1494s + t-check-only-bpd 1494s + '[' .. = .. ']' 1494s + return 1494s + t-fscks 1494s + shopt -s nullglob 1494s + for d in $tmp/*/.git $tmp/git/*.git 1494s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1494s + t-git-fsck 1494s ++ git rev-parse --git-dir 1494s + local fsckerrs=.git/dgit-test-fsck.errs 1494s + set +e 1494s + LC_MESSAGES=C 1494s + git fsck --no-dangling --strict 1494s + tee .git/dgit-test-fsck.errs 1494s + ps='0 0' 1494s + set -e 1494s + local pats 1494s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1494s + test '0 0' = '0 0' 1494s + pats+=(-e 'notice: HEAD points to an unborn branch') 1494s + pats+=(-e 'notice: No default references') 1494s + set +e 1494s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1494s + rc=1 1494s + set -e 1494s + case $rc in 1494s + t-save-artifacts 1494s + artifacts=/tmp/autopkgtest.XK8uun/gdr-import-nostitch-artifacts 1494s + '[' x/tmp/autopkgtest.XK8uun/gdr-import-nostitch-artifacts = x ']' 1494s + '[' xtmp = x ']' 1494s + GZIP=-1v 1494s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-import-nostitch-artifacts/gdr-import-nostitch.tar.gz '--exclude=*.tar' . 1494s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1494s 80.1% 1494s + echo ok. 1494s ok. 1494s + rc=0 1494s + set +x 1494s + set +e 1494s + pwd 1494s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1494s + '[' x '!=' x ']' 1494s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1494s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1494s + set -e 1494s + test 0 = 0 1494s autopkgtest [23:12:04]: test gdr-import-nostitch: -----------------------] 1495s gdr-import-nostitch PASS 1495s autopkgtest [23:12:05]: test gdr-import-nostitch: - - - - - - - - - - results - - - - - - - - - - 1495s autopkgtest [23:12:05]: test gdr-makepatches7: preparing testbed 1495s Reading package lists... 1495s Building dependency tree... 1495s Reading state information... 1496s Starting pkgProblemResolver with broken count: 0 1496s Starting 2 pkgProblemResolver with broken count: 0 1496s Done 1496s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1497s autopkgtest [23:12:07]: test gdr-makepatches7: [----------------------- 1497s ++ set -o pipefail 1497s ++ . tests/lib-core 1497s ++ . tests/lib-restricts 1497s ++ trap ' 1497s rc=$? 1497s set +x 1497s test $rc = 0 || echo " 1497s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1497s 1497s Most relevant logs are just before assignment rc=$rc 1497s Will now do cleanup etc. 1497s " 1497s set -x 1497s set +e 1497s pwd 1497s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1497s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1497s set -e 1497s test $rc = 0 || t-report-failure 1497s ' EXIT 1497s ++ t-filter-out-git-hyphen-dir 1497s ++ local pathent 1497s +++ type -p git-rev-parse 1497s +++ : 1497s ++ pathent= 1497s ++ case "$pathent" in 1497s ++ return 1497s ++ t-set-intree 1497s ++ '[' x = x ']' 1497s ++ return 1497s ++ : -D 1497s ++ export DGIT_TEST_DEBUG 1497s ++ : x 1497s ++ export DGIT_TEST_DEBPUSH_DEBUG 1497s ++ : 1497s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1497s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1497s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1497s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1497s ++ export LC_CTYPE=C.UTF-8 1497s ++ LC_CTYPE=C.UTF-8 1497s ++ unset CDPATH 1497s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1497s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1497s +++ pwd 1497s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1497s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1497s ++ testname=gdr-makepatches7 1497s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1497s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1497s ++ bpd=.. 1497s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1497s ++ '[' x '!=' x ']' 1497s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s +++ pwd 1497s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ t-set-using-tmp 1497s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1497s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1497s ++ export 'DEBFULLNAME=dgit test git user' 1497s ++ DEBFULLNAME='dgit test git user' 1497s ++ git config --global user.email dgit-test@debian.example.net 1497s ++ git config --global user.name 'dgit test git user' 1497s ++ git config --global protocol.ext.allow always 1497s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1497s ++ env -0 1497s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1497s ++ export DEBCHANGE_VENDOR=dpkg 1497s ++ DEBCHANGE_VENDOR=dpkg 1497s ++ unset VISUAL 1497s ++ unset GIT_EDITOR 1497s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1497s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1497s ++ cat 1497s ++ schroot=build 1497s ++ : aq 1497s ++ : archive/test-dummy 1497s ++ : sid:unstable 1497s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1497s ++ git config --global dgit.default.old-dsc-distro test-dummy 1497s ++ for import in ${autoimport-gnupg} 1497s ++ case "$0" in 1497s ++ t-setup-import gnupg 1497s ++ local setupname=gnupg 1497s ++ local setupsrc 1497s ++ local lock 1497s ++ '[' x = x ']' 1497s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1497s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1497s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1497s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1497s cd "$1"; shift 1497s setupname="$1"; shift 1497s simport="$1"; shift 1497s if [ -e "$simport" ]; then exit 0; fi 1497s env - "$@" \ 1497s "tests/setup/$setupname" 1497s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1497s + cd /tmp/autopkgtest.XK8uun/build.980/src 1497s + shift 1497s + setupname=gnupg 1497s + shift 1497s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1497s + shift 1497s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1497s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-makepatches7-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-makepatches7-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-makepatches7-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-makepatches7 -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-makepatches7' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-makepatches7-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1497s ++ set -o pipefail 1497s ++ . tests/lib-core 1497s ++ . tests/lib-restricts 1497s ++ trap ' 1497s rc=$? 1497s set +x 1497s test $rc = 0 || echo " 1497s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1497s 1497s Most relevant logs are just before assignment rc=$rc 1497s Will now do cleanup etc. 1497s " 1497s set -x 1497s set +e 1497s pwd 1497s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1497s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1497s set -e 1497s test $rc = 0 || t-report-failure 1497s ' EXIT 1497s ++ t-filter-out-git-hyphen-dir 1497s ++ local pathent 1497s +++ type -p git-rev-parse 1497s +++ : 1497s ++ pathent= 1497s ++ case "$pathent" in 1497s ++ return 1497s ++ t-set-intree 1497s ++ '[' x = x ']' 1497s ++ return 1497s ++ : -D 1497s ++ export DGIT_TEST_DEBUG 1497s ++ : x 1497s ++ export DGIT_TEST_DEBPUSH_DEBUG 1497s ++ : 1497s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1497s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1497s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1497s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1497s ++ export LC_CTYPE=C.UTF-8 1497s ++ LC_CTYPE=C.UTF-8 1497s ++ unset CDPATH 1497s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1497s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1497s +++ pwd 1497s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1497s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1497s ++ testname=gnupg 1497s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1497s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1497s ++ bpd=.. 1497s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1497s ++ '[' x '!=' x ']' 1497s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s +++ pwd 1497s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ t-set-using-tmp 1497s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1497s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1497s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1497s ++ export 'DEBFULLNAME=dgit test git user' 1497s ++ DEBFULLNAME='dgit test git user' 1497s ++ git config --global user.email dgit-test@debian.example.net 1497s ++ git config --global user.name 'dgit test git user' 1497s ++ git config --global protocol.ext.allow always 1497s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1497s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1497s ++ export DEBCHANGE_VENDOR=dpkg 1497s ++ DEBCHANGE_VENDOR=dpkg 1497s ++ unset VISUAL 1497s ++ unset GIT_EDITOR 1497s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1497s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1497s ++ cat 1497s ++ schroot=build 1497s ++ : aq 1497s ++ : archive/test-dummy 1497s ++ : sid:unstable 1497s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1497s ++ git config --global dgit.default.old-dsc-distro test-dummy 1497s ++ for import in ${autoimport-gnupg} 1497s ++ case "$0" in 1497s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1497s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1497s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1497s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1497s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1497s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1497s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1497s + setup=' 1497s export GNUPGHOME=$tmp/gnupg 1497s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1497s 1497s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1497s ssb rsa2048 2013-11-17 [E] 1497s 1497s sec rsa2048 2014-01-26 [SC] 1497s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1497s uid [ultimate] Populus Romanus (test key) 1497s ssb rsa2048 2014-01-26 [E] 1497s 1497s sec rsa2048 2014-01-26 [SC] 1497s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1497s uid [ unknown] Hannibal (test key) 1497s ssb rsa2048 2014-01-26 [E] 1497s 1497s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1497s export GNUPGHOME=$tmp/gnupg 1497s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1497s 1497s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 1498s delete mode 100644 debian/source/format 1498s + git tag v1.0 1498s + : 'fake up that our quilt-tip was descended from upstream' 1498s + git checkout quilt-tip 1498s Switched to branch 'quilt-tip' 1498s + git merge --no-edit -s ours upstream 1498s Merge made by the 'ours' strategy. 1498s + : 'fake up that our quilt-tip had the patch queue in it' 1498s + git checkout patch-queue/quilt-tip 1498s Switched to branch 'patch-queue/quilt-tip' 1498s + gbp pq export 1498s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1498s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1498s + git add debian/patches 1498s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 1498s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 1498s 4 files changed, 50 insertions(+) 1498s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1498s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1498s create mode 100644 debian/patches/series 1498s create mode 100644 debian/patches/subdir/addnewups 1498s + : 'make branch names more conventional' 1498s + git branch -D master 1498s Deleted branch master (was 17d67db). 1498s + git branch -m quilt-tip master 1498s + not-gdr-processable origin 1498s + git branch gdr-unprocessable/origin 1498s + t-git-debrebase analyse 1498s + local gdr=git-debrebase 1498s + : ' 1498s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1498s + grep 'Unknown Unprocessable' 1498s + git-debrebase --dgit=dgit -D analyse 1498s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 1498s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1498s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1498s git-debrebase = AddPatches {"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Type" => "AddPatches","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","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}]} 1498s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1498s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1498s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1498s git-debrebase = Pseudomerge {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},{"Differs" => 48,"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"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]],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Type" => "Pseudomerge","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"} 1498s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1498s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1498s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add *.o to .gitignore\n","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}]} 1498s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1498s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1498s git-debrebase = Mixed {"Type" => "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","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Parents" => [{"Differs" => 50,"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}]} 1498s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1498s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1498s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "echo EXAMPLE RULES TARGET\n","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"} 1498s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1498s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1498s git-debrebase = Packaging {"Msg" => "WIP\n","Type" => "Packaging","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32,"Ix" => 0}]} 1498s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1498s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1498s git-debrebase = Packaging {"Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Type" => "Packaging","Msg" => "WIP\n"} 1498s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1498s git-debrebase ** Unknown 1498s git-debrebase *** WALK BOMB unrecognised 1498s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1498s ' 1498s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1498s + : 'fake up an upstream 2.0' 1498s + git branch make-upstream upstream 1498s + t-make-new-upstream-tarball 2.0 1498s + local uv=2.0 1498s + git checkout make-upstream 1498s Switched to branch 'make-upstream' 1498s + echo 'upstream 2.0' 1498s + git commit -a -m 'upstream 2.0 tarball' 1498s [make-upstream 4db56a8] upstream 2.0 tarball 1498s 1 file changed, 1 insertion(+) 1498s + t-make-orig example 2.0 make-upstream 1498s + local p=example 1498s + local v=2.0 1498s + local tag=make-upstream 1498s + ust=example_2.0.orig.tar.gz 1498s + GZIP=-1 1498s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1498s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1498s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1498s + git branch -D quilt-tip-2 1498s Deleted branch quilt-tip-2 (was 99fcab4). 1498s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1498s + git branch -D gitish-only 1498s Deleted branch gitish-only (was 2b2ddc8). 1498s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1498s + git branch -D quilt-tip-1.1 1498s Deleted branch quilt-tip-1.1 (was 7fc34be). 1498s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1498s + git branch -D patch-queue/quilt-tip 1498s Deleted branch patch-queue/quilt-tip (was d843a68). 1498s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1498s + git branch -D indep-arch 1498s Deleted branch indep-arch (was e215729). 1498s + : 'see what gbp import-orig does' 1498s + git checkout master 1498s Switched to branch 'master' 1498s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1498s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1498s gbp:info: Source package is example 1498s gbp:info: Upstream version is 2.0 1498s gbp:info: Replacing upstream source on 'master' 1498s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1498s + not-gdr-processable merge 1498s + git branch gdr-unprocessable/merge 1498s + t-git-debrebase analyse 1498s + local gdr=git-debrebase 1498s + grep 'Unknown Unprocessable' 1498s + : ' 1498s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1498s + git-debrebase --dgit=dgit -D analyse 1498s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 1498s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1498s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1498s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1498s git-debrebase ** Unknown 1498s git-debrebase *** WALK BOMB unrecognised 1498s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1498s ' 1498s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 1498s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1498s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1498s + DEBEMAIL=dgit-tests@example.org 1498s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1498s + 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) 1498s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1498s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1498s 1 file changed, 6 insertions(+) 1498s + t-dch-commit-r 1498s + t-dch-r-rune t-dch-commit 1498s + local cmd=t-dch-commit 1498s + shift 1498s + local suite=unstable 1498s + t-dch-commit -r -D unstable '' 1498s + t-debchange -r -D unstable '' 1498s + DEBEMAIL=dgit-tests@example.org 1498s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1498s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1498s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1498s libdistro-info-perl is not installed, Debian release names are not known. 1498s libdistro-info-perl is not installed, Ubuntu release names are not known. 1498s + git commit -m 'dch -r -D unstable ' debian/changelog 1498s [master f31021f] dch -r -D unstable 1498s 1 file changed, 3 insertions(+), 2 deletions(-) 1498s + echo garbage 1498s + git add debian/patches/garbage 1498s + git commit -m 'add garbage' debian/patches/garbage 1498s [master eb10718] add garbage 1498s 1 file changed, 1 insertion(+) 1498s create mode 100644 debian/patches/garbage 1498s + t-archive-none example 1498s + t-select-package example 1498s + p=example 1498s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1498s + t-archive-none-aq 1498s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 1498s + : 1498s + local 'jsondelim=[' 1498s + local suitespec 1498s + for suitespec in $suitespecs 1498s + local suite=sid 1498s + local sname=unstable 1498s + t-aq-archive-updated sid example 1498s + local suite=sid 1498s + local p=example 1498s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1498s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1498s + perl -wne ' 1498s use JSON; 1498s use strict; 1498s our @v; 1498s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1498s push @v, { 1498s "version" => "$1", 1498s "sha256sum" => "$2", 1498s "component" => "$3", 1498s "filename" => "$4", 1498s }; 1498s END { 1498s my $json = JSON->new->canonical(); 1498s print $json->encode(\@v) or die $!; 1498s } 1498s ' 1498s + t-aq-archive-updated new example 1498s + local suite=new 1498s + local p=example 1498s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1498s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1498s + perl -wne ' 1498s use JSON; 1498s use strict; 1498s our @v; 1498s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1498s push @v, { 1498s "version" => "$1", 1498s "sha256sum" => "$2", 1498s "component" => "$3", 1498s "filename" => "$4", 1498s }; 1498s END { 1498s my $json = JSON->new->canonical(); 1498s print $json->encode(\@v) or die $!; 1498s } 1498s ' 1498s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1498s + cat 1498s + jsondelim=' },' 1498s + cat 1498s + t-git-none 1498s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1498s + set -e 1498s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1498s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1498s + t-dgit -wgf --gbp push-source --new 1498s + local dgit=dgit 1498s + pwd 1498s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1498s + : ' 1498s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1498s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 1499s | git rev-parse --show-toplevel 1499s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1499s | git config -z --get-regexp --local '.*' 1499s | git config -z --get-regexp --local '.*' 1499s | git config -z --get-regexp --global '.*' 1499s | git config -z --get-regexp --system '.*' 1499s format 3.0 (quilt), quilt mode gbp 1499s Format `3.0 (quilt)', need to check/update patch stack 1499s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1499s => `' 1499s + git diff --quiet HEAD 1499s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1499s canonical suite name for unstable is sid 1499s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1499s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1499s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1499s | git rev-parse 'HEAD~0' 1499s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1499s | git symbolic-ref -q HEAD 1499s => `refs/heads/master' 1499s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1499s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1499s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1499s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1499s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1499s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 66997671f5de7e66c7de996e72100bfedd8192c13a5cac7a2fc93ff587cddc1e 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1499s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1499s >(no reflog) 1499s splitbrain cache miss 1499s CD work 1499s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1499s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1499s + git checkout -q -b dgit-view 1499s examining quilt state (multiple patches, gbp mode) 1499s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1499s CD fake 1499s | find -name .git -prune -print0 1499s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1499s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 1499s + git add -Af . 1499s | git write-tree 1499s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 1499s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1499s CD .. 1499s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1499s CD ../fake 1499s + git add -Af . 1499s | git write-tree 1499s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1499s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1499s CD ../work 1499s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 1499s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 1499s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 1499s => `' 1499s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 1499s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 1499s => `lib.c\x00new-upstream-file\x00src.c\x00' 1499s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1499s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 1499s => `lib.c\x00new-upstream-file\x00src.c\x00' 1499s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1499s differences @dl == ## ## == == ==. 1499s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 1499s dgit: quilt differences: src: == orig ## gitignores: == orig == 1499s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1499s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1499s => `1530000000 +0000' 1499s dgit view: creating patches-applied version using gbp pq 1499s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 1499s + git update-ref refs/heads/dgit-view HEAD 1499s + git checkout -q dgit-view 1499s | git rev-parse 'HEAD~0' 1499s => `45ea71a69fa522ce760afdab8a420200443753e9' 1499s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1499s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 1499s => `' 1499s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 66997671f5de7e66c7de996e72100bfedd8192c13a5cac7a2fc93ff587cddc1e 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 1499s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 1499s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1499s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1499s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1499s | git rev-parse 'HEAD~0' 1499s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1499s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1499s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1499s dpkg-source: info: using source format '3.0 (quilt)' 1499s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1499s dpkg-source: info: using patch list from debian/patches/series 1499s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 1499s dpkg-source: info: building example in example_2.0-1.dsc 1499s CD work 1499s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1499s package seems new, not specifying -v 1499s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 1500s dpkg-genchanges: info: not including original source code in upload 1500s CD .. 1500s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1500s renaming (Files) example_2.0.orig.tar.gz 1500s renaming (Files) example_2.0-1.debian.tar.xz 1500s renaming (dsc) example_2.0-1.dsc 1500s renaming (changes) example_2.0-1_source.changes 1500s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1500s actually entering push 1500s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1500s => `0' 1500s + git config remote.dgit.skipdefaultupdate true 1500s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1500s get_archive_dsc: nothing in archive, returning undef 1500s no version available from the archive 1500s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1500s => `' 1500s previous reference hash= 1500s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1500s => `' 1500s fetch_from_archive: lastfetch= 1500s nothing found! 1500s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1500s + git check-ref-format archive/test-dummy/2.0-1 1500s | git symbolic-ref -q HEAD 1500s => `refs/heads/master' 1500s | git rev-parse 'HEAD~0' 1500s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1500s ffq_prev_branchinfo branch current refs/heads/master 1500s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1500s => `' 1500s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1500s => `' 1500s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1500s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1500s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1500s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1500s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1500s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 66997671f5de7e66c7de996e72100bfedd8192c13a5cac7a2fc93ff587cddc1e 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1500s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1500s CD work 1500s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1500s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1500s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1500s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 1500s splitbrain_pseudomerge... 1500s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1500s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1500s => `' 1500s + git diff --quiet HEAD 1500s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 1500s => `' 1500s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1500s checking that example_2.0-1.dsc corresponds to HEAD 1500s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc 1500s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc) 1500s dpkg-source: info: extracting example in example-2.0 1500s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1500s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 1500s dpkg-source: info: using patch list from debian/patches/series 1500s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1500s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1500s dpkg-source: info: applying subdir/addnewups 1500s CD example-2.0 1500s | find -name .git -prune -print0 1500s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1500s + git add -Af . 1500s | git write-tree 1500s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1500s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1500s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1500s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1500s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1500s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 1500s files_compare_inputs example_2.0-1.dsc 1500s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 1500s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1500s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 1500s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 1500s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1500s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 1500s files_compare_inputs example_2.0-1.dsc Files 1500s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 1500s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 1500s files_compare_inputs example_2.0-1_source.changes 1500s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 1500s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 1500s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 1500s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 1500s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 1500s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 1500s files_compare_inputs example_2.0-1_source.changes Files 1500s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 1500s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 1500s checking origs needed (2.0)... 1500s checking origs needed placement 'devel extra'... 1500s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1500s origs example_2.0.orig.tar.gz is_orig 1500s -| sh -ec 'cd "$1"; shift 1500s 1500s find -name "$1" -print0 | 1500s xargs -0r sha256sum 1500s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1500s origs example_2.0.orig.tar.gz $#$have=-1 1500s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1500s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 1500s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1500s push_tagwants: $VAR1 = [ 1500s '2.0-1', 1500s '45ea71a69fa522ce760afdab8a420200443753e9', 1500s 'eb10718ab213ccfa83613ebbddefbffda941a548', 1500s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1500s ]; 1500s $VAR2 = [ 1500s { 1500s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1500s 'TfSuffix' => '', 1500s 'Tag' => 'archive/test-dummy/2.0-1', 1500s 'Tfn' => sub { "DUMMY" }, 1500s 'TagFn' => sub { "DUMMY" }, 1500s 'View' => 'dgit' 1500s }, 1500s { 1500s 'Tfn' => sub { "DUMMY" }, 1500s 'Tag' => 'test-dummy/2.0-1', 1500s 'View' => 'maint', 1500s 'TagFn' => sub { "DUMMY" }, 1500s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 1500s 'TfSuffix' => '-maintview' 1500s } 1500s ]; 1500s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1500s => `1530000000 +0000' 1500s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1500s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1500s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1500s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 1500s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1500s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 1500s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1500s => `5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb' 1500s + git verify-tag 5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb 1500s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1500s gpg: Signature made Mon Mar 31 23:12:10 2025 UTC 1500s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1500s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1500s gpg: WARNING: This key is not certified with a trusted signature! 1500s gpg: There is no indication that the signature belongs to the owner. 1500s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1500s + git update-ref refs/tags/archive/test-dummy/2.0-1 5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb 1500s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 1500s => `b5a3785c98b19a2ad2fca6181012e6996a0cf322' 1500s + git verify-tag b5a3785c98b19a2ad2fca6181012e6996a0cf322 1500s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1500s gpg: Signature made Mon Mar 31 23:12:10 2025 UTC 1500s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1500s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1500s gpg: WARNING: This key is not certified with a trusted signature! 1500s gpg: There is no indication that the signature belongs to the owner. 1500s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1500s + git update-ref refs/tags/test-dummy/2.0-1 b5a3785c98b19a2ad2fca6181012e6996a0cf322 1500s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1500s => `0' 1500s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 1500s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 1500s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1500s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 1500s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 1500s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 1500s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 1500s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 1500s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1500s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1500s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1500s 1500s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 1500s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1500s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1501s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1501s 1501s Successfully signed dsc, changes files 1501s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 1501s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1501s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1501s D: Setting host argument. 1501s Checking signature on .changes 1501s Checking signature on .dsc 1501s Uploading to test-dummy (via local to localhost): 1501s Successfully uploaded packages. 1501s dgit ok: pushed and uploaded 2.0-1 1501s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1501s del_lrfetchrefs... 1501s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1501s ' 1501s + t-salsa-add-remote 1501s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1501s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1501s + set -e 1501s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1501s + git init --bare 1501s hint: Using 'master' as the name for the initial branch. This default branch name 1501s hint: is subject to change. To configure the initial branch name to use in all 1501s hint: of your new repositories, which will suppress this warning, call: 1501s hint: 1501s hint: git config --global init.defaultBranch 1501s hint: 1501s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1501s hint: 'development'. The just-created branch can be renamed via this command: 1501s hint: 1501s hint: git branch -m 1501s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example/ 1501s + git remote add origin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1501s + git push --set-upstream origin master 1501s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1501s * [new branch] master -> master 1501s Branch 'master' set up to track remote branch 'master' from 'origin'. 1501s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1501s + local 'mpat=E:identical in upstream files' 1501s + shift 1501s + set +o pipefail 1501s + LC_MESSAGES=C 1501s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1501s + LANGUAGE=C 1501s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1501s + local gdr=git-debrebase 1501s + : ' 1501s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1501s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1501s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1501s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 1501s docs/README | 1 + 1501s 1 file changed, 1 insertion(+) 1501s 1501s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1501s git-debrebase: identical in upstream files. See diffstat above, or run 1501s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 1501s + local 'ps=255 0' 1501s + set -o pipefail 1501s + case $ps in 1501s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1501s + local 'mpat=E:identical in upstream files' 1501s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1501s + local grepper=fgrep 1501s + case "$mpat" in 1501s + case "$mpat" in 1501s + grepper=egrep 1501s + mpat='identical in upstream files' 1501s + egrep -e 'identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1501s git-debrebase: identical in upstream files. See diffstat above, or run 1501s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1501s + local 'mpat=E:Unused patch file garbage will be discarded' 1501s + shift 1501s + set +o pipefail 1501s + LC_MESSAGES=C 1501s + LANGUAGE=C 1501s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1501s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1501s + local gdr=git-debrebase 1501s + : ' 1501s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1501s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1501s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1501s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1501s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1501s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1501s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1501s $VAR2 = bless( do{\(my $o = { 1501s 'is_pgp_signed' => 0, 1501s 'drop_empty' => 0, 1501s 'fields' => { 1501s 'Source' => 'example', 1501s 'Version' => '2.0-1', 1501s 'Distribution' => 'unstable', 1501s 'Urgency' => 'medium', 1501s 'Maintainer' => 'dgit test git user ', 1501s 'Timestamp' => '1530000000', 1501s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1501s 'Changes' => ' 1501s example (2.0-1) unstable; urgency=medium 1501s 1501s [ Ian Jackson ] 1501s * new upstream (did gbp import-orig)' 1501s }, 1501s 'allow_pgp' => 1, 1501s 'out_order' => [], 1501s 'in_order' => [ 1501s 'Source', 1501s 'Version', 1501s 'Distribution', 1501s 'Urgency', 1501s 'Maintainer', 1501s 'Timestamp', 1501s 'Date', 1501s 'Changes' 1501s ], 1501s 'keep_duplicate' => 0, 1501s 'allow_duplicate' => 0, 1501s 'name' => 'debian/changelog, entry no.1' 1501s })}, 'Dpkg::Control::Hash' ); 1501s last finished-looking changelog entry: (2.0-1) unstable 1501s will stitch in dgit view, archive/test-dummy/2.0-1 1501s git-debrebase: snags: 1 overriden by individual -f options 1501s 1501s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1501s + local 'ps=255 0' 1501s + set -o pipefail 1501s + case $ps in 1501s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1501s + local 'mpat=E:Unused patch file garbage will be discarded' 1501s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1501s + local grepper=fgrep 1501s + case "$mpat" in 1501s + case "$mpat" in 1501s + grepper=egrep 1501s + mpat='Unused patch file garbage will be discarded' 1501s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1501s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1501s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1501s + local gdr=git-debrebase 1501s + : ' 1501s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1501s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1501s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1501s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1501s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1501s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1501s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1501s $VAR2 = bless( do{\(my $o = { 1501s 'drop_empty' => 0, 1501s 'is_pgp_signed' => 0, 1501s 'out_order' => [], 1501s 'allow_pgp' => 1, 1501s 'keep_duplicate' => 0, 1501s 'allow_duplicate' => 0, 1501s 'fields' => { 1501s 'Source' => 'example', 1501s 'Version' => '2.0-1', 1501s 'Distribution' => 'unstable', 1501s 'Urgency' => 'medium', 1501s 'Maintainer' => 'dgit test git user ', 1501s 'Timestamp' => '1530000000', 1501s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1501s 'Changes' => ' 1501s example (2.0-1) unstable; urgency=medium 1501s 1501s [ Ian Jackson ] 1501s * new upstream (did gbp import-orig)' 1501s }, 1501s 'name' => 'debian/changelog, entry no.1', 1501s 'in_order' => [ 1501s 'Source', 1501s 'Version', 1501s 'Distribution', 1501s 'Urgency', 1501s 'Maintainer', 1501s 'Timestamp', 1501s 'Date', 1501s 'Changes' 1501s ] 1501s })}, 'Dpkg::Control::Hash' ); 1501s last finished-looking changelog entry: (2.0-1) unstable 1501s will stitch in dgit view, archive/test-dummy/2.0-1 1501s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1501s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1501s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1502s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 1502s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1502s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1502s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1502s git-debrebase ffq check_specs * 1502s git-debrebase ffq merge master 1502s git-debrebase ffq check_remote origin remote fetch/merge branch 1502s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1502s OK, you are ahead of refs/remotes/origin/master 1502s git-debrebase ffq check_remote undef remote push branch 1502s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1502s OK, you are ahead of refs/remotes/dgit/dgit/sid 1502s git-debrebase: snags: 2 overriden by individual -f options 1502s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 1502s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 1502s git-debrebase >$ 1502s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 1502s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1502s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1502s ' 1502s + git branch converted-from-gbp 1502s + v=2.0-2 1502s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1502s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1502s + DEBEMAIL=dgit-tests@example.org 1502s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1502s + 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 1502s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1502s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1502s 1 file changed, 6 insertions(+) 1502s + t-dch-commit-r 1502s + t-dch-r-rune t-dch-commit 1502s + local cmd=t-dch-commit 1502s + shift 1502s + local suite=unstable 1502s + t-dch-commit -r -D unstable '' 1502s + t-debchange -r -D unstable '' 1502s + DEBEMAIL=dgit-tests@example.org 1502s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1502s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1502s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1502s libdistro-info-perl is not installed, Debian release names are not known. 1502s libdistro-info-perl is not installed, Ubuntu release names are not known. 1502s + git commit -m 'dch -r -D unstable ' debian/changelog 1502s [master 4af0243] dch -r -D unstable 1502s 1 file changed, 1 insertion(+), 1 deletion(-) 1502s + t-dgit -wgf push-source --new 1502s + local dgit=dgit 1502s + pwd 1502s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1502s + : ' 1502s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1502s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 1502s | git rev-parse --show-toplevel 1502s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1502s | git config -z --get-regexp --local '.*' 1502s | git config -z --get-regexp --local '.*' 1502s | git config -z --get-regexp --global '.*' 1502s | git config -z --get-regexp --system '.*' 1502s format 3.0 (quilt), quilt mode linear 1502s Format `3.0 (quilt)', need to check/update patch stack 1502s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1502s => `' 1502s + git diff --quiet HEAD 1502s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1502s canonical suite name for unstable is sid 1502s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1502s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1502s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1502s | git rev-parse 'HEAD~0' 1502s => `4af0243f9227b0d695fbff38df345aca23969e2e' 1502s | git symbolic-ref -q HEAD 1502s => `refs/heads/master' 1502s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1502s CD work 1502s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1502s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1502s examining quilt state (multiple patches, linear mode) 1502s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 1502s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 1502s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1502s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1503s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 1503s | git rev-parse 'HEAD~0' 1503s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1503s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1503s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1503s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1503s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1503s CD fake 1503s | find -name .git -prune -print0 1503s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1503s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 1503s + git add -Af . 1503s | git write-tree 1503s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 1503s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1503s CD .. 1503s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1503s CD ../fake 1503s + git add -Af . 1503s | git write-tree 1503s => `607612c46d7ea5b66697b830f1a50f069061d460' 1503s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1503s CD ../work 1503s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1503s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1503s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1503s => `: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' 1503s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 1503s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1503s => `' 1503s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1503s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 1503s => `lib.c\x00new-upstream-file\x00src.c\x00' 1503s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 1503s differences @dl ## ## == == == ==. 1503s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 1503s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1503s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1503s starting quiltify (multiple patches, linear mode) 1503s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 1503s => `debian/control'... 1503s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1503s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1503s => `' 1503s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1503s search finished hooray! 1503s quiltify linearisation planning successful, executing... 1503s + git checkout -q master 1503s | git status --ignored --porcelain 1503s => `?? .pc/' 1503s nothing quilty to commit, ok. 1503s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1503s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1503s | git rev-parse 'HEAD~0' 1503s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1503s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1503s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1503s CD work 1503s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1503s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1503s CD .. 1503s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1503s dpkg-source: info: using source format '3.0 (quilt)' 1503s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1503s dpkg-source: info: using patch list from debian/patches/series 1503s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 1503s dpkg-source: info: building example in example_2.0-2.dsc 1503s CD work 1503s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1503s package seems new, not specifying -v 1503s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 1503s dpkg-genchanges: info: not including original source code in upload 1503s CD .. 1503s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1503s renaming (Files) example_2.0.orig.tar.gz 1503s renaming (Files) example_2.0-2.debian.tar.xz 1503s renaming (dsc) example_2.0-2.dsc 1503s renaming (changes) example_2.0-2_source.changes 1503s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1503s actually entering push 1503s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1503s => `1' 1503s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1503s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1503s git_lrfetch_sane iteration 0 1503s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1503s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 1503s => 5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb refs/tags/archive/test-dummy/2.0-1 1503s => b5a3785c98b19a2ad2fca6181012e6996a0cf322 refs/tags/test-dummy/2.0-1 1503s 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 1503s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1503s | git for-each-ref refs/dgit-fetch/test-dummy 1503s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 1503s |> 5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1503s |> b5a3785c98b19a2ad2fca6181012e6996a0cf322 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1503s git_lrfetch_sane: tidying any old suite lrfetchrefs 1503s | git for-each-ref refs/dgit-fetch/sid 1503s git_lrfetch_sane: git fetch --no-insane emulation complete 1503s $VAR1 = { 1503s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb', 1503s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1503s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'b5a3785c98b19a2ad2fca6181012e6996a0cf322' 1503s }; 1503s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1503s |> 5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb tag refs/tags/archive/test-dummy/2.0-1 1503s currently refs/tags/archive/test-dummy/2.0-1=5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb 1503s |> b5a3785c98b19a2ad2fca6181012e6996a0cf322 tag refs/tags/test-dummy/2.0-1 1503s currently refs/tags/test-dummy/2.0-1=b5a3785c98b19a2ad2fca6181012e6996a0cf322 1503s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1503s |> 5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1503s offered refs/tags/archive/test-dummy/2.0-1=5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb 1503s |> b5a3785c98b19a2ad2fca6181012e6996a0cf322 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1503s offered refs/tags/test-dummy/2.0-1=b5a3785c98b19a2ad2fca6181012e6996a0cf322 1503s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1503s get_archive_dsc: nothing in archive, returning undef 1503s no version available from the archive 1503s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1503s => `45ea71a69fa522ce760afdab8a420200443753e9' 1503s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 1504s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 1504s 1504s Package not found in the archive, but has allegedly been pushed using dgit. 1504s Perhaps the upload is stuck in incoming. Using the version from git. 1504s 1504s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s fetch mergeinfos: 1504s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 1504s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 1504s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 1504s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 1504s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 1504s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 1504s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1504s + git check-ref-format archive/test-dummy/2.0-2 1504s | git symbolic-ref -q HEAD 1504s => `refs/heads/master' 1504s | git rev-parse 'HEAD~0' 1504s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1504s ffq_prev_branchinfo branch current refs/heads/master 1504s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1504s => `' 1504s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1504s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1504s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1504s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1504s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1504s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1504s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1504s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1504s | git status --ignored --porcelain 1504s => `' 1504s nothing quilty to commit, ok. 1504s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1504s => `' 1504s + git diff --quiet HEAD 1504s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1504s => `45ea71a69fa522ce760afdab8a420200443753e9' 1504s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 1504s => `' 1504s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1504s checking that example_2.0-2.dsc corresponds to HEAD 1504s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc 1504s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc) 1504s dpkg-source: info: extracting example in example-2.0 1504s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1504s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 1504s dpkg-source: info: using patch list from debian/patches/series 1504s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1504s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1504s dpkg-source: info: applying subdir/addnewups 1504s CD example-2.0 1504s | find -name .git -prune -print0 1504s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1504s + git add -Af . 1504s | git write-tree 1504s => `607612c46d7ea5b66697b830f1a50f069061d460' 1504s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1504s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1504s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1504s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1504s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1504s files_compare_inputs example_2.0-2.dsc 1504s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 1504s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1504s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 1504s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 1504s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1504s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 1504s files_compare_inputs example_2.0-2.dsc Files 1504s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 1504s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 1504s files_compare_inputs example_2.0-2_source.changes 1504s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 1504s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 1504s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 1504s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 1504s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 1504s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 1504s files_compare_inputs example_2.0-2_source.changes Files 1504s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 1504s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 1504s checking origs needed (2.0)... 1504s checking origs needed placement 'devel extra'... 1504s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1504s origs example_2.0.orig.tar.gz is_orig 1504s -| sh -ec 'cd "$1"; shift 1504s 1504s find -name "$1" -print0 | 1504s xargs -0r sha256sum 1504s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1504s origs example_2.0.orig.tar.gz $#$have=-1 1504s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1504s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 1504s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1504s push_tagwants: $VAR1 = [ 1504s '2.0-2', 1504s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1504s undef, 1504s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1504s ]; 1504s $VAR2 = [ 1504s { 1504s 'Tag' => 'archive/test-dummy/2.0-2', 1504s 'View' => 'dgit', 1504s 'TfSuffix' => '', 1504s 'Tfn' => sub { "DUMMY" }, 1504s 'TagFn' => sub { "DUMMY" }, 1504s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1504s }, 1504s { 1504s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1504s 'TagFn' => sub { "DUMMY" }, 1504s 'Tfn' => sub { "DUMMY" }, 1504s 'TfSuffix' => '-dgit', 1504s 'Tag' => 'test-dummy/2.0-2', 1504s 'View' => 'dgit' 1504s } 1504s ]; 1504s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1504s => `1530000000 +0000' 1504s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1504s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1504s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1504s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1504s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1504s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1504s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1504s => `4fca85bbb2cc8d3f97ccaaa36a5be89ef2d1d830' 1504s + git verify-tag 4fca85bbb2cc8d3f97ccaaa36a5be89ef2d1d830 1504s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1504s gpg: Signature made Mon Mar 31 23:12:14 2025 UTC 1504s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1504s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1504s gpg: WARNING: This key is not certified with a trusted signature! 1504s gpg: There is no indication that the signature belongs to the owner. 1504s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1504s + git update-ref refs/tags/archive/test-dummy/2.0-2 4fca85bbb2cc8d3f97ccaaa36a5be89ef2d1d830 1504s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1504s => `c4fd5fc8ecd2d60fbbedf454a55a00e58aaa8a25' 1504s + git verify-tag c4fd5fc8ecd2d60fbbedf454a55a00e58aaa8a25 1504s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1504s gpg: Signature made Mon Mar 31 23:12:14 2025 UTC 1504s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1504s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1504s gpg: WARNING: This key is not certified with a trusted signature! 1504s gpg: There is no indication that the signature belongs to the owner. 1504s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1504s + git update-ref refs/tags/test-dummy/2.0-2 c4fd5fc8ecd2d60fbbedf454a55a00e58aaa8a25 1504s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1504s => `1' 1504s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 1504s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1504s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 1504s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 1504s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 1504s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1504s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 1504s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1504s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1504s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1504s 1504s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 1504s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1505s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1505s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1505s 1505s Successfully signed dsc, changes files 1505s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 1505s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1505s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1505s D: Setting host argument. 1505s Checking signature on .changes 1505s Checking signature on .dsc 1505s Package includes an .orig.tar.gz file although the debian revision suggests 1505s that it might not be required. Multiple uploads of the .orig.tar.gz may be 1505s rejected by the upload queue management software. 1505s Uploading to test-dummy (via local to localhost): 1505s Successfully uploaded packages. 1505s dgit ok: pushed and uploaded 2.0-2 1505s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1505s del_lrfetchrefs... 1505s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 1505s del_lrfetchrefs: 5fc1d5f620a7cf18fed9477cab8e4cfe624ab7bb refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1505s del_lrfetchrefs: b5a3785c98b19a2ad2fca6181012e6996a0cf322 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1505s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1505s ' 1505s + git push 1505s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1505s eb10718..6b22dd5 master -> master 1505s + cd .. 1505s + t-archive-process-incoming sid 1505s + local suite=sid 1505s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1505s + t-archive-query sid 1505s + local suite=sid 1505s + local dscf=main/example_2.0-2.dsc 1505s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 1505s + local suite=sid 1505s + local p=example 1505s + local v=2.0-2 1505s + local dscf=main/example_2.0-2.dsc 1505s + local sha 1505s ++ sha256sum 1505s + sha='1b60738f3cb116e8be76ce08cf18a1e13c80135c062abcd5b755f147bee67a01 -' 1505s + echo '2.0-2 1b60738f3cb116e8be76ce08cf18a1e13c80135c062abcd5b755f147bee67a01 main/example_2.0-2.dsc' 1505s + t-aq-archive-updated sid example 1505s + local suite=sid 1505s + local p=example 1505s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1505s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1505s + perl -wne ' 1505s use JSON; 1505s use strict; 1505s our @v; 1505s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1505s push @v, { 1505s "version" => "$1", 1505s "sha256sum" => "$2", 1505s "component" => "$3", 1505s "filename" => "$4", 1505s }; 1505s END { 1505s my $json = JSON->new->canonical(); 1505s print $json->encode(\@v) or die $!; 1505s } 1505s ' 1505s ++ 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 1505s ++ echo git mirror aq 1505s + 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' ' 1505s . $troot/lib-gdr 1505s t-tstunt-parsechangelog 1505s p=example 1505s t-git-next-date 1505s ' 1505s + local savevars= 1505s + 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' 1505s + local 'importeval= 1505s . $troot/lib-gdr 1505s t-tstunt-parsechangelog 1505s p=example 1505s t-git-next-date 1505s ' 1505s + local import=IMPORT.gdr-convert-gbp 1505s + exec 1505s + local vn 1505s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1505s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1505s print STDERR "saving-exporting $vn\n"; 1505s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1505s or die $!; 1505s } 1505s ' 1505s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1505s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1505s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1505s saving-exporting DGIT_TEST_REAL_GPG 1505s + set -e 1505s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1505s + 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 1505s + printf '\n%s\n' ' 1505s . $troot/lib-gdr 1505s t-tstunt-parsechangelog 1505s p=example 1505s t-git-next-date 1505s ' 1505s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1505s + rc=0 1505s + set +x 1505s + set +e 1505s + pwd 1505s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1505s + '[' x '!=' x ']' 1505s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1505s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1505s + set -e 1505s + test 0 = 0 1505s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1505s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1505s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1505s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1505s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1505s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1505s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1505s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1505s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1505s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1505s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1505s ++ . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1505s +++ : -D 1505s +++ export GDR_TEST_DEBUG 1505s +++ t-tstunt debchange 1505s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1505s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1505s +++ local var=PATH 1505s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1505s +++ eval ' 1505s case "$PATH" in 1505s "$tstunt:"*) ;; 1505s *":$tstunt:"*) ;; 1505s "") PATH="$tstunt" ;; 1505s *) PATH="$tstunt:$PATH" ;; 1505s esac 1505s export PATH 1505s ' 1505s ++++ case "$PATH" in 1505s ++++ export PATH 1505s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1505s +++ local var=PERLLIB 1505s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1505s +++ eval ' 1505s case "$PERLLIB" in 1505s "$tstunt:"*) ;; 1505s *":$tstunt:"*) ;; 1505s "") PERLLIB="$tstunt" ;; 1505s *) PERLLIB="$tstunt:$PERLLIB" ;; 1505s esac 1505s export PERLLIB 1505s ' 1505s ++++ case "$PERLLIB" in 1505s ++++ export PERLLIB 1505s +++ local f 1505s +++ for f in "$@" 1505s +++ t-tstunt--save-real debchange 1505s +++ local f=debchange 1505s +++ case "$f" in 1505s +++ local rc 1505s +++ local real 1505s +++ set +e 1505s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1505s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1505s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1505s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1505s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1505s ++++ type -p debchange 1505s +++ real=/usr/bin/debchange 1505s +++ rc=0 1505s +++ set -e 1505s +++ case $rc in 1505s +++ local varname=debchange 1505s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1505s +++ eval ' 1505s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1505s export DGIT_TEST_REAL_DEBCHANGE 1505s ' 1505s ++++ : /usr/bin/debchange 1505s ++++ export DGIT_TEST_REAL_DEBCHANGE 1505s +++ f=./debchange 1505s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1505s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1505s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1505s ++ t-tstunt-parsechangelog 1505s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1505s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1505s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1505s ++ local var=PATH 1505s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1505s ++ eval ' 1505s case "$PATH" in 1505s "$tstunt:"*) ;; 1505s *":$tstunt:"*) ;; 1505s "") PATH="$tstunt" ;; 1505s *) PATH="$tstunt:$PATH" ;; 1505s esac 1505s export PATH 1505s ' 1505s +++ case "$PATH" in 1505s +++ export PATH 1505s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1505s ++ local var=PERLLIB 1505s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1505s ++ eval ' 1505s case "$PERLLIB" in 1505s "$tstunt:"*) ;; 1505s *":$tstunt:"*) ;; 1505s "") PERLLIB="$tstunt" ;; 1505s *) PERLLIB="$tstunt:$PERLLIB" ;; 1505s esac 1505s export PERLLIB 1505s ' 1505s +++ case "$PERLLIB" in 1505s +++ export PERLLIB 1505s ++ local f 1505s ++ for f in "$@" 1505s ++ t-tstunt--save-real dpkg-parsechangelog 1505s ++ local f=dpkg-parsechangelog 1505s ++ case "$f" in 1505s ++ local rc 1505s ++ local real 1505s ++ set +e 1505s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1505s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1505s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1505s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1505s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1505s +++ type -p dpkg-parsechangelog 1505s ++ real=/usr/bin/dpkg-parsechangelog 1505s ++ rc=0 1505s ++ set -e 1505s ++ case $rc in 1505s ++ local varname=dpkg_parsechangelog 1505s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1505s ++ eval ' 1505s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1505s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1505s ' 1505s +++ : /usr/bin/dpkg-parsechangelog 1505s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1505s ++ f=./dpkg-parsechangelog 1505s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1505s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1505s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1505s ++ for f in "$@" 1505s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1505s ++ local f=Dpkg/Changelog/Parse.pm 1505s ++ case "$f" in 1505s ++ return 1505s ++ f=./Dpkg/Changelog/Parse.pm 1505s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1505s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1505s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1505s ++ p=example 1505s ++ t-git-next-date 1505s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1505s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1505s + cd example 1505s + git checkout upstream/2.0 1505s Note: switching to 'upstream/2.0'. 1505s 1505s You are in 'detached HEAD' state. You can look around, make experimental 1505s changes and commit them, and you can discard any commits you make in this 1505s state without impacting any branches by switching back to a branch. 1505s 1505s If you want to create a new branch to retain commits you create, you may 1505s do so (now or later) by using -c with the switch command. Example: 1505s 1505s git switch -c 1505s 1505s Or undo this operation with: 1505s 1505s git switch - 1505s 1505s Turn off this advice by setting config variable advice.detachedHead to false 1505s 1505s HEAD is now at 923df13 New upstream version 2.0 1505s + echo '*patch*' 1505s + git commit -m nasty .gitignore 1505s [detached HEAD 66a3bee] nasty 1505s 1 file changed, 1 insertion(+) 1505s + git tag v2.1 1505s + t-make-orig example 2.1 1505s + local p=example 1505s + local v=2.1 1505s + local tag=v2.1 1505s + ust=example_2.1.orig.tar.gz 1505s + GZIP=-1 1505s + git archive -o ../example_2.1.orig.tar.gz --prefix=example-2.1/ v2.1 1505s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1505s + git checkout master 1505s Previous HEAD position was 66a3bee nasty 1505s Switched to branch 'master' 1505s Your branch is up to date with 'origin/master'. 1505s + t-git-debrebase new-upstream 2.1-1 1505s + local gdr=git-debrebase 1505s + : ' 1505s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1505s + git-debrebase --dgit=dgit -D new-upstream 2.1-1 1505s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1505s git-debrebase ffq check_specs * 1505s git-debrebase ffq merge master 1505s git-debrebase ffq check_remote origin remote fetch/merge branch 1505s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1505s OK, you are ahead of refs/remotes/origin/master 1505s git-debrebase ffq check_remote undef remote push branch 1505s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1505s OK, you are ahead of refs/remotes/dgit/dgit/sid 1505s git-debrebase *** WALK 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0 - 1505s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1505s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1505s 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","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Type" => "AddPatches"} 1505s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1505s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1505s git-debrebase = Changelog {"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0,"Differs" => 16}],"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","Type" => "Changelog"} 1505s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1505s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1505s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}],"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Type" => "Changelog"} 1505s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1505s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1505s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1505s git-debrebase = Pseudomerge {"Overwritten" => [{"Ix" => 1,"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Contributor" => {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0,"Ix" => 0},"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]],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Type" => "Pseudomerge"} 1505s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1505s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1505s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0,"Differs" => 2}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 1505s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1505s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1505s git-debrebase = Upstream {"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"}],"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 1505s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1505s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1505s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","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}],"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1505s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1505s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1505s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1505s git-debrebase = Anchor {"Type" => "Anchor","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","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" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1505s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 4 proc 9 pm 0 1505s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1505s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1505s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 10 1505s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1505s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1505s git-debrebase WALK REWRITING NOW cl=HASH(0xf81319be958) procd=HASH(0xf8131a3eb08) 1505s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1506s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1506s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1506s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1506s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1506s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1506s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1506s git-debrebase get_differs c981f94d196831d3684474d19d4715e74ea3e193 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf = 0x4 1506s git-debrebase *** WALK RETURN c981f94d196831d3684474d19d4715e74ea3e193 736955cae59cd46c445b7036fa0b1b7295168fed 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1506s git-debrebase get_differs e7a23c64c8579783657d5620ec8edc2faf977627 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1506s git-debrebase classify 736955cae59cd46c445b7036fa0b1b7295168fed $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p e7a23c64c8579783657d5620ec8edc2faf977627/0x10 1506s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "e7a23c64c8579783657d5620ec8edc2faf977627"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent e7a23c64c8579783657d5620ec8edc2faf977627\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000001 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Type" => "Changelog"} 1506s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1506s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1506s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1506s 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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 1506s git-debrebase %pieces = {"" => {"New" => "66a3bee9268301791962706795caa60e43481066","Old" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Name" => "","Desc" => "upstream (main piece","NewIx" => 0,"OldIx" => 0}} 1506s git-debrebase @newpieces = [{"New" => "66a3bee9268301791962706795caa60e43481066","Old" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Name" => "","Desc" => "upstream (main piece","NewIx" => 0,"OldIx" => 0}] 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1506s + 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. 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1506s git-debrebase: laundered (head was 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf) 1506s git-debrebase >= update refs/ffq-prev/heads/master 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0000000000000000000000000000000000000000 1506s git-debrebase >= delete refs/debrebase-last/heads/master 1506s git-debrebase >= update HEAD c981f94d196831d3684474d19d4715e74ea3e193 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1506s git-debrebase >$ 1506s Recorded previous head for preservation 1506s Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Successfully rebased and updated refs/heads/master. 1506s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1506s ' 1506s + t-some-changes for-rebase-fixup m 1506s + local token=for-rebase-fixup 1506s + local which=m 1506s + local fsuffix= 1506s + t-git-next-date 1506s + GIT_COMMITTER_DATE='1530000002 +0100' 1506s + GIT_AUTHOR_DATE='1530000002 +0100' 1506s + case "$which" in 1506s + case "$which" in 1506s + case "$which" in 1506s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1506s + echo '// both! for-rebase-fixup' 1506s + git add debian/zorkmid 1506s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1506s + echo '// both! for-rebase-fixup' 1506s + git add src.c 1506s + git commit -m 'MIXED add both() (for-rebase-fixup)' 1506s [master 3c4fb30] MIXED add both() (for-rebase-fixup) 1506s 2 files changed, 2 insertions(+) 1506s create mode 100644 debian/zorkmid 1506s + t-git-next-date 1506s + GIT_COMMITTER_DATE='1530000003 +0100' 1506s + GIT_AUTHOR_DATE='1530000003 +0100' 1506s + t-git-debrebase 1506s + local gdr=git-debrebase 1506s + : ' 1506s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1506s + git-debrebase --dgit=dgit -D 1506s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1506s git-debrebase *** WALK 3c4fb308761081b48574025eb21080de6b315bff 0 - 1506s git-debrebase get_differs 7026a179a64f8ae7cf301921336102fc8605a601 7cf3ee3de12fb7b094accb12c58d7bdaf460f032 = 0x22 1506s git-debrebase classify 3c4fb308761081b48574025eb21080de6b315bff $t=7cf3ee3de12fb7b094accb12c58d7bdaf460f032 @p 7026a179a64f8ae7cf301921336102fc8605a601/0x22 1506s git-debrebase = Mixed {"Type" => "Mixed","Hdr" => "tree 7cf3ee3de12fb7b094accb12c58d7bdaf460f032\nparent 7026a179a64f8ae7cf301921336102fc8605a601\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Msg" => "MIXED add both() (for-rebase-fixup)\n","CommitId" => "3c4fb308761081b48574025eb21080de6b315bff","Tree" => "7cf3ee3de12fb7b094accb12c58d7bdaf460f032","Parents" => [{"Ix" => 0,"CommitId" => "7026a179a64f8ae7cf301921336102fc8605a601","Differs" => 34}]} 1506s git-debrebase get_differs d40d8adb917009b4f608a9c8f81d879536e8a2d5 2c6bfde4fa70fb70cf7d8c48e62bb87ec21644c8 = 0x2 1506s git-debrebase classify 7026a179a64f8ae7cf301921336102fc8605a601 $t=2c6bfde4fa70fb70cf7d8c48e62bb87ec21644c8 @p d40d8adb917009b4f608a9c8f81d879536e8a2d5/0x2 1506s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 2c6bfde4fa70fb70cf7d8c48e62bb87ec21644c8\nparent d40d8adb917009b4f608a9c8f81d879536e8a2d5\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000001 +0100\n","Tree" => "2c6bfde4fa70fb70cf7d8c48e62bb87ec21644c8","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "d40d8adb917009b4f608a9c8f81d879536e8a2d5"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "7026a179a64f8ae7cf301921336102fc8605a601"} 1506s git-debrebase get_differs c998764c1f7bd541b7d37d3e0fd281b795346e6b ef515927ce165a7fa9c35da9dfce7abb49b196a2 = 0x2 1506s git-debrebase classify d40d8adb917009b4f608a9c8f81d879536e8a2d5 $t=ef515927ce165a7fa9c35da9dfce7abb49b196a2 @p c998764c1f7bd541b7d37d3e0fd281b795346e6b/0x2 1506s git-debrebase = Upstream {"Tree" => "ef515927ce165a7fa9c35da9dfce7abb49b196a2","Parents" => [{"Differs" => 2,"CommitId" => "c998764c1f7bd541b7d37d3e0fd281b795346e6b","Ix" => 0}],"CommitId" => "d40d8adb917009b4f608a9c8f81d879536e8a2d5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree ef515927ce165a7fa9c35da9dfce7abb49b196a2\nparent c998764c1f7bd541b7d37d3e0fd281b795346e6b\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000001 +0100\n","Type" => "Upstream"} 1506s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 1df30fcfe5acff108db66d6a1d9d47227254112a = 0x2 1506s git-debrebase classify c998764c1f7bd541b7d37d3e0fd281b795346e6b $t=1df30fcfe5acff108db66d6a1d9d47227254112a @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x2 1506s git-debrebase = Upstream {"Hdr" => "tree 1df30fcfe5acff108db66d6a1d9d47227254112a\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000001 +0100\n","Type" => "Upstream","Tree" => "1df30fcfe5acff108db66d6a1d9d47227254112a","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c"}],"CommitId" => "c998764c1f7bd541b7d37d3e0fd281b795346e6b","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1506s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 1506s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 1506s git-debrebase = Changelog {"Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","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}],"Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7"} 1506s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 1506s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 1506s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 1506s git-debrebase = Anchor {"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","Parents" => [{"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Differs" => 2,"Ix" => 0},{"CommitId" => "66a3bee9268301791962706795caa60e43481066","Differs" => 48,"Ix" => 1}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a"} 1506s git-debrebase *** WALK prep done cur=55b85aaf02da2acb5564598e075601e76e1f096a brw 2 upp 3 proc 6 pm -1 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1506s git-debrebase WALK REBUILD 55b85aaf02da2acb5564598e075601e76e1f096a 7 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1506s git-debrebase WALK BUILD 941a4216b7ef2f3fdf421e01923431465e26009c Debian (rewriting=0) 1506s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1506s git-debrebase WALK BUILD 3c4fb308761081b48574025eb21080de6b315bff Debian (rewriting=1) 1506s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1506s git-debrebase WALK BUILD c998764c1f7bd541b7d37d3e0fd281b795346e6b Upstream (rewriting=1) 1506s git-debrebase WALK BUILD d40d8adb917009b4f608a9c8f81d879536e8a2d5 Upstream (rewriting=1) 1506s git-debrebase WALK BUILD 7026a179a64f8ae7cf301921336102fc8605a601 Upstream (rewriting=1) 1506s git-debrebase WALK BUILD 3c4fb308761081b48574025eb21080de6b315bff Upstream (rewriting=1) 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1506s git-debrebase get_differs 67cc2f6910203251700f5a04554015fe0808a21e 3c4fb308761081b48574025eb21080de6b315bff = 0 1506s git-debrebase *** WALK RETURN 67cc2f6910203251700f5a04554015fe0808a21e fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 55b85aaf02da2acb5564598e075601e76e1f096a 1506s git-debrebase: laundered (head was 3c4fb308761081b48574025eb21080de6b315bff) 1506s git-debrebase >= update HEAD 67cc2f6910203251700f5a04554015fe0808a21e 3c4fb308761081b48574025eb21080de6b315bff 1506s git-debrebase >$ 1506s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1506s ' 1506s + t-git-debrebase make-patches 1506s + local gdr=git-debrebase 1506s + : ' 1506s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1506s + git-debrebase --dgit=dgit -D make-patches 1506s git-debrebase get_differs ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d 7cf3ee3de12fb7b094accb12c58d7bdaf460f032 = 0x2 1506s git-debrebase classify 67cc2f6910203251700f5a04554015fe0808a21e $t=7cf3ee3de12fb7b094accb12c58d7bdaf460f032 @p ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d/0x2 1506s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d"}],"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "67cc2f6910203251700f5a04554015fe0808a21e","Hdr" => "tree 7cf3ee3de12fb7b094accb12c58d7bdaf460f032\nparent ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "7cf3ee3de12fb7b094accb12c58d7bdaf460f032"} 1506s git-debrebase get_differs 33a23c45372305e980739fe289730e8d4f0d4b63 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc = 0x2 1506s git-debrebase classify ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d $t=3d990f67695fb7b47ddbfa34dae4e83918bc5cfc @p 33a23c45372305e980739fe289730e8d4f0d4b63/0x2 1506s git-debrebase = Upstream {"Hdr" => "tree 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc\nparent 33a23c45372305e980739fe289730e8d4f0d4b63\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Differs" => 2,"Ix" => 0}],"Tree" => "3d990f67695fb7b47ddbfa34dae4e83918bc5cfc"} 1506s git-debrebase get_differs 6426d659953f1cf078320b9d3c181128b66a51bb 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f = 0x2 1506s git-debrebase classify 33a23c45372305e980739fe289730e8d4f0d4b63 $t=38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f @p 6426d659953f1cf078320b9d3c181128b66a51bb/0x2 1506s git-debrebase = Upstream {"Hdr" => "tree 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f\nparent 6426d659953f1cf078320b9d3c181128b66a51bb\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb","Ix" => 0,"Differs" => 2}],"Tree" => "38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f"} 1506s git-debrebase get_differs fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 6cbd7e7202b3320e517741fb4b0ff137bc1aa178 = 0x2 1506s git-debrebase classify 6426d659953f1cf078320b9d3c181128b66a51bb $t=6cbd7e7202b3320e517741fb4b0ff137bc1aa178 @p fb6ba5e8cbc40f160cdf3331059a51ce85cba55d/0x2 1506s git-debrebase = Upstream {"Tree" => "6cbd7e7202b3320e517741fb4b0ff137bc1aa178","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d"}],"Hdr" => "tree 6cbd7e7202b3320e517741fb4b0ff137bc1aa178\nparent fb6ba5e8cbc40f160cdf3331059a51ce85cba55d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb"} 1506s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 0d3063e142452ee85420b80b221505fd3f476fc2 = 0x20 1506s git-debrebase classify fb6ba5e8cbc40f160cdf3331059a51ce85cba55d $t=0d3063e142452ee85420b80b221505fd3f476fc2 @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x20 1506s 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","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c"}],"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1506s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 1506s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 1506s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Differs" => 16,"Ix" => 0}],"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Type" => "Changelog","Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7"} 1506s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 1506s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 1506s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 1506s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree e25a9ccaea8c77582bbc3db47556fb0300fbc48f\nparent 736955cae59cd46c445b7036fa0b1b7295168fed\nparent 66a3bee9268301791962706795caa60e43481066\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","OrigParents" => [{"CommitId" => "66a3bee9268301791962706795caa60e43481066","Ix" => 1,"Differs" => 48}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed"},$VAR1->{"OrigParents"}[0]],"Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f"} 1506s git-debrebase *** WALK 67cc2f6910203251700f5a04554015fe0808a21e 0 - 1506s git-debrebase get_differs ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d 7cf3ee3de12fb7b094accb12c58d7bdaf460f032 = 0x2 1506s git-debrebase classify 67cc2f6910203251700f5a04554015fe0808a21e $t=7cf3ee3de12fb7b094accb12c58d7bdaf460f032 @p ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d/0x2 1506s git-debrebase = Upstream {"Tree" => "7cf3ee3de12fb7b094accb12c58d7bdaf460f032","Parents" => [{"CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 7cf3ee3de12fb7b094accb12c58d7bdaf460f032\nparent ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "67cc2f6910203251700f5a04554015fe0808a21e","Type" => "Upstream"} 1506s git-debrebase get_differs 33a23c45372305e980739fe289730e8d4f0d4b63 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc = 0x2 1506s git-debrebase classify ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d $t=3d990f67695fb7b47ddbfa34dae4e83918bc5cfc @p 33a23c45372305e980739fe289730e8d4f0d4b63/0x2 1506s git-debrebase = Upstream {"Tree" => "3d990f67695fb7b47ddbfa34dae4e83918bc5cfc","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Differs" => 2,"Ix" => 0}],"CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d","Hdr" => "tree 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc\nparent 33a23c45372305e980739fe289730e8d4f0d4b63\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream"} 1506s git-debrebase get_differs 6426d659953f1cf078320b9d3c181128b66a51bb 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f = 0x2 1506s git-debrebase classify 33a23c45372305e980739fe289730e8d4f0d4b63 $t=38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f @p 6426d659953f1cf078320b9d3c181128b66a51bb/0x2 1506s 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","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1506s git-debrebase get_differs fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 6cbd7e7202b3320e517741fb4b0ff137bc1aa178 = 0x2 1506s git-debrebase classify 6426d659953f1cf078320b9d3c181128b66a51bb $t=6cbd7e7202b3320e517741fb4b0ff137bc1aa178 @p fb6ba5e8cbc40f160cdf3331059a51ce85cba55d/0x2 1506s git-debrebase = Upstream {"Tree" => "6cbd7e7202b3320e517741fb4b0ff137bc1aa178","Hdr" => "tree 6cbd7e7202b3320e517741fb4b0ff137bc1aa178\nparent fb6ba5e8cbc40f160cdf3331059a51ce85cba55d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1506s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 0d3063e142452ee85420b80b221505fd3f476fc2 = 0x20 1506s git-debrebase classify fb6ba5e8cbc40f160cdf3331059a51ce85cba55d $t=0d3063e142452ee85420b80b221505fd3f476fc2 @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x20 1506s git-debrebase = Packaging {"Tree" => "0d3063e142452ee85420b80b221505fd3f476fc2","CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Hdr" => "tree 0d3063e142452ee85420b80b221505fd3f476fc2\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","Parents" => [{"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Ix" => 0,"Differs" => 32}],"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1506s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 1506s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 1506s git-debrebase = Changelog {"Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7","CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Type" => "Changelog","Parents" => [{"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Ix" => 0,"Differs" => 16}],"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n"} 1506s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 1506s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 1506s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 1506s git-debrebase = Anchor {"Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "66a3bee9268301791962706795caa60e43481066"}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]],"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Hdr" => "tree e25a9ccaea8c77582bbc3db47556fb0300fbc48f\nparent 736955cae59cd46c445b7036fa0b1b7295168fed\nparent 66a3bee9268301791962706795caa60e43481066\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Type" => "Anchor"} 1506s git-debrebase *** WALK prep done cur=55b85aaf02da2acb5564598e075601e76e1f096a brw 1 upp 3 proc 6 pm -1 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1506s git-debrebase WALK REBUILD 55b85aaf02da2acb5564598e075601e76e1f096a 7 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1506s git-debrebase WALK BUILD 941a4216b7ef2f3fdf421e01923431465e26009c Debian (rewriting=0) 1506s git-debrebase WALK BUILD fb6ba5e8cbc40f160cdf3331059a51ce85cba55d Debian (rewriting=0) 1506s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1506s git-debrebase WALK BUILD 6426d659953f1cf078320b9d3c181128b66a51bb Upstream (rewriting=0) 1506s git-debrebase WALK BUILD 33a23c45372305e980739fe289730e8d4f0d4b63 Upstream (rewriting=0) 1506s git-debrebase WALK BUILD ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d Upstream (rewriting=0) 1506s git-debrebase WALK BUILD 67cc2f6910203251700f5a04554015fe0808a21e Upstream (rewriting=0) 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1506s git-debrebase get_differs 67cc2f6910203251700f5a04554015fe0808a21e 67cc2f6910203251700f5a04554015fe0808a21e = 0 1506s git-debrebase *** WALK RETURN 67cc2f6910203251700f5a04554015fe0808a21e fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 55b85aaf02da2acb5564598e075601e76e1f096a 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1506s git-debrebase gbp_pq_export bw fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 67cc2f6910203251700f5a04554015fe0808a21e 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1506s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1506s git-debrebase get_differs 67cc2f6910203251700f5a04554015fe0808a21e 34bb7122396cdd1dbc3000174b14028b2758d938 = 0x4 1507s git-debrebase >= update HEAD 34bb7122396cdd1dbc3000174b14028b2758d938 67cc2f6910203251700f5a04554015fe0808a21e 1507s git-debrebase >$ 1507s HEAD is now at 34bb712 Commit patch queue (exported by git-debrebase) 1507s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1507s ' 1507s + t-some-changes for-dgit-fixup m 1507s + local token=for-dgit-fixup 1507s + local which=m 1507s + local fsuffix= 1507s + t-git-next-date 1507s + GIT_COMMITTER_DATE='1530000004 +0100' 1507s + GIT_AUTHOR_DATE='1530000004 +0100' 1507s + case "$which" in 1507s + case "$which" in 1507s + case "$which" in 1507s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1507s + echo '// both! for-dgit-fixup' 1507s + git add debian/zorkmid 1507s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1507s + echo '// both! for-dgit-fixup' 1507s + git add src.c 1507s + git commit -m 'MIXED add both() (for-dgit-fixup)' 1507s [master 03926ad] MIXED add both() (for-dgit-fixup) 1507s 2 files changed, 2 insertions(+) 1507s + t-git-next-date 1507s + GIT_COMMITTER_DATE='1530000005 +0100' 1507s + GIT_AUTHOR_DATE='1530000005 +0100' 1507s + t-git-debrebase 1507s + local gdr=git-debrebase 1507s + : ' 1507s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1507s + git-debrebase --dgit=dgit -D 1507s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1507s git-debrebase *** WALK 03926ad98fcfff78133f5cf8dc9e723de1783664 0 - 1507s git-debrebase get_differs 34bb7122396cdd1dbc3000174b14028b2758d938 2eb0f91a3f785139ca5fdd9488f3c1f44326793a = 0x22 1507s git-debrebase classify 03926ad98fcfff78133f5cf8dc9e723de1783664 $t=2eb0f91a3f785139ca5fdd9488f3c1f44326793a @p 34bb7122396cdd1dbc3000174b14028b2758d938/0x22 1507s git-debrebase = Mixed {"Hdr" => "tree 2eb0f91a3f785139ca5fdd9488f3c1f44326793a\nparent 34bb7122396cdd1dbc3000174b14028b2758d938\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","Tree" => "2eb0f91a3f785139ca5fdd9488f3c1f44326793a","Msg" => "MIXED add both() (for-dgit-fixup)\n","Parents" => [{"CommitId" => "34bb7122396cdd1dbc3000174b14028b2758d938","Ix" => 0,"Differs" => 34}],"Type" => "Mixed","CommitId" => "03926ad98fcfff78133f5cf8dc9e723de1783664"} 1507s git-debrebase get_differs 67cc2f6910203251700f5a04554015fe0808a21e e68d180a6c85ad1a15f82dbdaa079ff37bc07534 = 0x4 1507s git-debrebase classify 34bb7122396cdd1dbc3000174b14028b2758d938 $t=e68d180a6c85ad1a15f82dbdaa079ff37bc07534 @p 67cc2f6910203251700f5a04554015fe0808a21e/0x4 1507s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Hdr" => "tree e68d180a6c85ad1a15f82dbdaa079ff37bc07534\nparent 67cc2f6910203251700f5a04554015fe0808a21e\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "e68d180a6c85ad1a15f82dbdaa079ff37bc07534","CommitId" => "34bb7122396cdd1dbc3000174b14028b2758d938","Parents" => [{"CommitId" => "67cc2f6910203251700f5a04554015fe0808a21e","Ix" => 0,"Differs" => 4}],"Type" => "AddPatches"} 1507s git-debrebase get_differs ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d 7cf3ee3de12fb7b094accb12c58d7bdaf460f032 = 0x2 1507s git-debrebase classify 67cc2f6910203251700f5a04554015fe0808a21e $t=7cf3ee3de12fb7b094accb12c58d7bdaf460f032 @p ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d/0x2 1507s git-debrebase = Upstream {"CommitId" => "67cc2f6910203251700f5a04554015fe0808a21e","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d"}],"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "7cf3ee3de12fb7b094accb12c58d7bdaf460f032","Hdr" => "tree 7cf3ee3de12fb7b094accb12c58d7bdaf460f032\nparent ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1507s git-debrebase get_differs 33a23c45372305e980739fe289730e8d4f0d4b63 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc = 0x2 1507s git-debrebase classify ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d $t=3d990f67695fb7b47ddbfa34dae4e83918bc5cfc @p 33a23c45372305e980739fe289730e8d4f0d4b63/0x2 1507s git-debrebase = Upstream {"Hdr" => "tree 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc\nparent 33a23c45372305e980739fe289730e8d4f0d4b63\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "3d990f67695fb7b47ddbfa34dae4e83918bc5cfc","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Differs" => 2}],"Type" => "Upstream","CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d"} 1507s git-debrebase get_differs 6426d659953f1cf078320b9d3c181128b66a51bb 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f = 0x2 1507s git-debrebase classify 33a23c45372305e980739fe289730e8d4f0d4b63 $t=38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f @p 6426d659953f1cf078320b9d3c181128b66a51bb/0x2 1507s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f","Hdr" => "tree 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f\nparent 6426d659953f1cf078320b9d3c181128b66a51bb\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Parents" => [{"Differs" => 2,"CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb","Ix" => 0}],"Type" => "Upstream"} 1507s git-debrebase get_differs fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 6cbd7e7202b3320e517741fb4b0ff137bc1aa178 = 0x2 1507s git-debrebase classify 6426d659953f1cf078320b9d3c181128b66a51bb $t=6cbd7e7202b3320e517741fb4b0ff137bc1aa178 @p fb6ba5e8cbc40f160cdf3331059a51ce85cba55d/0x2 1507s git-debrebase = Upstream {"Hdr" => "tree 6cbd7e7202b3320e517741fb4b0ff137bc1aa178\nparent fb6ba5e8cbc40f160cdf3331059a51ce85cba55d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "6cbd7e7202b3320e517741fb4b0ff137bc1aa178","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Differs" => 2}],"CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb"} 1507s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 0d3063e142452ee85420b80b221505fd3f476fc2 = 0x20 1507s git-debrebase classify fb6ba5e8cbc40f160cdf3331059a51ce85cba55d $t=0d3063e142452ee85420b80b221505fd3f476fc2 @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x20 1507s git-debrebase = Packaging {"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Type" => "Packaging","Parents" => [{"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Ix" => 0,"Differs" => 32}],"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 0d3063e142452ee85420b80b221505fd3f476fc2\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "0d3063e142452ee85420b80b221505fd3f476fc2"} 1507s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 1507s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 1507s git-debrebase = Changelog {"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","Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7","CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a"}]} 1507s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 1507s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 1507s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 1507s git-debrebase = 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","Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f","OrigParents" => [{"Differs" => 48,"CommitId" => "66a3bee9268301791962706795caa60e43481066","Ix" => 1}],"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Parents" => [{"Ix" => 0,"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Differs" => 2},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 1507s git-debrebase *** WALK prep done cur=55b85aaf02da2acb5564598e075601e76e1f096a brw 3 upp 5 proc 10 pm -1 1507s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1507s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1507s git-debrebase WALK REBUILD 55b85aaf02da2acb5564598e075601e76e1f096a 11 1507s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1507s git-debrebase WALK BUILD 941a4216b7ef2f3fdf421e01923431465e26009c Debian (rewriting=0) 1507s git-debrebase WALK BUILD fb6ba5e8cbc40f160cdf3331059a51ce85cba55d Debian (rewriting=0) 1507s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1507s git-debrebase WALK BUILD 03926ad98fcfff78133f5cf8dc9e723de1783664 Debian (rewriting=1) 1507s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1507s git-debrebase WALK BUILD 6426d659953f1cf078320b9d3c181128b66a51bb Upstream (rewriting=1) 1507s git-debrebase WALK BUILD 33a23c45372305e980739fe289730e8d4f0d4b63 Upstream (rewriting=1) 1507s git-debrebase WALK BUILD ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d Upstream (rewriting=1) 1507s git-debrebase WALK BUILD 67cc2f6910203251700f5a04554015fe0808a21e Upstream (rewriting=1) 1507s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1507s git-debrebase WALK BUILD 03926ad98fcfff78133f5cf8dc9e723de1783664 Upstream (rewriting=1) 1507s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1507s git-debrebase get_differs 4d81e614bbd890e3b1a5980111084fc69e55267f 03926ad98fcfff78133f5cf8dc9e723de1783664 = 0x4 1507s git-debrebase *** WALK RETURN 4d81e614bbd890e3b1a5980111084fc69e55267f 3e8e1c982b31f3cec79728c564089c589983abca 55b85aaf02da2acb5564598e075601e76e1f096a 1507s git-debrebase: laundered (head was 03926ad98fcfff78133f5cf8dc9e723de1783664) 1507s git-debrebase >= update HEAD 4d81e614bbd890e3b1a5980111084fc69e55267f 03926ad98fcfff78133f5cf8dc9e723de1783664 1507s git-debrebase >$ 1507s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1507s ' 1507s + t-expect-fail 'dgit: failed command: false' t-dgit -wgf --git-debrebase=false quilt-fixup 1507s + local 'mpat=dgit: failed command: false' 1507s + shift 1507s + set +o pipefail 1507s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1507s + LC_MESSAGES=C 1507s + LANGUAGE=C 1507s + t-dgit -wgf --git-debrebase=false quilt-fixup 1507s + local dgit=dgit 1507s + pwd 1507s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1507s + : ' 1507s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1507s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --git-debrebase=false quilt-fixup 1507s | git rev-parse --show-toplevel 1507s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1507s | git config -z --get-regexp --local '.*' 1507s | git config -z --get-regexp --local '.*' 1507s | git config -z --get-regexp --global '.*' 1507s | git config -z --get-regexp --system '.*' 1507s format 3.0 (quilt), quilt mode linear 1507s Format `3.0 (quilt)', need to check/update patch stack 1507s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1507s => `' 1507s + git diff --quiet HEAD 1507s + git clean -xdff 1507s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1507s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1507s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1507s | git rev-parse 'HEAD~0' 1507s => `4d81e614bbd890e3b1a5980111084fc69e55267f' 1507s | git symbolic-ref -q HEAD 1507s => `refs/heads/master' 1507s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1507s CD work 1507s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1507s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 1507s examining quilt state (multiple patches, linear mode) 1507s branch_is_gdr 4d81e614bbd890e3b1a5980111084fc69e55267f... 1507s branch_is_gdr 941a4216b7ef2f3fdf421e01923431465e26009c gdr changelog YES 1507s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 1507s + false --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1507s dgit: failed command: false --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1507s 1507s dgit: error: subprocess failed with error exit status 1 1507s + local 'ps=255 0' 1507s + set -o pipefail 1507s + case $ps in 1507s + t-grep-mpat 'dgit: failed command: false' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1507s + local 'mpat=dgit: failed command: false' 1507s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1507s + local grepper=fgrep 1507s + case "$mpat" in 1507s + fgrep -e 'dgit: failed command: false' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1507s dgit: failed command: false --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1507s + git branch before-gdr-true 1507s + t-dgit -wgf --git-debrebase=true quilt-fixup 1507s + local dgit=dgit 1507s + pwd 1507s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1507s + : ' 1507s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1507s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --git-debrebase=true quilt-fixup 1507s | git rev-parse --show-toplevel 1507s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1507s | git config -z --get-regexp --local '.*' 1507s | git config -z --get-regexp --local '.*' 1507s | git config -z --get-regexp --global '.*' 1507s | git config -z --get-regexp --system '.*' 1507s format 3.0 (quilt), quilt mode linear 1507s Format `3.0 (quilt)', need to check/update patch stack 1507s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1507s => `' 1507s + git diff --quiet HEAD 1507s + git clean -xdff 1507s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1507s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1507s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1507s | git rev-parse 'HEAD~0' 1507s => `4d81e614bbd890e3b1a5980111084fc69e55267f' 1507s | git symbolic-ref -q HEAD 1507s => `refs/heads/master' 1507s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1507s CD work 1507s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1507s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 1507s examining quilt state (multiple patches, linear mode) 1507s branch_is_gdr 4d81e614bbd890e3b1a5980111084fc69e55267f... 1507s branch_is_gdr 941a4216b7ef2f3fdf421e01923431465e26009c gdr changelog YES 1507s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 1507s + true --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1507s | git rev-parse 'HEAD~0' 1507s => `4d81e614bbd890e3b1a5980111084fc69e55267f' 1507s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 1507s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1507s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 1507s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1508s CD fake 1508s | find -name .git -prune -print0 1508s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1508s + git checkout -f 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian 1508s + git add -Af . 1508s | git write-tree 1508s => `806249de73c443c056dbc6bfd7603063e6e3742f' 1508s fake orig tree object 806249de73c443c056dbc6bfd7603063e6e3742f 1508s CD .. 1508s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 1508s CD ../fake 1508s + git add -Af . 1508s | git write-tree 1508s => `806249de73c443c056dbc6bfd7603063e6e3742f' 1508s fake o+d/p tree object 806249de73c443c056dbc6bfd7603063e6e3742f 1508s CD ../work 1508s | git ls-tree --name-only -z 4d81e614bbd890e3b1a5980111084fc69e55267f 1508s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1508s | git diff-tree -z --no-renames -r 806249de73c443c056dbc6bfd7603063e6e3742f 4d81e614bbd890e3b1a5980111084fc69e55267f 1508s => `: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' 1508s quiltify_trees_differ 806249de73c443c056dbc6bfd7603063e6e3742f 4d81e614bbd890e3b1a5980111084fc69e55267f => 1 1508s | git diff-tree -z --no-renames --name-only -r 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f 1508s => `lib.c\x00new-upstream-file\x00src.c\x00' 1508s quiltify_trees_differ 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1508s | git diff-tree -z --no-renames --name-only -r 806249de73c443c056dbc6bfd7603063e6e3742f 806249de73c443c056dbc6bfd7603063e6e3742f 1508s => `' 1508s quiltify_trees_differ 806249de73c443c056dbc6bfd7603063e6e3742f 806249de73c443c056dbc6bfd7603063e6e3742f => 0 1508s differences @dl ## == ## == == ==. 1508s dgit: base trees orig=806249de73c443c056db o+d/p=806249de73c443c056db 1508s dgit: quilt differences: src: ## orig == gitignores: == orig == 1508s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1508s starting quiltify (multiple patches, linear mode) 1508s | git ls-tree --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/rules debian/control 1508s => `debian/control'... 1508s quiltify investigate 4d81e614bbd890e3b1a5980111084fc69e55267f 1508s | git diff-tree -z --no-renames --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f 1508s => `lib.c\x00new-upstream-file\x00src.c\x00' 1508s quiltify_trees_differ 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1508s | git ls-tree --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/rules debian/control 1508s => `debian/control'... 1508s | git cat-file commit 4d81e614bbd890e3b1a5980111084fc69e55267f 1508s => `tree ec947983291f86b8f616e416943e998079851ca2'... 1508s | git diff-tree -z --no-renames --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f 1508s => `src.c\x00' 1508s quiltify_trees_differ 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f => 1 1508s considering C=4d81e614bbd890e3b1a5980111084fc69e55267f P=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1508s | git diff-tree -r --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/patches .pc debian/source/format 1508s => `' 1508s search queue P=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 NT 1508s quiltify investigate 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1508s | git diff-tree -z --no-renames --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 806249de73c443c056dbc6bfd7603063e6e3742f 1508s => `lib.c\x00new-upstream-file\x00src.c\x00' 1508s quiltify_trees_differ 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1508s | git ls-tree --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 -- debian/rules debian/control 1508s => `debian/control'... 1508s | git cat-file commit 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1508s => `tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529'... 1508s | git diff-tree -z --no-renames --name-only 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1508s => `src.c\x00' 1508s quiltify_trees_differ 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 => 1 1508s considering C=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 P=97043ef068d57a7c42b6c059654a76088d551621 1508s | git diff-tree -r --name-only 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 -- debian/patches .pc debian/source/format 1508s => `' 1508s search queue P=97043ef068d57a7c42b6c059654a76088d551621 NT 1508s quiltify investigate 97043ef068d57a7c42b6c059654a76088d551621 1508s | git diff-tree -z --no-renames --name-only 97043ef068d57a7c42b6c059654a76088d551621 806249de73c443c056dbc6bfd7603063e6e3742f 1508s => `lib.c\x00new-upstream-file\x00src.c\x00' 1508s quiltify_trees_differ 97043ef068d57a7c42b6c059654a76088d551621 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1508s | git ls-tree --name-only 97043ef068d57a7c42b6c059654a76088d551621 -- debian/rules debian/control 1508s => `debian/control'... 1508s | git cat-file commit 97043ef068d57a7c42b6c059654a76088d551621 1508s => `tree 3a2cc385adda38871a475f84fd58599a02a2452b'... 1508s | git diff-tree -z --no-renames --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 1508s => `lib.c\x00' 1508s quiltify_trees_differ 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 => 1 1508s considering C=97043ef068d57a7c42b6c059654a76088d551621 P=66a8793ffe06ab8d25c6655e49e36725002677dd 1508s | git diff-tree -r --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 -- debian/patches .pc debian/source/format 1508s => `' 1508s search queue P=66a8793ffe06ab8d25c6655e49e36725002677dd NT 1508s quiltify investigate 66a8793ffe06ab8d25c6655e49e36725002677dd 1508s | git diff-tree -z --no-renames --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 806249de73c443c056dbc6bfd7603063e6e3742f 1508s => `new-upstream-file\x00src.c\x00' 1508s quiltify_trees_differ 66a8793ffe06ab8d25c6655e49e36725002677dd 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1508s | git ls-tree --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd -- debian/rules debian/control 1508s => `debian/control'... 1508s | git cat-file commit 66a8793ffe06ab8d25c6655e49e36725002677dd 1508s => `tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1'... 1508s | git diff-tree -z --no-renames --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd 1508s => `src.c\x00' 1508s quiltify_trees_differ 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd => 1 1508s considering C=66a8793ffe06ab8d25c6655e49e36725002677dd P=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1508s | git diff-tree -r --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd -- debian/patches .pc debian/source/format 1508s => `' 1508s search queue P=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 NT 1508s quiltify investigate 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1508s | git diff-tree -z --no-renames --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 806249de73c443c056dbc6bfd7603063e6e3742f 1508s => `new-upstream-file\x00' 1508s quiltify_trees_differ 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1508s | git ls-tree --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 -- debian/rules debian/control 1508s => `debian/control'... 1508s | git cat-file commit 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1508s => `tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7'... 1508s | git diff-tree -z --no-renames --name-only 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1508s => `new-upstream-file\x00' 1508s quiltify_trees_differ 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 => 1 1508s considering C=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 P=3e8e1c982b31f3cec79728c564089c589983abca 1508s | git diff-tree -r --name-only 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 -- debian/patches .pc debian/source/format 1508s => `' 1508s search queue P=3e8e1c982b31f3cec79728c564089c589983abca NT 1508s quiltify investigate 3e8e1c982b31f3cec79728c564089c589983abca 1508s | git diff-tree -z --no-renames --name-only 3e8e1c982b31f3cec79728c564089c589983abca 806249de73c443c056dbc6bfd7603063e6e3742f 1508s => `' 1508s quiltify_trees_differ 3e8e1c982b31f3cec79728c564089c589983abca 806249de73c443c056dbc6bfd7603063e6e3742f => 0 1508s search finished hooray! 1508s quiltify linearisation planning successful, executing... 1508s quiltify traverse 3e8e1c982b31f3cec79728c564089c589983abca..51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1508s | git cat-file commit 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1508s => `tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7'... 1508s | git log -n1 '--pretty=format:%aD' 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1508s => `Sun, 6 Dec 2015 23:50:08 +0000' 1508s + git checkout -q 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1508s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1508s | realpath -- /usr/bin/dgit 1508s => `/usr/bin/dgit' 1508s | realpath -- .git/dgit/quilt-description.tmp 1508s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1508s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0001-Add-a-new-upstream-file.patch 1508s dpkg-source: info: local changes detected, the modified files are: 1508s work/new-upstream-file 1508s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0001-Add-a-new-upstream-file.patch 1508s + git checkout -q 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 debian/changelog 1508s quiltify traverse 51be2304ce8579a3bbc67e06b4c7b8daf95d5008..66a8793ffe06ab8d25c6655e49e36725002677dd 1508s | git cat-file commit 66a8793ffe06ab8d25c6655e49e36725002677dd 1508s => `tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1'... 1508s | git log -n1 '--pretty=format:%aD' 66a8793ffe06ab8d25c6655e49e36725002677dd 1508s => `Sun, 6 Dec 2015 23:50:39 +0000' 1508s + git checkout -q 66a8793ffe06ab8d25c6655e49e36725002677dd 1508s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1508s | realpath -- /usr/bin/dgit 1508s => `/usr/bin/dgit' 1508s | realpath -- .git/dgit/quilt-description.tmp 1508s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1508s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0002-Edit-the-.c-file.patch 1508s dpkg-source: info: using patch list from debian/patches/series 1508s dpkg-source: info: local changes detected, the modified files are: 1508s work/src.c 1508s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0002-Edit-the-.c-file.patch 1508s + git checkout -q 66a8793ffe06ab8d25c6655e49e36725002677dd debian/changelog 1508s quiltify traverse 66a8793ffe06ab8d25c6655e49e36725002677dd..97043ef068d57a7c42b6c059654a76088d551621 1508s | git cat-file commit 97043ef068d57a7c42b6c059654a76088d551621 1508s => `tree 3a2cc385adda38871a475f84fd58599a02a2452b'... 1508s | git log -n1 '--pretty=format:%aD' 97043ef068d57a7c42b6c059654a76088d551621 1508s => `Sat, 4 Jun 2016 22:09:32 +0100' 1508s + git checkout -q 97043ef068d57a7c42b6c059654a76088d551621 1508s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1508s | realpath -- /usr/bin/dgit 1508s => `/usr/bin/dgit' 1508s | realpath -- .git/dgit/quilt-description.tmp 1508s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1508s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . subdir/addnewups 1509s dpkg-source: info: using patch list from debian/patches/series 1509s dpkg-source: info: local changes detected, the modified files are: 1509s work/lib.c 1509s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/subdir/addnewups 1509s + git checkout -q 97043ef068d57a7c42b6c059654a76088d551621 debian/changelog 1509s quiltify traverse 97043ef068d57a7c42b6c059654a76088d551621..8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1509s | git cat-file commit 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1509s => `tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529'... 1509s | git log -n1 '--pretty=format:%aD' 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1509s => `Tue, 26 Jun 2018 09:00:02 +0100' 1509s + git checkout -q 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1509s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1509s | realpath -- /usr/bin/dgit 1509s => `/usr/bin/dgit' 1509s | realpath -- .git/dgit/quilt-description.tmp 1509s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1509s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-for-rebase-fixup.patch 1509s dpkg-source: info: using patch list from debian/patches/series 1509s dpkg-source: info: local changes detected, the modified files are: 1509s work/src.c 1509s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-for-rebase-fixup.patch 1509s + git checkout -q 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 debian/changelog 1509s quiltify traverse 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6..4d81e614bbd890e3b1a5980111084fc69e55267f 1509s | git cat-file commit 4d81e614bbd890e3b1a5980111084fc69e55267f 1509s => `tree ec947983291f86b8f616e416943e998079851ca2'... 1509s | git log -n1 '--pretty=format:%aD' 4d81e614bbd890e3b1a5980111084fc69e55267f 1509s => `Tue, 26 Jun 2018 09:00:04 +0100' 1509s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f 1509s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1509s | realpath -- /usr/bin/dgit 1509s => `/usr/bin/dgit' 1509s | realpath -- .git/dgit/quilt-description.tmp 1509s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1509s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-for-dgit-fixup.patch 1509s dpkg-source: info: using patch list from debian/patches/series 1509s dpkg-source: info: local changes detected, the modified files are: 1509s work/src.c 1510s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-for-dgit-fixup.patch 1510s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1510s + git checkout -q master 1510s | git status --ignored --porcelain 1510s => `?? .pc/'... 1510s + git add -f debian/patches 1510s Commit Debian 3.0 (quilt) metadata 1510s 1510s [dgit (9.15) quilt-fixup] 1510s 1510s + git commit -m 'Commit Debian 3.0 (quilt) metadata 1510s 1510s [dgit (9.15) quilt-fixup] 1510s ' 1510s [master 94e3b9c] Commit Debian 3.0 (quilt) metadata 1510s 6 files changed, 71 insertions(+) 1510s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1510s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1510s create mode 100644 debian/patches/mixed-add-both-for-dgit-fixup.patch 1510s create mode 100644 debian/patches/mixed-add-both-for-rebase-fixup.patch 1510s create mode 100644 debian/patches/series 1510s create mode 100644 debian/patches/subdir/addnewups 1510s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1510s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1510s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1510s ' 1510s + git reset --hard before-gdr-true 1510s HEAD is now at 4d81e61 MIXED add both() (for-dgit-fixup) 1510s + t-dgit -wgf --git-debrebase=no-such-command-exists quilt-fixup 1510s + local dgit=dgit 1510s + pwd 1510s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1510s + : ' 1510s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1510s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/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 1510s | git rev-parse --show-toplevel 1510s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1510s | git config -z --get-regexp --local '.*' 1510s | git config -z --get-regexp --local '.*' 1510s | git config -z --get-regexp --global '.*' 1510s | git config -z --get-regexp --system '.*' 1510s format 3.0 (quilt), quilt mode linear 1510s Format `3.0 (quilt)', need to check/update patch stack 1510s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1510s => `' 1510s + git diff --quiet HEAD 1510s + git clean -xdff 1510s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1510s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1510s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1510s | git rev-parse 'HEAD~0' 1510s => `4d81e614bbd890e3b1a5980111084fc69e55267f' 1510s | git symbolic-ref -q HEAD 1510s => `refs/heads/master' 1510s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1510s CD work 1510s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1510s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 1510s examining quilt state (multiple patches, linear mode) 1510s branch_is_gdr 4d81e614bbd890e3b1a5980111084fc69e55267f... 1510s branch_is_gdr 941a4216b7ef2f3fdf421e01923431465e26009c gdr changelog YES 1510s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 1510s + no-such-command-exists --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1510s | git rev-parse 'HEAD~0' 1510s => `4d81e614bbd890e3b1a5980111084fc69e55267f' 1510s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 1510s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1510s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 1510s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1510s CD fake 1510s | find -name .git -prune -print0 1510s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1510s + git checkout -f 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian 1510s + git add -Af . 1510s | git write-tree 1510s => `806249de73c443c056dbc6bfd7603063e6e3742f' 1510s fake orig tree object 806249de73c443c056dbc6bfd7603063e6e3742f 1510s CD .. 1510s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 1510s CD ../fake 1510s + git add -Af . 1510s | git write-tree 1510s => `806249de73c443c056dbc6bfd7603063e6e3742f' 1510s fake o+d/p tree object 806249de73c443c056dbc6bfd7603063e6e3742f 1510s CD ../work 1510s | git ls-tree --name-only -z 4d81e614bbd890e3b1a5980111084fc69e55267f 1510s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1510s | git diff-tree -z --no-renames -r 806249de73c443c056dbc6bfd7603063e6e3742f 4d81e614bbd890e3b1a5980111084fc69e55267f 1510s => `: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' 1510s quiltify_trees_differ 806249de73c443c056dbc6bfd7603063e6e3742f 4d81e614bbd890e3b1a5980111084fc69e55267f => 1 1510s | git diff-tree -z --no-renames --name-only -r 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f 1510s => `lib.c\x00new-upstream-file\x00src.c\x00' 1510s quiltify_trees_differ 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1510s | git diff-tree -z --no-renames --name-only -r 806249de73c443c056dbc6bfd7603063e6e3742f 806249de73c443c056dbc6bfd7603063e6e3742f 1510s => `' 1510s quiltify_trees_differ 806249de73c443c056dbc6bfd7603063e6e3742f 806249de73c443c056dbc6bfd7603063e6e3742f => 0 1510s differences @dl ## == ## == == ==. 1510s dgit: base trees orig=806249de73c443c056db o+d/p=806249de73c443c056db 1510s dgit: quilt differences: src: ## orig == gitignores: == orig == 1510s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1510s starting quiltify (multiple patches, linear mode) 1510s | git ls-tree --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/rules debian/control 1510s => `debian/control'... 1510s quiltify investigate 4d81e614bbd890e3b1a5980111084fc69e55267f 1510s | git diff-tree -z --no-renames --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f 1510s => `lib.c\x00new-upstream-file\x00src.c\x00' 1510s quiltify_trees_differ 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1510s | git ls-tree --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/rules debian/control 1510s => `debian/control'... 1510s | git cat-file commit 4d81e614bbd890e3b1a5980111084fc69e55267f 1510s => `tree ec947983291f86b8f616e416943e998079851ca2'... 1510s | git diff-tree -z --no-renames --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f 1510s => `src.c\x00' 1510s quiltify_trees_differ 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f => 1 1510s considering C=4d81e614bbd890e3b1a5980111084fc69e55267f P=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1510s | git diff-tree -r --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/patches .pc debian/source/format 1510s => `' 1510s search queue P=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 NT 1510s quiltify investigate 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1510s | git diff-tree -z --no-renames --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 806249de73c443c056dbc6bfd7603063e6e3742f 1510s => `lib.c\x00new-upstream-file\x00src.c\x00' 1510s quiltify_trees_differ 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1510s | git ls-tree --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 -- debian/rules debian/control 1510s => `debian/control'... 1510s | git cat-file commit 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1510s => `tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529'... 1510s | git diff-tree -z --no-renames --name-only 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1510s => `src.c\x00' 1510s quiltify_trees_differ 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 => 1 1510s considering C=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 P=97043ef068d57a7c42b6c059654a76088d551621 1510s | git diff-tree -r --name-only 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 -- debian/patches .pc debian/source/format 1510s => `' 1510s search queue P=97043ef068d57a7c42b6c059654a76088d551621 NT 1510s quiltify investigate 97043ef068d57a7c42b6c059654a76088d551621 1510s | git diff-tree -z --no-renames --name-only 97043ef068d57a7c42b6c059654a76088d551621 806249de73c443c056dbc6bfd7603063e6e3742f 1510s => `lib.c\x00new-upstream-file\x00src.c\x00' 1510s quiltify_trees_differ 97043ef068d57a7c42b6c059654a76088d551621 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1510s | git ls-tree --name-only 97043ef068d57a7c42b6c059654a76088d551621 -- debian/rules debian/control 1510s => `debian/control'... 1510s | git cat-file commit 97043ef068d57a7c42b6c059654a76088d551621 1510s => `tree 3a2cc385adda38871a475f84fd58599a02a2452b'... 1510s | git diff-tree -z --no-renames --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 1510s => `lib.c\x00' 1510s quiltify_trees_differ 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 => 1 1510s considering C=97043ef068d57a7c42b6c059654a76088d551621 P=66a8793ffe06ab8d25c6655e49e36725002677dd 1510s | git diff-tree -r --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 -- debian/patches .pc debian/source/format 1510s => `' 1510s search queue P=66a8793ffe06ab8d25c6655e49e36725002677dd NT 1510s quiltify investigate 66a8793ffe06ab8d25c6655e49e36725002677dd 1510s | git diff-tree -z --no-renames --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 806249de73c443c056dbc6bfd7603063e6e3742f 1510s => `new-upstream-file\x00src.c\x00' 1510s quiltify_trees_differ 66a8793ffe06ab8d25c6655e49e36725002677dd 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1510s | git ls-tree --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd -- debian/rules debian/control 1510s => `debian/control'... 1510s | git cat-file commit 66a8793ffe06ab8d25c6655e49e36725002677dd 1510s => `tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1'... 1510s | git diff-tree -z --no-renames --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd 1510s => `src.c\x00' 1510s quiltify_trees_differ 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd => 1 1510s considering C=66a8793ffe06ab8d25c6655e49e36725002677dd P=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1510s | git diff-tree -r --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd -- debian/patches .pc debian/source/format 1510s => `' 1510s search queue P=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 NT 1510s quiltify investigate 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1510s | git diff-tree -z --no-renames --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 806249de73c443c056dbc6bfd7603063e6e3742f 1510s => `new-upstream-file\x00' 1510s quiltify_trees_differ 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 806249de73c443c056dbc6bfd7603063e6e3742f => 1 1510s | git ls-tree --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 -- debian/rules debian/control 1510s => `debian/control'... 1510s | git cat-file commit 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1510s => `tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7'... 1510s | git diff-tree -z --no-renames --name-only 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1510s => `new-upstream-file\x00' 1510s quiltify_trees_differ 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 => 1 1510s considering C=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 P=3e8e1c982b31f3cec79728c564089c589983abca 1510s | git diff-tree -r --name-only 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 -- debian/patches .pc debian/source/format 1510s => `' 1510s search queue P=3e8e1c982b31f3cec79728c564089c589983abca NT 1510s quiltify investigate 3e8e1c982b31f3cec79728c564089c589983abca 1510s | git diff-tree -z --no-renames --name-only 3e8e1c982b31f3cec79728c564089c589983abca 806249de73c443c056dbc6bfd7603063e6e3742f 1510s => `' 1510s quiltify_trees_differ 3e8e1c982b31f3cec79728c564089c589983abca 806249de73c443c056dbc6bfd7603063e6e3742f => 0 1510s search finished hooray! 1510s quiltify linearisation planning successful, executing... 1510s quiltify traverse 3e8e1c982b31f3cec79728c564089c589983abca..51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1510s | git cat-file commit 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1510s => `tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7'... 1510s | git log -n1 '--pretty=format:%aD' 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1510s => `Sun, 6 Dec 2015 23:50:08 +0000' 1510s + git checkout -q 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 1510s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1510s | realpath -- /usr/bin/dgit 1510s => `/usr/bin/dgit' 1510s | realpath -- .git/dgit/quilt-description.tmp 1510s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1510s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0001-Add-a-new-upstream-file.patch 1511s dpkg-source: info: local changes detected, the modified files are: 1511s work/new-upstream-file 1511s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0001-Add-a-new-upstream-file.patch 1511s + git checkout -q 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 debian/changelog 1511s quiltify traverse 51be2304ce8579a3bbc67e06b4c7b8daf95d5008..66a8793ffe06ab8d25c6655e49e36725002677dd 1511s | git cat-file commit 66a8793ffe06ab8d25c6655e49e36725002677dd 1511s => `tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1'... 1511s | git log -n1 '--pretty=format:%aD' 66a8793ffe06ab8d25c6655e49e36725002677dd 1511s => `Sun, 6 Dec 2015 23:50:39 +0000' 1511s + git checkout -q 66a8793ffe06ab8d25c6655e49e36725002677dd 1511s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1511s | realpath -- /usr/bin/dgit 1511s => `/usr/bin/dgit' 1511s | realpath -- .git/dgit/quilt-description.tmp 1511s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1511s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0002-Edit-the-.c-file.patch 1511s dpkg-source: info: using patch list from debian/patches/series 1511s dpkg-source: info: local changes detected, the modified files are: 1511s work/src.c 1511s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0002-Edit-the-.c-file.patch 1511s + git checkout -q 66a8793ffe06ab8d25c6655e49e36725002677dd debian/changelog 1511s quiltify traverse 66a8793ffe06ab8d25c6655e49e36725002677dd..97043ef068d57a7c42b6c059654a76088d551621 1511s | git cat-file commit 97043ef068d57a7c42b6c059654a76088d551621 1511s => `tree 3a2cc385adda38871a475f84fd58599a02a2452b'... 1511s | git log -n1 '--pretty=format:%aD' 97043ef068d57a7c42b6c059654a76088d551621 1511s => `Sat, 4 Jun 2016 22:09:32 +0100' 1511s + git checkout -q 97043ef068d57a7c42b6c059654a76088d551621 1511s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1511s | realpath -- /usr/bin/dgit 1511s => `/usr/bin/dgit' 1511s | realpath -- .git/dgit/quilt-description.tmp 1511s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1511s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . subdir/addnewups 1511s dpkg-source: info: using patch list from debian/patches/series 1511s dpkg-source: info: local changes detected, the modified files are: 1511s work/lib.c 1511s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/subdir/addnewups 1511s + git checkout -q 97043ef068d57a7c42b6c059654a76088d551621 debian/changelog 1511s quiltify traverse 97043ef068d57a7c42b6c059654a76088d551621..8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1511s | git cat-file commit 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1511s => `tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529'... 1511s | git log -n1 '--pretty=format:%aD' 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1511s => `Tue, 26 Jun 2018 09:00:02 +0100' 1511s + git checkout -q 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 1511s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1512s | realpath -- /usr/bin/dgit 1512s => `/usr/bin/dgit' 1512s | realpath -- .git/dgit/quilt-description.tmp 1512s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1512s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-for-rebase-fixup.patch 1512s dpkg-source: info: using patch list from debian/patches/series 1512s dpkg-source: info: local changes detected, the modified files are: 1512s work/src.c 1512s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-for-rebase-fixup.patch 1512s + git checkout -q 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 debian/changelog 1512s quiltify traverse 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6..4d81e614bbd890e3b1a5980111084fc69e55267f 1512s | git cat-file commit 4d81e614bbd890e3b1a5980111084fc69e55267f 1512s => `tree ec947983291f86b8f616e416943e998079851ca2'... 1512s | git log -n1 '--pretty=format:%aD' 4d81e614bbd890e3b1a5980111084fc69e55267f 1512s => `Tue, 26 Jun 2018 09:00:04 +0100' 1512s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f 1512s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1512s | realpath -- /usr/bin/dgit 1512s => `/usr/bin/dgit' 1512s | realpath -- .git/dgit/quilt-description.tmp 1512s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1512s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-for-dgit-fixup.patch 1512s dpkg-source: info: using patch list from debian/patches/series 1512s dpkg-source: info: local changes detected, the modified files are: 1512s work/src.c 1512s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-for-dgit-fixup.patch 1512s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 1512s + git checkout -q master 1512s | git status --ignored --porcelain 1512s => `?? .pc/'... 1512s + git add -f debian/patches 1512s Commit Debian 3.0 (quilt) metadata 1512s 1512s [dgit (9.15) quilt-fixup] 1512s 1512s + git commit -m 'Commit Debian 3.0 (quilt) metadata 1512s 1512s [dgit (9.15) quilt-fixup] 1512s ' 1512s [master 94e3b9c] Commit Debian 3.0 (quilt) metadata 1512s 6 files changed, 71 insertions(+) 1512s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1512s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1512s create mode 100644 debian/patches/mixed-add-both-for-dgit-fixup.patch 1512s create mode 100644 debian/patches/mixed-add-both-for-rebase-fixup.patch 1512s create mode 100644 debian/patches/series 1512s create mode 100644 debian/patches/subdir/addnewups 1512s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1512s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1512s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1512s ' 1512s + t-some-changes for-make-patches-fails-then-dgit-fixup m 1512s + local token=for-make-patches-fails-then-dgit-fixup 1512s + local which=m 1512s + local fsuffix= 1512s + t-git-next-date 1512s + GIT_COMMITTER_DATE='1530000006 +0100' 1512s + GIT_AUTHOR_DATE='1530000006 +0100' 1512s + case "$which" in 1512s + case "$which" in 1512s + case "$which" in 1512s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1512s + echo '// both! for-make-patches-fails-then-dgit-fixup' 1512s + git add debian/zorkmid 1512s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1512s + echo '// both! for-make-patches-fails-then-dgit-fixup' 1512s + git add src.c 1512s + git commit -m 'MIXED add both() (for-make-patches-fails-then-dgit-fixup)' 1512s [master 362e4af] MIXED add both() (for-make-patches-fails-then-dgit-fixup) 1512s 2 files changed, 2 insertions(+) 1512s + t-git-next-date 1512s + GIT_COMMITTER_DATE='1530000007 +0100' 1512s + GIT_AUTHOR_DATE='1530000007 +0100' 1512s + t-expect-fail 'Patch export produced patch amendments' t-git-debrebase make-patches 1512s + local 'mpat=Patch export produced patch amendments' 1512s + shift 1512s + set +o pipefail 1512s + LC_MESSAGES=C 1512s + LANGUAGE=C 1512s + t-git-debrebase make-patches 1512s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1512s + local gdr=git-debrebase 1512s + : ' 1512s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1512s + git-debrebase --dgit=dgit -D make-patches 1512s git-debrebase get_differs 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466 = 0x22 1512s git-debrebase classify 362e4afd7b5152332b224def77991b73e6da5b99 $t=90cd60fc1d7ec5a759e9f9f43090af4e62f6b466 @p 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064/0x22 1512s git-debrebase = Mixed {"Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "94e3b9cf4a090e53d7f707c46d1ba73ef47b5064"}],"Type" => "Mixed","Hdr" => "tree 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466\nparent 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Tree" => "90cd60fc1d7ec5a759e9f9f43090af4e62f6b466","CommitId" => "362e4afd7b5152332b224def77991b73e6da5b99","Msg" => "MIXED add both() (for-make-patches-fails-then-dgit-fixup)\n"} 1512s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (362e4afd7b5152332b224def77991b73e6da5b99) 1512s git-debrebase get_differs 4d81e614bbd890e3b1a5980111084fc69e55267f ebfc7081612876d8e714696f2ab8fbd3e9b7c267 = 0x4 1512s git-debrebase classify 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 $t=ebfc7081612876d8e714696f2ab8fbd3e9b7c267 @p 4d81e614bbd890e3b1a5980111084fc69e55267f/0x4 1512s git-debrebase = AddPatches {"Parents" => [{"Ix" => 0,"CommitId" => "4d81e614bbd890e3b1a5980111084fc69e55267f","Differs" => 4}],"Hdr" => "tree ebfc7081612876d8e714696f2ab8fbd3e9b7c267\nparent 4d81e614bbd890e3b1a5980111084fc69e55267f\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "ebfc7081612876d8e714696f2ab8fbd3e9b7c267","Type" => "AddPatches","CommitId" => "94e3b9cf4a090e53d7f707c46d1ba73ef47b5064","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n"} 1512s git-debrebase get_differs 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 ec947983291f86b8f616e416943e998079851ca2 = 0x2 1512s git-debrebase classify 4d81e614bbd890e3b1a5980111084fc69e55267f $t=ec947983291f86b8f616e416943e998079851ca2 @p 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6/0x2 1512s git-debrebase = Upstream {"CommitId" => "4d81e614bbd890e3b1a5980111084fc69e55267f","Msg" => "MIXED add both() (for-dgit-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "ec947983291f86b8f616e416943e998079851ca2","Hdr" => "tree ec947983291f86b8f616e416943e998079851ca2\nparent 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1512s git-debrebase get_differs 97043ef068d57a7c42b6c059654a76088d551621 f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529 = 0x2 1512s git-debrebase classify 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 $t=f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529 @p 97043ef068d57a7c42b6c059654a76088d551621/0x2 1512s git-debrebase = Upstream {"CommitId" => "8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6","Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "97043ef068d57a7c42b6c059654a76088d551621","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529","Hdr" => "tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529\nparent 97043ef068d57a7c42b6c059654a76088d551621\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1512s git-debrebase get_differs 66a8793ffe06ab8d25c6655e49e36725002677dd 3a2cc385adda38871a475f84fd58599a02a2452b = 0x2 1512s git-debrebase classify 97043ef068d57a7c42b6c059654a76088d551621 $t=3a2cc385adda38871a475f84fd58599a02a2452b @p 66a8793ffe06ab8d25c6655e49e36725002677dd/0x2 1512s git-debrebase = Upstream {"Hdr" => "tree 3a2cc385adda38871a475f84fd58599a02a2452b\nparent 66a8793ffe06ab8d25c6655e49e36725002677dd\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "3a2cc385adda38871a475f84fd58599a02a2452b","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "66a8793ffe06ab8d25c6655e49e36725002677dd"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "97043ef068d57a7c42b6c059654a76088d551621"} 1512s git-debrebase get_differs 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1 = 0x2 1512s git-debrebase classify 66a8793ffe06ab8d25c6655e49e36725002677dd $t=ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1 @p 51be2304ce8579a3bbc67e06b4c7b8daf95d5008/0x2 1512s git-debrebase = Upstream {"CommitId" => "66a8793ffe06ab8d25c6655e49e36725002677dd","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "51be2304ce8579a3bbc67e06b4c7b8daf95d5008"}],"Hdr" => "tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1\nparent 51be2304ce8579a3bbc67e06b4c7b8daf95d5008\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1","Type" => "Upstream"} 1512s git-debrebase get_differs 3e8e1c982b31f3cec79728c564089c589983abca 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7 = 0x2 1512s git-debrebase classify 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 $t=4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7 @p 3e8e1c982b31f3cec79728c564089c589983abca/0x2 1512s git-debrebase = Upstream {"CommitId" => "51be2304ce8579a3bbc67e06b4c7b8daf95d5008","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "3e8e1c982b31f3cec79728c564089c589983abca"}],"Hdr" => "tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7\nparent 3e8e1c982b31f3cec79728c564089c589983abca\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7","Type" => "Upstream"} 1512s git-debrebase get_differs fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 806249de73c443c056dbc6bfd7603063e6e3742f = 0x20 1512s git-debrebase classify 3e8e1c982b31f3cec79728c564089c589983abca $t=806249de73c443c056dbc6bfd7603063e6e3742f @p fb6ba5e8cbc40f160cdf3331059a51ce85cba55d/0x20 1512s git-debrebase = Packaging {"Msg" => "MIXED add both() (for-dgit-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "3e8e1c982b31f3cec79728c564089c589983abca","Type" => "Packaging","Hdr" => "tree 806249de73c443c056dbc6bfd7603063e6e3742f\nparent fb6ba5e8cbc40f160cdf3331059a51ce85cba55d\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "806249de73c443c056dbc6bfd7603063e6e3742f","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d"}]} 1512s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 0d3063e142452ee85420b80b221505fd3f476fc2 = 0x20 1512s git-debrebase classify fb6ba5e8cbc40f160cdf3331059a51ce85cba55d $t=0d3063e142452ee85420b80b221505fd3f476fc2 @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x20 1512s git-debrebase = Packaging {"Hdr" => "tree 0d3063e142452ee85420b80b221505fd3f476fc2\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "0d3063e142452ee85420b80b221505fd3f476fc2","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c"}],"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d"} 1512s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 1512s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 1512s git-debrebase = 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"}],"Type" => "Changelog","Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7","Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n"} 1512s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 1512s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 1512s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 1512s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f","CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Parents" => [{"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Ix" => 0,"Differs" => 2},{"CommitId" => "66a3bee9268301791962706795caa60e43481066","Ix" => 1,"Differs" => 48}],"Hdr" => "tree e25a9ccaea8c77582bbc3db47556fb0300fbc48f\nparent 736955cae59cd46c445b7036fa0b1b7295168fed\nparent 66a3bee9268301791962706795caa60e43481066\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 1512s git-debrebase *** WALK 362e4afd7b5152332b224def77991b73e6da5b99 0 - 1512s git-debrebase get_differs 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466 = 0x22 1512s git-debrebase classify 362e4afd7b5152332b224def77991b73e6da5b99 $t=90cd60fc1d7ec5a759e9f9f43090af4e62f6b466 @p 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064/0x22 1512s git-debrebase = Mixed {"CommitId" => "362e4afd7b5152332b224def77991b73e6da5b99","Msg" => "MIXED add both() (for-make-patches-fails-then-dgit-fixup)\n","Parents" => [{"CommitId" => "94e3b9cf4a090e53d7f707c46d1ba73ef47b5064","Ix" => 0,"Differs" => 34}],"Hdr" => "tree 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466\nparent 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Tree" => "90cd60fc1d7ec5a759e9f9f43090af4e62f6b466","Type" => "Mixed"} 1512s git-debrebase get_differs 4d81e614bbd890e3b1a5980111084fc69e55267f ebfc7081612876d8e714696f2ab8fbd3e9b7c267 = 0x4 1512s git-debrebase classify 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 $t=ebfc7081612876d8e714696f2ab8fbd3e9b7c267 @p 4d81e614bbd890e3b1a5980111084fc69e55267f/0x4 1512s git-debrebase = AddPatches {"CommitId" => "94e3b9cf4a090e53d7f707c46d1ba73ef47b5064","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Parents" => [{"CommitId" => "4d81e614bbd890e3b1a5980111084fc69e55267f","Ix" => 0,"Differs" => 4}],"Tree" => "ebfc7081612876d8e714696f2ab8fbd3e9b7c267","Hdr" => "tree ebfc7081612876d8e714696f2ab8fbd3e9b7c267\nparent 4d81e614bbd890e3b1a5980111084fc69e55267f\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "AddPatches"} 1512s git-debrebase get_differs 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 ec947983291f86b8f616e416943e998079851ca2 = 0x2 1512s git-debrebase classify 4d81e614bbd890e3b1a5980111084fc69e55267f $t=ec947983291f86b8f616e416943e998079851ca2 @p 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6/0x2 1512s git-debrebase = Upstream {"Parents" => [{"CommitId" => "8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6","Ix" => 0,"Differs" => 2}],"Hdr" => "tree ec947983291f86b8f616e416943e998079851ca2\nparent 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "ec947983291f86b8f616e416943e998079851ca2","Type" => "Upstream","CommitId" => "4d81e614bbd890e3b1a5980111084fc69e55267f","Msg" => "MIXED add both() (for-dgit-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1512s git-debrebase get_differs 97043ef068d57a7c42b6c059654a76088d551621 f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529 = 0x2 1512s git-debrebase classify 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 $t=f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529 @p 97043ef068d57a7c42b6c059654a76088d551621/0x2 1512s git-debrebase = Upstream {"CommitId" => "8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6","Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "97043ef068d57a7c42b6c059654a76088d551621"}],"Type" => "Upstream","Tree" => "f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529","Hdr" => "tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529\nparent 97043ef068d57a7c42b6c059654a76088d551621\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1512s git-debrebase get_differs 66a8793ffe06ab8d25c6655e49e36725002677dd 3a2cc385adda38871a475f84fd58599a02a2452b = 0x2 1512s git-debrebase classify 97043ef068d57a7c42b6c059654a76088d551621 $t=3a2cc385adda38871a475f84fd58599a02a2452b @p 66a8793ffe06ab8d25c6655e49e36725002677dd/0x2 1512s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "66a8793ffe06ab8d25c6655e49e36725002677dd","Ix" => 0}],"Tree" => "3a2cc385adda38871a475f84fd58599a02a2452b","Hdr" => "tree 3a2cc385adda38871a475f84fd58599a02a2452b\nparent 66a8793ffe06ab8d25c6655e49e36725002677dd\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","CommitId" => "97043ef068d57a7c42b6c059654a76088d551621","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1512s git-debrebase get_differs 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1 = 0x2 1512s git-debrebase classify 66a8793ffe06ab8d25c6655e49e36725002677dd $t=ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1 @p 51be2304ce8579a3bbc67e06b4c7b8daf95d5008/0x2 1512s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "66a8793ffe06ab8d25c6655e49e36725002677dd","Hdr" => "tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1\nparent 51be2304ce8579a3bbc67e06b4c7b8daf95d5008\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "51be2304ce8579a3bbc67e06b4c7b8daf95d5008"}]} 1512s git-debrebase get_differs 3e8e1c982b31f3cec79728c564089c589983abca 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7 = 0x2 1512s git-debrebase classify 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 $t=4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7 @p 3e8e1c982b31f3cec79728c564089c589983abca/0x2 1512s git-debrebase = Upstream {"CommitId" => "51be2304ce8579a3bbc67e06b4c7b8daf95d5008","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "3e8e1c982b31f3cec79728c564089c589983abca","Ix" => 0}],"Type" => "Upstream","Tree" => "4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7","Hdr" => "tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7\nparent 3e8e1c982b31f3cec79728c564089c589983abca\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n"} 1512s git-debrebase get_differs fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 806249de73c443c056dbc6bfd7603063e6e3742f = 0x20 1512s git-debrebase classify 3e8e1c982b31f3cec79728c564089c589983abca $t=806249de73c443c056dbc6bfd7603063e6e3742f @p fb6ba5e8cbc40f160cdf3331059a51ce85cba55d/0x20 1512s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Differs" => 32}],"Tree" => "806249de73c443c056dbc6bfd7603063e6e3742f","Hdr" => "tree 806249de73c443c056dbc6bfd7603063e6e3742f\nparent fb6ba5e8cbc40f160cdf3331059a51ce85cba55d\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","CommitId" => "3e8e1c982b31f3cec79728c564089c589983abca","Msg" => "MIXED add both() (for-dgit-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1512s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 0d3063e142452ee85420b80b221505fd3f476fc2 = 0x20 1512s git-debrebase classify fb6ba5e8cbc40f160cdf3331059a51ce85cba55d $t=0d3063e142452ee85420b80b221505fd3f476fc2 @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x20 1512s git-debrebase = Packaging {"Hdr" => "tree 0d3063e142452ee85420b80b221505fd3f476fc2\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "0d3063e142452ee85420b80b221505fd3f476fc2","Type" => "Packaging","Parents" => [{"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Ix" => 0,"Differs" => 32}],"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d"} 1512s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 1512s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 1512s git-debrebase = Changelog {"Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7","Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Differs" => 16}],"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c"} 1512s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 1512s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 1512s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 1512s git-debrebase = Anchor {"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f","Type" => "Anchor","OrigParents" => [{"Ix" => 1,"CommitId" => "66a3bee9268301791962706795caa60e43481066","Differs" => 48}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree e25a9ccaea8c77582bbc3db47556fb0300fbc48f\nparent 736955cae59cd46c445b7036fa0b1b7295168fed\nparent 66a3bee9268301791962706795caa60e43481066\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n"} 1512s git-debrebase *** WALK prep done cur=55b85aaf02da2acb5564598e075601e76e1f096a brw 4 upp 6 proc 12 pm -1 1512s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1512s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1512s git-debrebase WALK REBUILD 55b85aaf02da2acb5564598e075601e76e1f096a 13 1512s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1512s git-debrebase WALK BUILD 941a4216b7ef2f3fdf421e01923431465e26009c Debian (rewriting=0) 1512s git-debrebase WALK BUILD fb6ba5e8cbc40f160cdf3331059a51ce85cba55d Debian (rewriting=0) 1512s git-debrebase WALK BUILD 3e8e1c982b31f3cec79728c564089c589983abca Debian (rewriting=0) 1512s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1512s git-debrebase WALK BUILD 362e4afd7b5152332b224def77991b73e6da5b99 Debian (rewriting=1) 1512s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1512s git-debrebase WALK BUILD 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 Upstream (rewriting=1) 1512s git-debrebase WALK BUILD 66a8793ffe06ab8d25c6655e49e36725002677dd Upstream (rewriting=1) 1513s git-debrebase WALK BUILD 97043ef068d57a7c42b6c059654a76088d551621 Upstream (rewriting=1) 1513s git-debrebase WALK BUILD 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 Upstream (rewriting=1) 1513s git-debrebase WALK BUILD 4d81e614bbd890e3b1a5980111084fc69e55267f Upstream (rewriting=1) 1513s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1513s git-debrebase WALK BUILD 362e4afd7b5152332b224def77991b73e6da5b99 Upstream (rewriting=1) 1513s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1513s git-debrebase get_differs ac854cb0e6148212fa4babaf6034485ce5e97644 362e4afd7b5152332b224def77991b73e6da5b99 = 0x4 1513s git-debrebase *** WALK RETURN ac854cb0e6148212fa4babaf6034485ce5e97644 a46c46e4241a0f571c9b29f91b4eea170c6cb5cf 55b85aaf02da2acb5564598e075601e76e1f096a 1513s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1513s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1513s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1513s git-debrebase gbp_pq_export bw a46c46e4241a0f571c9b29f91b4eea170c6cb5cf ac854cb0e6148212fa4babaf6034485ce5e97644 1513s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1513s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1513s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1513s git-debrebase get_differs 362e4afd7b5152332b224def77991b73e6da5b99 cd6873f904a1ce4635141d1c0181ef76fd2a35ef = 0xc 1513s 1513s git-debrebase: error: Patch export produced patch amendments (abandoned output commit cd6873f904a1ce4635141d1c0181ef76fd2a35ef). Try laundering first. 1513s + local 'ps=7 0' 1513s + set -o pipefail 1513s + case $ps in 1513s + t-grep-mpat 'Patch export produced patch amendments' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1513s + local 'mpat=Patch export produced patch amendments' 1513s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1513s + local grepper=fgrep 1513s + case "$mpat" in 1513s + fgrep -e 'Patch export produced patch amendments' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1513s git-debrebase: error: Patch export produced patch amendments (abandoned output commit cd6873f904a1ce4635141d1c0181ef76fd2a35ef). Try laundering first. 1513s + t-dgit -wgf quilt-fixup 1513s + local dgit=dgit 1513s + pwd 1513s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1513s + : ' 1513s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1513s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf quilt-fixup 1513s | git rev-parse --show-toplevel 1513s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1513s | git config -z --get-regexp --local '.*' 1513s | git config -z --get-regexp --local '.*' 1513s | git config -z --get-regexp --global '.*' 1513s | git config -z --get-regexp --system '.*' 1513s format 3.0 (quilt), quilt mode linear 1513s Format `3.0 (quilt)', need to check/update patch stack 1513s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1513s => `' 1513s + git diff --quiet HEAD 1513s + git clean -xdff 1513s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1513s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1513s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1513s | git rev-parse 'HEAD~0' 1513s => `362e4afd7b5152332b224def77991b73e6da5b99' 1513s | git symbolic-ref -q HEAD 1513s => `refs/heads/master' 1513s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1513s CD work 1513s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1513s + git reset -q --hard 362e4afd7b5152332b224def77991b73e6da5b99 1513s examining quilt state (multiple patches, linear mode) 1513s branch_is_gdr 362e4afd7b5152332b224def77991b73e6da5b99... 1513s branch_is_gdr 4d81e614bbd890e3b1a5980111084fc69e55267f ?-patches NO 1513s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 1513s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1513s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 1513s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1513s CD fake 1513s | find -name .git -prune -print0 1513s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1513s + git checkout -f 362e4afd7b5152332b224def77991b73e6da5b99 -- debian 1513s + git add -Af . 1513s | git write-tree 1513s => `09965de93e9f4920b07fcb0c768d7cce2741bbfc' 1513s fake orig tree object 09965de93e9f4920b07fcb0c768d7cce2741bbfc 1513s CD .. 1513s + git reset -q --hard 362e4afd7b5152332b224def77991b73e6da5b99 1513s CD ../fake 1513s + git add -Af . 1513s | git write-tree 1513s => `365dbf6ec5ca40479aa9a59654c77e2898003a8a' 1513s fake o+d/p tree object 09965de93e9f4920b07fcb0c768d7cce2741bbfc 1513s CD ../work 1513s | git ls-tree --name-only -z 362e4afd7b5152332b224def77991b73e6da5b99 1513s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1513s | git diff-tree -z --no-renames -r 09965de93e9f4920b07fcb0c768d7cce2741bbfc 362e4afd7b5152332b224def77991b73e6da5b99 1513s => `: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' 1513s quiltify_trees_differ 09965de93e9f4920b07fcb0c768d7cce2741bbfc 362e4afd7b5152332b224def77991b73e6da5b99 => 1 1513s | git diff-tree -z --no-renames --name-only -r 362e4afd7b5152332b224def77991b73e6da5b99 365dbf6ec5ca40479aa9a59654c77e2898003a8a 1513s => `src.c\x00' 1513s quiltify_trees_differ 362e4afd7b5152332b224def77991b73e6da5b99 365dbf6ec5ca40479aa9a59654c77e2898003a8a => 1 1513s | git diff-tree -z --no-renames --name-only -r 09965de93e9f4920b07fcb0c768d7cce2741bbfc 365dbf6ec5ca40479aa9a59654c77e2898003a8a 1513s => `lib.c\x00new-upstream-file\x00src.c\x00' 1513s quiltify_trees_differ 09965de93e9f4920b07fcb0c768d7cce2741bbfc 365dbf6ec5ca40479aa9a59654c77e2898003a8a => 1 1513s differences @dl ## ## ## == == ==. 1513s dgit: base trees orig=09965de93e9f4920b07f o+d/p=365dbf6ec5ca40479aa9 1513s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1513s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1513s starting quiltify (multiple patches, linear mode) 1513s | git ls-tree --name-only 362e4afd7b5152332b224def77991b73e6da5b99 -- debian/rules debian/control 1513s => `debian/control'... 1513s quiltify investigate 362e4afd7b5152332b224def77991b73e6da5b99 1513s | git diff-tree -z --no-renames --name-only 362e4afd7b5152332b224def77991b73e6da5b99 365dbf6ec5ca40479aa9a59654c77e2898003a8a 1513s => `src.c\x00' 1513s quiltify_trees_differ 362e4afd7b5152332b224def77991b73e6da5b99 365dbf6ec5ca40479aa9a59654c77e2898003a8a => 1 1513s | git ls-tree --name-only 362e4afd7b5152332b224def77991b73e6da5b99 -- debian/rules debian/control 1513s => `debian/control'... 1513s | git cat-file commit 362e4afd7b5152332b224def77991b73e6da5b99 1513s => `tree 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466'... 1513s | git diff-tree -z --no-renames --name-only 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 362e4afd7b5152332b224def77991b73e6da5b99 1513s => `debian\x00src.c\x00' 1513s quiltify_trees_differ 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 362e4afd7b5152332b224def77991b73e6da5b99 => 1 1513s considering C=362e4afd7b5152332b224def77991b73e6da5b99 P=94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 1513s | git diff-tree -r --name-only 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 362e4afd7b5152332b224def77991b73e6da5b99 -- debian/patches .pc debian/source/format 1513s => `' 1513s search queue P=94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 NT 1513s quiltify investigate 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 1513s | git diff-tree -z --no-renames --name-only 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 365dbf6ec5ca40479aa9a59654c77e2898003a8a 1513s => `debian\x00' 1513s quiltify_trees_differ 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 365dbf6ec5ca40479aa9a59654c77e2898003a8a => 0 1513s search finished hooray! 1513s quiltify linearisation planning successful, executing... 1513s quiltify traverse 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064..362e4afd7b5152332b224def77991b73e6da5b99 1513s | git cat-file commit 362e4afd7b5152332b224def77991b73e6da5b99 1513s => `tree 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466'... 1513s | git log -n1 '--pretty=format:%aD' 362e4afd7b5152332b224def77991b73e6da5b99 1513s => `Tue, 26 Jun 2018 09:00:06 +0100' 1513s + git checkout -q 362e4afd7b5152332b224def77991b73e6da5b99 1513s + git checkout -q 362e4afd7b5152332b224def77991b73e6da5b99 debian/changelog 1513s | realpath -- /usr/bin/dgit 1513s => `/usr/bin/dgit' 1513s | realpath -- .git/dgit/quilt-description.tmp 1513s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1513s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-for-make-patches-fails-th.patch 1514s dpkg-source: info: using patch list from debian/patches/series 1514s dpkg-source: info: local changes detected, the modified files are: 1514s work/src.c 1514s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-for-make-patches-fails-th.patch 1514s + git checkout -q 362e4afd7b5152332b224def77991b73e6da5b99 debian/changelog 1514s + git checkout -q master 1514s | git status --ignored --porcelain 1514s => ` M debian/patches/series'... 1514s + git add -f debian/patches 1514s Commit Debian 3.0 (quilt) metadata 1514s 1514s [dgit (9.15) quilt-fixup] 1514s 1514s + git commit -m 'Commit Debian 3.0 (quilt) metadata 1514s 1514s [dgit (9.15) quilt-fixup] 1514s ' 1514s [master c710a1b] Commit Debian 3.0 (quilt) metadata 1514s 2 files changed, 16 insertions(+) 1514s create mode 100644 debian/patches/mixed-add-both-for-make-patches-fails-th.patch 1514s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1514s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1514s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1514s ' 1514s + t-refs-same-start 1514s + unset t_ref_val 1514s + t_ref_names=() 1514s + t-ref-head 1514s + local val 1514s ++ git rev-parse HEAD 1514s + val=c710a1b80512661e30182c0525750ab05a5234c9 1514s + t-ref-same-val HEAD c710a1b80512661e30182c0525750ab05a5234c9 1514s + local name=HEAD 1514s + local val=c710a1b80512661e30182c0525750ab05a5234c9 1514s + case "${t_ref_val-unset}" in 1514s + t_ref_val=c710a1b80512661e30182c0525750ab05a5234c9 1514s + t_ref_names+=("$name") 1514s + t-dgit -wg quilt-fixup 1514s + local dgit=dgit 1514s + pwd 1514s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1514s + : ' 1514s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1514s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wg quilt-fixup 1514s | git rev-parse --show-toplevel 1514s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1514s | git config -z --get-regexp --local '.*' 1514s | git config -z --get-regexp --local '.*' 1514s | git config -z --get-regexp --global '.*' 1514s | git config -z --get-regexp --system '.*' 1514s format 3.0 (quilt), quilt mode linear 1514s Format `3.0 (quilt)', need to check/update patch stack 1514s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1514s => `' 1514s + git diff --quiet HEAD 1514s + git clean -xdf 1514s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1514s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1514s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1514s | git rev-parse 'HEAD~0' 1514s => `c710a1b80512661e30182c0525750ab05a5234c9' 1514s | git symbolic-ref -q HEAD 1514s => `refs/heads/master' 1514s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1514s CD work 1514s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1514s + git reset -q --hard c710a1b80512661e30182c0525750ab05a5234c9 1514s examining quilt state (multiple patches, linear mode) 1514s branch_is_gdr c710a1b80512661e30182c0525750ab05a5234c9... 1514s branch_is_gdr 362e4afd7b5152332b224def77991b73e6da5b99 ?-patches NO 1514s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 1514s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1514s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 1514s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1514s CD fake 1514s | find -name .git -prune -print0 1514s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1514s + git checkout -f c710a1b80512661e30182c0525750ab05a5234c9 -- debian 1514s + git add -Af . 1514s | git write-tree 1514s => `793670202969d2d7ebe00db1330b447839034a8a' 1514s fake orig tree object 793670202969d2d7ebe00db1330b447839034a8a 1514s CD .. 1514s + git reset -q --hard c710a1b80512661e30182c0525750ab05a5234c9 1514s CD ../fake 1514s + git add -Af . 1514s | git write-tree 1514s => `fc073848f21adc07cc759d0efb13c667cac986a3' 1514s fake o+d/p tree object 793670202969d2d7ebe00db1330b447839034a8a 1514s CD ../work 1514s | git ls-tree --name-only -z c710a1b80512661e30182c0525750ab05a5234c9 1514s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1514s | git diff-tree -z --no-renames -r 793670202969d2d7ebe00db1330b447839034a8a c710a1b80512661e30182c0525750ab05a5234c9 1514s => `: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' 1514s quiltify_trees_differ 793670202969d2d7ebe00db1330b447839034a8a c710a1b80512661e30182c0525750ab05a5234c9 => 1 1514s | git diff-tree -z --no-renames --name-only -r c710a1b80512661e30182c0525750ab05a5234c9 fc073848f21adc07cc759d0efb13c667cac986a3 1514s => `' 1514s quiltify_trees_differ c710a1b80512661e30182c0525750ab05a5234c9 fc073848f21adc07cc759d0efb13c667cac986a3 => 0 1514s | git diff-tree -z --no-renames --name-only -r 793670202969d2d7ebe00db1330b447839034a8a fc073848f21adc07cc759d0efb13c667cac986a3 1514s => `lib.c\x00new-upstream-file\x00src.c\x00' 1514s quiltify_trees_differ 793670202969d2d7ebe00db1330b447839034a8a fc073848f21adc07cc759d0efb13c667cac986a3 => 1 1514s differences @dl ## ## == == == ==. 1514s dgit: base trees orig=793670202969d2d7ebe0 o+d/p=fc073848f21adc07cc75 1514s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1514s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1514s starting quiltify (multiple patches, linear mode) 1514s | git ls-tree --name-only c710a1b80512661e30182c0525750ab05a5234c9 -- debian/rules debian/control 1514s => `debian/control'... 1514s quiltify investigate c710a1b80512661e30182c0525750ab05a5234c9 1514s | git diff-tree -z --no-renames --name-only c710a1b80512661e30182c0525750ab05a5234c9 fc073848f21adc07cc759d0efb13c667cac986a3 1514s => `' 1514s quiltify_trees_differ c710a1b80512661e30182c0525750ab05a5234c9 fc073848f21adc07cc759d0efb13c667cac986a3 => 0 1514s search finished hooray! 1514s quiltify linearisation planning successful, executing... 1514s + git checkout -q master 1514s | git status --ignored --porcelain 1514s => `?? .pc/'... 1514s nothing quilty to commit, ok. 1514s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1514s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1514s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1514s ' 1514s + t-ref-head 1514s + local val 1514s ++ git rev-parse HEAD 1514s + val=c710a1b80512661e30182c0525750ab05a5234c9 1514s + t-ref-same-val HEAD c710a1b80512661e30182c0525750ab05a5234c9 1514s + local name=HEAD 1514s + local val=c710a1b80512661e30182c0525750ab05a5234c9 1514s + case "${t_ref_val-unset}" in 1514s + t_ref_val=c710a1b80512661e30182c0525750ab05a5234c9 1514s + t_ref_names+=("$name") 1514s + t-ok 1514s + : ======================================== 1514s + t-check-only-bpd 1514s + '[' .. = .. ']' 1514s + return 1514s + t-fscks 1514s + shopt -s nullglob 1514s + for d in $tmp/*/.git $tmp/git/*.git 1514s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1514s + t-git-fsck 1514s ++ git rev-parse --git-dir 1514s + local fsckerrs=.git/dgit-test-fsck.errs 1514s + set +e 1514s + LC_MESSAGES=C 1514s + git fsck --no-dangling --strict 1514s + tee .git/dgit-test-fsck.errs 1514s + ps='0 0' 1514s + set -e 1514s + local pats 1514s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1514s + test '0 0' = '0 0' 1514s + pats+=(-e 'notice: HEAD points to an unborn branch') 1514s + pats+=(-e 'notice: No default references') 1514s + set +e 1514s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1514s + rc=1 1514s + set -e 1514s + case $rc in 1514s + for d in $tmp/*/.git $tmp/git/*.git 1514s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1514s + t-git-fsck 1514s ++ git rev-parse --git-dir 1514s + local fsckerrs=./dgit-test-fsck.errs 1514s + set +e 1514s + LC_MESSAGES=C 1514s + git fsck --no-dangling --strict 1514s + tee ./dgit-test-fsck.errs 1514s notice: HEAD points to an unborn branch (master) 1514s + ps='0 0' 1514s + set -e 1514s + local pats 1514s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1514s + test '0 0' = '0 0' 1514s + pats+=(-e 'notice: HEAD points to an unborn branch') 1514s + pats+=(-e 'notice: No default references') 1514s + set +e 1514s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1514s + rc=1 1514s + set -e 1514s + case $rc in 1514s + t-save-artifacts 1514s + artifacts=/tmp/autopkgtest.XK8uun/gdr-makepatches7-artifacts 1514s + '[' x/tmp/autopkgtest.XK8uun/gdr-makepatches7-artifacts = x ']' 1514s + '[' xtmp = x ']' 1514s + GZIP=-1v 1514s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-makepatches7-artifacts/gdr-makepatches7.tar.gz '--exclude=*.tar' . 1514s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1514s 80.6% 1514s + echo ok. 1514s ok. 1514s + rc=0 1514s + set +x 1514s + set +e 1514s + pwd 1514s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1514s + '[' x '!=' x ']' 1514s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1514s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1514s + set -e 1514s + test 0 = 0 1515s autopkgtest [23:12:25]: test gdr-makepatches7: -----------------------] 1515s gdr-makepatches7 PASS 1515s autopkgtest [23:12:25]: test gdr-makepatches7: - - - - - - - - - - results - - - - - - - - - - 1516s autopkgtest [23:12:26]: test gdr-merge: preparing testbed 1516s Reading package lists... 1516s Building dependency tree... 1516s Reading state information... 1516s Starting pkgProblemResolver with broken count: 0 1516s Starting 2 pkgProblemResolver with broken count: 0 1516s Done 1517s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1518s autopkgtest [23:12:28]: test gdr-merge: [----------------------- 1518s ++ set -o pipefail 1518s ++ . tests/lib-core 1518s ++ . tests/lib-restricts 1518s ++ trap ' 1518s rc=$? 1518s set +x 1518s test $rc = 0 || echo " 1518s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1518s 1518s Most relevant logs are just before assignment rc=$rc 1518s Will now do cleanup etc. 1518s " 1518s set -x 1518s set +e 1518s pwd 1518s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1518s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1518s set -e 1518s test $rc = 0 || t-report-failure 1518s ' EXIT 1518s ++ t-filter-out-git-hyphen-dir 1518s ++ local pathent 1518s +++ type -p git-rev-parse 1518s +++ : 1518s ++ pathent= 1518s ++ case "$pathent" in 1518s ++ return 1518s ++ t-set-intree 1518s ++ '[' x = x ']' 1518s ++ return 1518s ++ : -D 1518s ++ export DGIT_TEST_DEBUG 1518s ++ : x 1518s ++ export DGIT_TEST_DEBPUSH_DEBUG 1518s ++ : 1518s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1518s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1518s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1518s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1518s ++ export LC_CTYPE=C.UTF-8 1518s ++ LC_CTYPE=C.UTF-8 1518s ++ unset CDPATH 1518s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1518s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1518s +++ pwd 1518s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1518s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1518s ++ testname=gdr-merge 1518s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1518s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1518s ++ bpd=.. 1518s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1518s ++ '[' x '!=' x ']' 1518s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s +++ pwd 1518s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ t-set-using-tmp 1518s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1518s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1518s ++ export 'DEBFULLNAME=dgit test git user' 1518s ++ DEBFULLNAME='dgit test git user' 1518s ++ git config --global user.email dgit-test@debian.example.net 1518s ++ git config --global user.name 'dgit test git user' 1518s ++ git config --global protocol.ext.allow always 1518s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1518s ++ env -0 1518s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1518s ++ export DEBCHANGE_VENDOR=dpkg 1518s ++ DEBCHANGE_VENDOR=dpkg 1518s ++ unset VISUAL 1518s ++ unset GIT_EDITOR 1518s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1518s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1518s ++ cat 1518s ++ schroot=build 1518s ++ : aq 1518s ++ : archive/test-dummy 1518s ++ : sid:unstable 1518s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1518s ++ git config --global dgit.default.old-dsc-distro test-dummy 1518s + t-dependencies GDR 1518s + : 'Hopefully installed: GDR' 1518s + t-tstunt-parsechangelog 1518s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1518s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s + local var=PATH 1518s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s + eval ' 1518s case "$PATH" in 1518s "$tstunt:"*) ;; 1518s *":$tstunt:"*) ;; 1518s "") PATH="$tstunt" ;; 1518s *) PATH="$tstunt:$PATH" ;; 1518s esac 1518s export PATH 1518s ' 1518s ++ case "$PATH" in 1518s ++ PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s ++ export PATH 1518s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s + local var=PERLLIB 1518s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s + eval ' 1518s case "$PERLLIB" in 1518s "$tstunt:"*) ;; 1518s *":$tstunt:"*) ;; 1518s "") PERLLIB="$tstunt" ;; 1518s *) PERLLIB="$tstunt:$PERLLIB" ;; 1518s esac 1518s export PERLLIB 1518s ' 1518s ++ case "$PERLLIB" in 1518s ++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ export PERLLIB 1518s + local f 1518s + for f in "$@" 1518s + t-tstunt--save-real dpkg-parsechangelog 1518s + local f=dpkg-parsechangelog 1518s + case "$f" in 1518s + local rc 1518s + local real 1518s + set +e 1518s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1518s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1518s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s ++ type -p dpkg-parsechangelog 1518s + real=/usr/bin/dpkg-parsechangelog 1518s + rc=0 1518s + set -e 1518s + case $rc in 1518s + local varname=dpkg_parsechangelog 1518s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1518s + eval ' 1518s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1518s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1518s ' 1518s ++ : /usr/bin/dpkg-parsechangelog 1518s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1518s + f=./dpkg-parsechangelog 1518s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1518s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1518s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1518s + for f in "$@" 1518s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 1518s + local f=Dpkg/Changelog/Parse.pm 1518s + case "$f" in 1518s + return 1518s + f=./Dpkg/Changelog/Parse.pm 1518s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1518s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1518s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1518s + t-setup-import gdr-convert-gbp-noarchive 1518s + local setupname=gdr-convert-gbp-noarchive 1518s + local setupsrc 1518s + local lock 1518s + '[' x = x ']' 1518s + setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s + lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1518s + local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1518s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 1518s + with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1518s cd "$1"; shift 1518s setupname="$1"; shift 1518s simport="$1"; shift 1518s if [ -e "$simport" ]; then exit 0; fi 1518s env - "$@" \ 1518s "tests/setup/$setupname" 1518s ' x /tmp/autopkgtest.XK8uun/build.980/src gdr-convert-gbp-noarchive /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1518s + cd /tmp/autopkgtest.XK8uun/build.980/src 1518s + shift 1518s + setupname=gdr-convert-gbp-noarchive 1518s + shift 1518s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1518s + shift 1518s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 1518s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-merge-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-merge-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-merge-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-merge -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-merge' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-merge-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gdr-convert-gbp-noarchive 1518s ++ set -o pipefail 1518s ++ . tests/lib-core 1518s ++ . tests/lib-restricts 1518s ++ trap ' 1518s rc=$? 1518s set +x 1518s test $rc = 0 || echo " 1518s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1518s 1518s Most relevant logs are just before assignment rc=$rc 1518s Will now do cleanup etc. 1518s " 1518s set -x 1518s set +e 1518s pwd 1518s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1518s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1518s set -e 1518s test $rc = 0 || t-report-failure 1518s ' EXIT 1518s ++ t-filter-out-git-hyphen-dir 1518s ++ local pathent 1518s +++ type -p git-rev-parse 1518s +++ : 1518s ++ pathent= 1518s ++ case "$pathent" in 1518s ++ return 1518s ++ t-set-intree 1518s ++ '[' x = x ']' 1518s ++ return 1518s ++ : -D 1518s ++ export DGIT_TEST_DEBUG 1518s ++ : x 1518s ++ export DGIT_TEST_DEBPUSH_DEBUG 1518s ++ : 1518s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1518s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1518s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1518s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1518s ++ export LC_CTYPE=C.UTF-8 1518s ++ LC_CTYPE=C.UTF-8 1518s ++ unset CDPATH 1518s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1518s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1518s +++ pwd 1518s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1518s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1518s ++ testname=gdr-convert-gbp-noarchive 1518s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1518s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1518s ++ bpd=.. 1518s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1518s ++ '[' x '!=' x ']' 1518s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s +++ pwd 1518s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ t-set-using-tmp 1518s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1518s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1518s ++ export 'DEBFULLNAME=dgit test git user' 1518s ++ DEBFULLNAME='dgit test git user' 1518s ++ git config --global user.email dgit-test@debian.example.net 1518s ++ git config --global user.name 'dgit test git user' 1518s ++ git config --global protocol.ext.allow always 1518s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1518s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1518s ++ export DEBCHANGE_VENDOR=dpkg 1518s ++ DEBCHANGE_VENDOR=dpkg 1518s ++ unset VISUAL 1518s ++ unset GIT_EDITOR 1518s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1518s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1518s ++ cat 1518s ++ schroot=build 1518s ++ : aq 1518s ++ : archive/test-dummy 1518s ++ : sid:unstable 1518s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1518s ++ git config --global dgit.default.old-dsc-distro test-dummy 1518s + . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1518s ++ : -D 1518s ++ export GDR_TEST_DEBUG 1518s ++ t-tstunt debchange 1518s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ local var=PATH 1518s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ eval ' 1518s case "$PATH" in 1518s "$tstunt:"*) ;; 1518s *":$tstunt:"*) ;; 1518s "") PATH="$tstunt" ;; 1518s *) PATH="$tstunt:$PATH" ;; 1518s esac 1518s export PATH 1518s ' 1518s +++ case "$PATH" in 1518s +++ PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s +++ export PATH 1518s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ local var=PERLLIB 1518s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ eval ' 1518s case "$PERLLIB" in 1518s "$tstunt:"*) ;; 1518s *":$tstunt:"*) ;; 1518s "") PERLLIB="$tstunt" ;; 1518s *) PERLLIB="$tstunt:$PERLLIB" ;; 1518s esac 1518s export PERLLIB 1518s ' 1518s +++ case "$PERLLIB" in 1518s +++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s +++ export PERLLIB 1518s ++ local f 1518s ++ for f in "$@" 1518s ++ t-tstunt--save-real debchange 1518s ++ local f=debchange 1518s ++ case "$f" in 1518s ++ local rc 1518s ++ local real 1518s ++ set +e 1518s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1518s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1518s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s +++ type -p debchange 1518s ++ real=/usr/bin/debchange 1518s ++ rc=0 1518s ++ set -e 1518s ++ case $rc in 1518s ++ local varname=debchange 1518s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1518s ++ eval ' 1518s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1518s export DGIT_TEST_REAL_DEBCHANGE 1518s ' 1518s +++ : /usr/bin/debchange 1518s +++ export DGIT_TEST_REAL_DEBCHANGE 1518s ++ f=./debchange 1518s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1518s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1518s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1518s + t-dependencies GDR 1518s + : 'Hopefully installed: GDR' 1518s + export ifarchive=: 1518s + ifarchive=: 1518s + t-chain-test gdr-convert-gbp 1518s + t-chain-test-somehow 1518s + export DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 1518s + DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 1518s + export DGIT_TEST_TMPBASE= 1518s + DGIT_TEST_TMPBASE= 1518s + export ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s + ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s + local ct=gdr-convert-gbp 1518s + local d=tests/setup 1518s + cd /tmp/autopkgtest.XK8uun/build.980/src 1518s + exec tests/setup/gdr-convert-gbp 1518s ++ set -o pipefail 1518s ++ . tests/lib-core 1518s ++ . tests/lib-restricts 1518s ++ trap ' 1518s rc=$? 1518s set +x 1518s test $rc = 0 || echo " 1518s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1518s 1518s Most relevant logs are just before assignment rc=$rc 1518s Will now do cleanup etc. 1518s " 1518s set -x 1518s set +e 1518s pwd 1518s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1518s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1518s set -e 1518s test $rc = 0 || t-report-failure 1518s ' EXIT 1518s ++ t-filter-out-git-hyphen-dir 1518s ++ local pathent 1518s +++ type -p git-rev-parse 1518s +++ : 1518s ++ pathent= 1518s ++ case "$pathent" in 1518s ++ return 1518s ++ t-set-intree 1518s ++ '[' x = x ']' 1518s ++ return 1518s ++ : -D 1518s ++ export DGIT_TEST_DEBUG 1518s ++ : x 1518s ++ export DGIT_TEST_DEBPUSH_DEBUG 1518s ++ : 1518s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1518s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1518s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1518s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1518s ++ export LC_CTYPE=C.UTF-8 1518s ++ LC_CTYPE=C.UTF-8 1518s ++ unset CDPATH 1518s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1518s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1518s +++ pwd 1518s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1518s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1518s ++ testname=gdr-convert-gbp-noarchive 1518s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1518s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1518s ++ bpd=.. 1518s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1518s ++ '[' x '!=' x ']' 1518s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s +++ pwd 1518s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ t-set-using-tmp 1518s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1518s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1518s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1518s ++ export 'DEBFULLNAME=dgit test git user' 1518s ++ DEBFULLNAME='dgit test git user' 1518s ++ git config --global user.email dgit-test@debian.example.net 1518s ++ git config --global user.name 'dgit test git user' 1518s ++ git config --global protocol.ext.allow always 1518s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1518s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1518s ++ export DEBCHANGE_VENDOR=dpkg 1518s ++ DEBCHANGE_VENDOR=dpkg 1518s ++ unset VISUAL 1518s ++ unset GIT_EDITOR 1518s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1518s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1518s ++ cat 1518s ++ schroot=build 1518s ++ : aq 1518s ++ : archive/test-dummy 1518s ++ : sid:unstable 1518s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1518s ++ git config --global dgit.default.old-dsc-distro test-dummy 1518s + . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1518s ++ : -D 1518s ++ export GDR_TEST_DEBUG 1518s ++ t-tstunt debchange 1518s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ local var=PATH 1518s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ eval ' 1518s case "$PATH" in 1518s "$tstunt:"*) ;; 1518s *":$tstunt:"*) ;; 1518s "") PATH="$tstunt" ;; 1518s *) PATH="$tstunt:$PATH" ;; 1518s esac 1518s export PATH 1518s ' 1518s +++ case "$PATH" in 1518s +++ export PATH 1518s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ local var=PERLLIB 1518s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s ++ eval ' 1518s case "$PERLLIB" in 1518s "$tstunt:"*) ;; 1518s *":$tstunt:"*) ;; 1518s "") PERLLIB="$tstunt" ;; 1518s *) PERLLIB="$tstunt:$PERLLIB" ;; 1518s esac 1518s export PERLLIB 1518s ' 1518s +++ case "$PERLLIB" in 1518s +++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s +++ export PERLLIB 1518s ++ local f 1518s ++ for f in "$@" 1518s ++ t-tstunt--save-real debchange 1518s ++ local f=debchange 1518s ++ case "$f" in 1518s ++ local rc 1518s ++ local real 1518s ++ set +e 1518s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1518s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1518s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s +++ type -p debchange 1518s ++ real=/usr/bin/debchange 1518s ++ rc=0 1518s ++ set -e 1518s ++ case $rc in 1518s ++ local varname=debchange 1518s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1518s ++ eval ' 1518s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1518s export DGIT_TEST_REAL_DEBCHANGE 1518s ' 1518s +++ : /usr/bin/debchange 1518s +++ export DGIT_TEST_REAL_DEBCHANGE 1518s ++ f=./debchange 1518s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1518s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1518s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1518s + : t-setup-import gnupg 1518s + t-dependencies GDR 1518s + : 'Hopefully installed: GDR' 1518s + t-tstunt-parsechangelog 1518s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1518s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s + t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s + local var=PATH 1518s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s + eval ' 1518s case "$PATH" in 1518s "$tstunt:"*) ;; 1518s *":$tstunt:"*) ;; 1518s "") PATH="$tstunt" ;; 1518s *) PATH="$tstunt:$PATH" ;; 1518s esac 1518s export PATH 1518s ' 1518s ++ case "$PATH" in 1518s ++ export PATH 1518s + t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s + local var=PERLLIB 1518s + local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1518s + eval ' 1518s case "$PERLLIB" in 1518s "$tstunt:"*) ;; 1518s *":$tstunt:"*) ;; 1518s "") PERLLIB="$tstunt" ;; 1518s *) PERLLIB="$tstunt:$PERLLIB" ;; 1518s esac 1518s export PERLLIB 1518s ' 1518s ++ case "$PERLLIB" in 1518s ++ export PERLLIB 1518s + local f 1518s + for f in "$@" 1518s + t-tstunt--save-real dpkg-parsechangelog 1518s + local f=dpkg-parsechangelog 1518s + case "$f" in 1518s + local rc 1518s + local real 1518s + set +e 1518s ++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1518s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1518s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1518s ++ type -p dpkg-parsechangelog 1518s + real=/usr/bin/dpkg-parsechangelog 1518s + rc=0 1518s + set -e 1518s + case $rc in 1518s + local varname=dpkg_parsechangelog 1518s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1518s + eval ' 1518s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1518s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1518s ' 1518s ++ : /usr/bin/dpkg-parsechangelog 1518s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1518s + f=./dpkg-parsechangelog 1518s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1518s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1518s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1518s + for f in "$@" 1518s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 1518s + local f=Dpkg/Changelog/Parse.pm 1518s + case "$f" in 1518s + return 1518s + f=./Dpkg/Changelog/Parse.pm 1518s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1518s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1518s + ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1518s + t-gdr-gbp-import-core-with-queue 1518s + t-gdr-gbp-import-core 1518s + p=example 1518s + t-worktree 1.1 1518s + rm -rf example 1518s + t-untar /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1 1518s + local tarfile=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 1518s + local edittree=/tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 1518s + test -d /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.edit 1518s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/worktrees/example_1.1.tar 1518s + cd example 1518s + : 'fake up some kind of upstream' 1518s + git checkout -b upstream quilt-tip 1518s Switched to a new branch 'upstream' 1518s + rm -rf debian 1518s + mkdir debian 1518s + echo junk 1518s + git add debian 1518s + git commit -m 'an upstream retcon (/tmp/autopkgtest.XK8uun/build.980/src/tests/setup/gdr-convert-gbp)' 1518s [upstream 101731a] an upstream retcon (/tmp/autopkgtest.XK8uun/build.980/src/tests/setup/gdr-convert-gbp) 1518s 6 files changed, 1 insertion(+), 36 deletions(-) 1518s delete mode 100644 debian/changelog 1518s delete mode 100644 debian/compat 1518s delete mode 100644 debian/control 1518s delete mode 100644 debian/example.install 1518s mode change 100755 => 100644 debian/rules 1518s delete mode 100644 debian/source/format 1518s + git tag v1.0 1518s + : 'fake up that our quilt-tip was descended from upstream' 1518s + git checkout quilt-tip 1518s Switched to branch 'quilt-tip' 1518s + git merge --no-edit -s ours upstream 1518s Merge made by the 'ours' strategy. 1518s + : 'fake up that our quilt-tip had the patch queue in it' 1518s + git checkout patch-queue/quilt-tip 1518s Switched to branch 'patch-queue/quilt-tip' 1518s + gbp pq export 1518s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1518s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1518s + git add debian/patches 1518s + git commit -m 'patch queue update (/tmp/autopkgtest.XK8uun/build.980/src/tests/setup/gdr-convert-gbp)' 1518s [quilt-tip d3d7160] patch queue update (/tmp/autopkgtest.XK8uun/build.980/src/tests/setup/gdr-convert-gbp) 1518s 4 files changed, 50 insertions(+) 1518s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1518s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1518s create mode 100644 debian/patches/series 1518s create mode 100644 debian/patches/subdir/addnewups 1518s + : 'make branch names more conventional' 1518s + git branch -D master 1518s Deleted branch master (was 17d67db). 1518s + git branch -m quilt-tip master 1518s + not-gdr-processable origin 1518s + git branch gdr-unprocessable/origin 1518s + grep 'Unknown Unprocessable' 1518s + t-git-debrebase analyse 1518s + local gdr=git-debrebase 1518s + : ' 1518s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1518s + git-debrebase --dgit=dgit -D analyse 1518s git-debrebase *** WALK d3d716010fa7116099e2ff3d6afbeca9de2ffffe 1 *main::STDOUT 1518s git-debrebase get_differs 0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1518s git-debrebase classify d3d716010fa7116099e2ff3d6afbeca9de2ffffe $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e/0x4 1518s git-debrebase = AddPatches {"Type" => "AddPatches","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "patch queue update (/tmp/autopkgtest.XK8uun/build.980/src/tests/setup/gdr-convert-gbp)\n","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e"}],"CommitId" => "d3d716010fa7116099e2ff3d6afbeca9de2ffffe"} 1518s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1518s git-debrebase get_differs 101731a4c108d62fe75ded3bf72c0dd6359ca8f9 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1518s git-debrebase classify 0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 101731a4c108d62fe75ded3bf72c0dd6359ca8f9/0x30 1518s git-debrebase = Pseudomerge {"Contributor" => {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0,"Ix" => 0},"Overwritten" => [{"Ix" => 1,"CommitId" => "101731a4c108d62fe75ded3bf72c0dd6359ca8f9","Differs" => 48}],"CommitId" => "0d658dbcaf793a5e91e28258fe6f66ef96c8ca6e","Msg" => "Merge branch 'upstream' into quilt-tip\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Pseudomerge","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent 101731a4c108d62fe75ded3bf72c0dd6359ca8f9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1518s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1518s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1518s git-debrebase = Upstream {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Upstream","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"Msg" => "Add *.o to .gitignore\n"} 1518s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1518s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1518s 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"} 1518s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1518s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1518s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Msg" => "echo EXAMPLE RULES TARGET\n","Parents" => [{"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0}],"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"} 1518s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1518s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1518s git-debrebase = Packaging {"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","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"} 1518s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1518s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1518s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Msg" => "WIP\n","Type" => "Packaging","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"} 1518s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1518s git-debrebase ** Unknown 1518s git-debrebase *** WALK BOMB unrecognised 1518s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1518s ' 1518s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1518s + : 'fake up an upstream 2.0' 1518s + git branch make-upstream upstream 1518s + t-make-new-upstream-tarball 2.0 1518s + local uv=2.0 1518s + git checkout make-upstream 1518s Switched to branch 'make-upstream' 1518s + echo 'upstream 2.0' 1518s + git commit -a -m 'upstream 2.0 tarball' 1518s [make-upstream e7e08e1] upstream 2.0 tarball 1518s 1 file changed, 1 insertion(+) 1518s + t-make-orig example 2.0 make-upstream 1518s + local p=example 1518s + local v=2.0 1518s + local tag=make-upstream 1518s + ust=example_2.0.orig.tar.gz 1518s + GZIP=-1 1518s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1518s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1518s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1518s + git branch -D quilt-tip-2 1518s Deleted branch quilt-tip-2 (was 99fcab4). 1518s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1518s + git branch -D gitish-only 1518s Deleted branch gitish-only (was 2b2ddc8). 1518s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1518s + git branch -D quilt-tip-1.1 1518s Deleted branch quilt-tip-1.1 (was 7fc34be). 1518s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1518s + git branch -D patch-queue/quilt-tip 1518s Deleted branch patch-queue/quilt-tip (was d843a68). 1518s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1518s + git branch -D indep-arch 1518s Deleted branch indep-arch (was e215729). 1518s + : 'see what gbp import-orig does' 1518s + git checkout master 1518s Switched to branch 'master' 1518s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1519s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1519s gbp:info: Source package is example 1519s gbp:info: Upstream version is 2.0 1519s gbp:info: Replacing upstream source on 'master' 1519s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1519s + not-gdr-processable merge 1519s + git branch gdr-unprocessable/merge 1519s + grep 'Unknown Unprocessable' 1519s + t-git-debrebase analyse 1519s + local gdr=git-debrebase 1519s + : ' 1519s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1519s + git-debrebase --dgit=dgit -D analyse 1519s git-debrebase *** WALK 4555cdb5af42b5f82cc064047e98864c40ebc7f1 1 *main::STDOUT 1519s git-debrebase get_differs d3d716010fa7116099e2ff3d6afbeca9de2ffffe 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1519s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1519s git-debrebase classify 4555cdb5af42b5f82cc064047e98864c40ebc7f1 $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p d3d716010fa7116099e2ff3d6afbeca9de2ffffe/0x2 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x34 1519s git-debrebase ** Unknown 1519s git-debrebase *** WALK BOMB unrecognised 1519s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1519s ' 1519s 4555cdb5af42b5f82cc064047e98864c40ebc7f1 Unknown Unprocessable (general two-parent merge) 1519s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1519s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1519s + DEBEMAIL=dgit-tests@example.org 1519s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1519s + 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) 1519s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1519s [master 56357ce] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1519s 1 file changed, 6 insertions(+) 1519s + t-dch-commit-r 1519s + t-dch-r-rune t-dch-commit 1519s + local cmd=t-dch-commit 1519s + shift 1519s + local suite=unstable 1519s + t-dch-commit -r -D unstable '' 1519s + t-debchange -r -D unstable '' 1519s + DEBEMAIL=dgit-tests@example.org 1519s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1519s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1519s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1519s libdistro-info-perl is not installed, Debian release names are not known. 1519s libdistro-info-perl is not installed, Ubuntu release names are not known. 1519s + git commit -m 'dch -r -D unstable ' debian/changelog 1519s [master 837f4d5] dch -r -D unstable 1519s 1 file changed, 3 insertions(+), 2 deletions(-) 1519s + echo garbage 1519s + git add debian/patches/garbage 1519s + git commit -m 'add garbage' debian/patches/garbage 1519s [master 26e401e] add garbage 1519s 1 file changed, 1 insertion(+) 1519s create mode 100644 debian/patches/garbage 1519s + : t-archive-none example 1519s + : t-git-none 1519s + : t-dgit -wgf --gbp push-source --new 1519s + t-salsa-add-remote 1519s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1519s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1519s + set -e 1519s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1519s + git init --bare 1519s hint: Using 'master' as the name for the initial branch. This default branch name 1519s hint: is subject to change. To configure the initial branch name to use in all 1519s hint: of your new repositories, which will suppress this warning, call: 1519s hint: 1519s hint: git config --global init.defaultBranch 1519s hint: 1519s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1519s hint: 'development'. The just-created branch can be renamed via this command: 1519s hint: 1519s hint: git branch -m 1519s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example/ 1519s + git remote add origin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1519s + git push --set-upstream origin master 1519s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1519s * [new branch] master -> master 1519s Branch 'master' set up to track remote branch 'master' from 'origin'. 1519s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1519s + local 'mpat=E:identical in upstream files' 1519s + shift 1519s + set +o pipefail 1519s + LC_MESSAGES=C 1519s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1519s + LANGUAGE=C 1519s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1519s + local gdr=git-debrebase 1519s + : ' 1519s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1519s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1519s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1519s git-debrebase get_differs 101731a4c108d62fe75ded3bf72c0dd6359ca8f9 26e401e95afe770893348b725b7408b793ce2867 = 0x36 1519s docs/README | 1 + 1519s 1 file changed, 1 insertion(+) 1519s 1519s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1519s git-debrebase: identical in upstream files. See diffstat above, or run 1519s git-debrebase: git diff 101731a4c108d62fe75ded3bf72c0dd6359ca8f9 HEAD -- :!/debian :/ 1519s + local 'ps=255 0' 1519s + set -o pipefail 1519s + case $ps in 1519s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1519s + local 'mpat=E:identical in upstream files' 1519s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1519s + local grepper=fgrep 1519s + case "$mpat" in 1519s + case "$mpat" in 1519s + grepper=egrep 1519s + mpat='identical in upstream files' 1519s + egrep -e 'identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1519s git-debrebase: identical in upstream files. See diffstat above, or run 1519s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1519s + local 'mpat=E:Unused patch file garbage will be discarded' 1519s + shift 1519s + set +o pipefail 1519s + LC_MESSAGES=C 1519s + LANGUAGE=C 1519s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1519s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1519s + local gdr=git-debrebase 1519s + : ' 1519s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1519s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1519s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1519s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 26e401e95afe770893348b725b7408b793ce2867 = 0x34 1519s git-debrebase: snag ignored (-fupstream-has-debian): upstream (c503a3d8e91a8fe38919c1795f29cacc3a671c3e) contains debian/ directory 1519s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1519s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1519s $VAR2 = bless( do{\(my $o = { 1519s 'name' => 'debian/changelog, entry no.1', 1519s 'allow_duplicate' => 0, 1519s 'fields' => { 1519s 'Source' => 'example', 1519s 'Version' => '2.0-1', 1519s 'Distribution' => 'unstable', 1519s 'Urgency' => 'medium', 1519s 'Maintainer' => 'dgit test git user ', 1519s 'Timestamp' => '1530000000', 1519s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1519s 'Changes' => ' 1519s example (2.0-1) unstable; urgency=medium 1519s 1519s [ Ian Jackson ] 1519s * new upstream (did gbp import-orig)' 1519s }, 1519s 'in_order' => [ 1519s 'Source', 1519s 'Version', 1519s 'Distribution', 1519s 'Urgency', 1519s 'Maintainer', 1519s 'Timestamp', 1519s 'Date', 1519s 'Changes' 1519s ], 1519s 'out_order' => [], 1519s 'allow_pgp' => 1, 1519s 'drop_empty' => 0, 1519s 'is_pgp_signed' => 0, 1519s 'keep_duplicate' => 0 1519s })}, 'Dpkg::Control::Hash' ); 1519s last finished-looking changelog entry: (2.0-1) unstable 1519s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 1519s Failed to stitch in dgit view (see messages above). 1519s dgit --overwrite will be needed on the first dgit push after conversion. 1519s git-debrebase: snags: 1 overriden by individual -f options 1519s 1519s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1519s + local 'ps=255 0' 1519s + set -o pipefail 1519s + case $ps in 1519s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1519s + local 'mpat=E:Unused patch file garbage will be discarded' 1519s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1519s + local grepper=fgrep 1519s + case "$mpat" in 1519s + case "$mpat" in 1519s + grepper=egrep 1519s + mpat='Unused patch file garbage will be discarded' 1519s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1519s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1519s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1519s + local gdr=git-debrebase 1519s + : ' 1519s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1519s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1519s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1519s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 26e401e95afe770893348b725b7408b793ce2867 = 0x34 1519s git-debrebase: snag ignored (-fupstream-has-debian): upstream (c503a3d8e91a8fe38919c1795f29cacc3a671c3e) contains debian/ directory 1519s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1519s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1519s $VAR2 = bless( do{\(my $o = { 1519s 'in_order' => [ 1519s 'Source', 1519s 'Version', 1519s 'Distribution', 1519s 'Urgency', 1519s 'Maintainer', 1519s 'Timestamp', 1519s 'Date', 1519s 'Changes' 1519s ], 1519s 'keep_duplicate' => 0, 1519s 'is_pgp_signed' => 0, 1519s 'allow_duplicate' => 0, 1519s 'drop_empty' => 0, 1519s 'fields' => { 1519s 'Source' => 'example', 1519s 'Version' => '2.0-1', 1519s 'Distribution' => 'unstable', 1519s 'Urgency' => 'medium', 1519s 'Maintainer' => 'dgit test git user ', 1519s 'Timestamp' => '1530000000', 1519s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1519s 'Changes' => ' 1519s example (2.0-1) unstable; urgency=medium 1519s 1519s [ Ian Jackson ] 1519s * new upstream (did gbp import-orig)' 1519s }, 1519s 'name' => 'debian/changelog, entry no.1', 1519s 'out_order' => [], 1519s 'allow_pgp' => 1 1519s })}, 'Dpkg::Control::Hash' ); 1519s last finished-looking changelog entry: (2.0-1) unstable 1519s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 1519s Failed to stitch in dgit view (see messages above). 1519s dgit --overwrite will be needed on the first dgit push after conversion. 1519s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1519s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1519s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1520s gbp:info: Trying to apply patches at '26e401e95afe770893348b725b7408b793ce2867' 1520s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1520s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1520s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1520s git-debrebase ffq check_specs * 1520s git-debrebase ffq merge master 1520s git-debrebase ffq check_remote origin remote fetch/merge branch 1520s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1520s OK, you are ahead of refs/remotes/origin/master 1520s git-debrebase ffq check_remote undef remote push branch 1520s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1520s git-debrebase: snags: 2 overriden by individual -f options 1520s git-debrebase >= update refs/debrebase-last/heads/master 666ace228974ec35effb8cb4bd8ac8db3883a287 0000000000000000000000000000000000000000 1520s git-debrebase >= update HEAD 666ace228974ec35effb8cb4bd8ac8db3883a287 26e401e95afe770893348b725b7408b793ce2867 1520s git-debrebase >$ 1520s HEAD is now at 666ace2 Add another new upstream file 1520s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1520s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1520s ' 1520s + git branch converted-from-gbp 1520s + v=2.0-2 1520s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1520s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1520s + DEBEMAIL=dgit-tests@example.org 1520s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1520s + 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 1520s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1520s [master e5a9e04] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1520s 1 file changed, 6 insertions(+) 1520s + t-dch-commit-r 1520s + t-dch-r-rune t-dch-commit 1520s + local cmd=t-dch-commit 1520s + shift 1520s + local suite=unstable 1520s + t-dch-commit -r -D unstable '' 1520s + t-debchange -r -D unstable '' 1520s + DEBEMAIL=dgit-tests@example.org 1520s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1520s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1520s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1520s libdistro-info-perl is not installed, Debian release names are not known. 1520s libdistro-info-perl is not installed, Ubuntu release names are not known. 1520s + git commit -m 'dch -r -D unstable ' debian/changelog 1520s [master e87c421] dch -r -D unstable 1520s 1 file changed, 1 insertion(+), 1 deletion(-) 1520s + : t-dgit -wgf push-source --new 1520s + git push 1520s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1520s 26e401e..e87c421 master -> master 1520s + cd .. 1520s + : t-archive-process-incoming sid 1520s ++ echo example example_2.0.orig.tar.gz 1520s ++ : echo git mirror aq 1520s + t-setup-done '' 'example example_2.0.orig.tar.gz salsa ' ' 1520s . $troot/lib-gdr 1520s t-tstunt-parsechangelog 1520s p=example 1520s t-git-next-date 1520s ' 1520s + local savevars= 1520s + local 'savedirs=example example_2.0.orig.tar.gz salsa ' 1520s + local 'importeval= 1520s . $troot/lib-gdr 1520s t-tstunt-parsechangelog 1520s p=example 1520s t-git-next-date 1520s ' 1520s + local import=IMPORT.gdr-convert-gbp-noarchive 1520s + exec 1520s + local vn 1520s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1520s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1520s print STDERR "saving-exporting $vn\n"; 1520s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1520s or die $!; 1520s } 1520s ' 1520s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1520s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1520s + set -e 1520s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1520s + tar cf IMPORT.gdr-convert-gbp-noarchive.tar example example_2.0.orig.tar.gz salsa 1520s + printf '\n%s\n' ' 1520s . $troot/lib-gdr 1520s t-tstunt-parsechangelog 1520s p=example 1520s t-git-next-date 1520s ' 1520s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1520s + rc=0 1520s + set +x 1520s + set +e 1520s + pwd 1520s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1520s + '[' x '!=' x ']' 1520s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1520s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1520s + set -e 1520s + test 0 = 0 1520s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1520s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1520s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1520s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1520s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1520s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1520s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1520s ++ . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1520s +++ : -D 1520s +++ export GDR_TEST_DEBUG 1520s +++ t-tstunt debchange 1520s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s +++ local var=PATH 1520s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s +++ eval ' 1520s case "$PATH" in 1520s "$tstunt:"*) ;; 1520s *":$tstunt:"*) ;; 1520s "") PATH="$tstunt" ;; 1520s *) PATH="$tstunt:$PATH" ;; 1520s esac 1520s export PATH 1520s ' 1520s ++++ case "$PATH" in 1520s ++++ export PATH 1520s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s +++ local var=PERLLIB 1520s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s +++ eval ' 1520s case "$PERLLIB" in 1520s "$tstunt:"*) ;; 1520s *":$tstunt:"*) ;; 1520s "") PERLLIB="$tstunt" ;; 1520s *) PERLLIB="$tstunt:$PERLLIB" ;; 1520s esac 1520s export PERLLIB 1520s ' 1520s ++++ case "$PERLLIB" in 1520s ++++ PERLLIB=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s ++++ export PERLLIB 1520s +++ local f 1520s +++ for f in "$@" 1520s +++ t-tstunt--save-real debchange 1520s +++ local f=debchange 1520s +++ case "$f" in 1520s +++ local rc 1520s +++ local real 1520s +++ set +e 1520s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1520s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1520s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1520s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1520s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1520s ++++ type -p debchange 1520s +++ real=/usr/bin/debchange 1520s +++ rc=0 1520s +++ set -e 1520s +++ case $rc in 1520s +++ local varname=debchange 1520s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1520s +++ eval ' 1520s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1520s export DGIT_TEST_REAL_DEBCHANGE 1520s ' 1520s ++++ : /usr/bin/debchange 1520s ++++ export DGIT_TEST_REAL_DEBCHANGE 1520s +++ f=./debchange 1520s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1520s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1520s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1520s ++ t-tstunt-parsechangelog 1520s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1520s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s ++ local var=PATH 1520s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s ++ eval ' 1520s case "$PATH" in 1520s "$tstunt:"*) ;; 1520s *":$tstunt:"*) ;; 1520s "") PATH="$tstunt" ;; 1520s *) PATH="$tstunt:$PATH" ;; 1520s esac 1520s export PATH 1520s ' 1520s +++ case "$PATH" in 1520s +++ export PATH 1520s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s ++ local var=PERLLIB 1520s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1520s ++ eval ' 1520s case "$PERLLIB" in 1520s "$tstunt:"*) ;; 1520s *":$tstunt:"*) ;; 1520s "") PERLLIB="$tstunt" ;; 1520s *) PERLLIB="$tstunt:$PERLLIB" ;; 1520s esac 1520s export PERLLIB 1520s ' 1520s +++ case "$PERLLIB" in 1520s +++ export PERLLIB 1520s ++ local f 1520s ++ for f in "$@" 1520s ++ t-tstunt--save-real dpkg-parsechangelog 1520s ++ local f=dpkg-parsechangelog 1520s ++ case "$f" in 1520s ++ local rc 1520s ++ local real 1520s ++ set +e 1520s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1520s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1520s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1520s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1520s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1520s +++ type -p dpkg-parsechangelog 1520s ++ real=/usr/bin/dpkg-parsechangelog 1520s ++ rc=0 1520s ++ set -e 1520s ++ case $rc in 1520s ++ local varname=dpkg_parsechangelog 1520s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1520s ++ eval ' 1520s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1520s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1520s ' 1520s +++ : /usr/bin/dpkg-parsechangelog 1520s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1520s ++ f=./dpkg-parsechangelog 1520s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1520s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1520s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1520s ++ for f in "$@" 1520s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1520s ++ local f=Dpkg/Changelog/Parse.pm 1520s ++ case "$f" in 1520s ++ return 1520s ++ f=./Dpkg/Changelog/Parse.pm 1520s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1520s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1520s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1520s ++ p=example 1520s ++ t-git-next-date 1520s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1520s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1520s + cd example 1520s + t-gdr-prep-new-upstream 2.1 1520s + uv=2.1 1520s + t-git-next-date 1520s + GIT_COMMITTER_DATE='1530000002 +0100' 1520s + GIT_AUTHOR_DATE='1530000002 +0100' 1520s + git checkout make-upstream 1520s Switched to branch 'make-upstream' 1520s + git reset --hard upstream 1520s HEAD is now at c503a3d New upstream version 2.0 1520s + t-make-new-upstream-tarball 2.1 1520s + local uv=2.1 1520s + git checkout make-upstream 1520s Already on 'make-upstream' 1520s + echo 'upstream 2.1' 1520s + git commit -a -m 'upstream 2.1 tarball' 1520s [make-upstream 38ee937] upstream 2.1 tarball 1520s 1 file changed, 1 insertion(+) 1520s + t-make-orig example 2.1 make-upstream 1520s + local p=example 1520s + local v=2.1 1520s + local tag=make-upstream 1520s + ust=example_2.1.orig.tar.gz 1520s + GZIP=-1 1520s + git archive -o ../example_2.1.orig.tar.gz --prefix=example-2.1/ make-upstream 1520s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1520s + git push . make-upstream:upstream 1520s To . 1520s c503a3d..38ee937 make-upstream -> upstream 1520s + git checkout master 1520s Switched to branch 'master' 1520s Your branch is up to date with 'origin/master'. 1520s + t-git-next-date 1520s + GIT_COMMITTER_DATE='1530000003 +0100' 1520s + GIT_AUTHOR_DATE='1530000003 +0100' 1520s + git tag v2.1 upstream 1520s + t-some-changes before 1520s + local token=before 1520s + local which=dum 1520s + local fsuffix= 1520s + t-git-next-date 1520s + GIT_COMMITTER_DATE='1530000004 +0100' 1520s + GIT_AUTHOR_DATE='1530000004 +0100' 1520s + case "$which" in 1520s + echo '// debian before' 1520s + git add debian/zorkmid 1520s + git commit -m 'DEBIAN add zorkmid (before)' 1520s [master b262858] DEBIAN add zorkmid (before) 1520s 1 file changed, 1 insertion(+) 1520s create mode 100644 debian/zorkmid 1520s + case "$which" in 1520s + echo '// upstream before' 1520s + git add src.c 1520s + git commit -m 'UPSTREAM edit src.c (before)' 1520s [master b1e7ebc] UPSTREAM edit src.c (before) 1520s 1 file changed, 1 insertion(+) 1520s + case "$which" in 1520s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1520s + echo '// both! before' 1520s + git add debian/zorkmid 1520s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1520s + echo '// both! before' 1520s + git add src.c 1520s + git commit -m 'MIXED add both() (before)' 1520s [master b377a99] MIXED add both() (before) 1520s 2 files changed, 2 insertions(+) 1520s + t-git-next-date 1520s + GIT_COMMITTER_DATE='1530000005 +0100' 1520s + GIT_AUTHOR_DATE='1530000005 +0100' 1520s + t-git-debrebase quick 1520s + local gdr=git-debrebase 1520s + : ' 1520s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1520s + git-debrebase --dgit=dgit -D quick 1520s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1520s git-debrebase ffq check_specs * 1520s git-debrebase ffq merge master 1520s git-debrebase ffq check_remote origin remote fetch/merge branch 1520s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1520s OK, you are ahead of refs/remotes/origin/master 1520s git-debrebase ffq check_remote undef remote push branch 1520s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1520s git-debrebase *** WALK b377a9960f3a99f617597d2203ab69805f4af3d1 0 - 1520s git-debrebase get_differs b1e7ebc736259434df63791de6511273538f36be af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x22 1520s git-debrebase classify b377a9960f3a99f617597d2203ab69805f4af3d1 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p b1e7ebc736259434df63791de6511273538f36be/0x22 1520s git-debrebase = Mixed {"Type" => "Mixed","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent b1e7ebc736259434df63791de6511273538f36be\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","CommitId" => "b377a9960f3a99f617597d2203ab69805f4af3d1","Msg" => "MIXED add both() (before)\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Parents" => [{"CommitId" => "b1e7ebc736259434df63791de6511273538f36be","Ix" => 0,"Differs" => 34}]} 1520s git-debrebase get_differs b262858209fbcc06f0839029d6925c2a5cce27c1 ccd4a7c462d0e0b559590a43d0b920471105a2a6 = 0x2 1520s git-debrebase classify b1e7ebc736259434df63791de6511273538f36be $t=ccd4a7c462d0e0b559590a43d0b920471105a2a6 @p b262858209fbcc06f0839029d6925c2a5cce27c1/0x2 1520s git-debrebase = Upstream {"Tree" => "ccd4a7c462d0e0b559590a43d0b920471105a2a6","Msg" => "UPSTREAM edit src.c (before)\n","Parents" => [{"Differs" => 2,"CommitId" => "b262858209fbcc06f0839029d6925c2a5cce27c1","Ix" => 0}],"Hdr" => "tree ccd4a7c462d0e0b559590a43d0b920471105a2a6\nparent b262858209fbcc06f0839029d6925c2a5cce27c1\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","CommitId" => "b1e7ebc736259434df63791de6511273538f36be","Type" => "Upstream"} 1520s git-debrebase get_differs e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a 86d647b7fb482f29d7d648111f8ab4f4953b3233 = 0x20 1520s git-debrebase classify b262858209fbcc06f0839029d6925c2a5cce27c1 $t=86d647b7fb482f29d7d648111f8ab4f4953b3233 @p e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a/0x20 1520s git-debrebase = Packaging {"CommitId" => "b262858209fbcc06f0839029d6925c2a5cce27c1","Hdr" => "tree 86d647b7fb482f29d7d648111f8ab4f4953b3233\nparent e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a","Differs" => 32}],"Msg" => "DEBIAN add zorkmid (before)\n","Tree" => "86d647b7fb482f29d7d648111f8ab4f4953b3233"} 1520s git-debrebase get_differs e5a9e04273c87243d22ae8b19e14e071329ffb18 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1520s git-debrebase classify e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p e5a9e04273c87243d22ae8b19e14e071329ffb18/0x10 1520s git-debrebase = Changelog {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent e5a9e04273c87243d22ae8b19e14e071329ffb18\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a","Type" => "Changelog","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"CommitId" => "e5a9e04273c87243d22ae8b19e14e071329ffb18","Ix" => 0}]} 1520s git-debrebase get_differs 666ace228974ec35effb8cb4bd8ac8db3883a287 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1520s git-debrebase classify e5a9e04273c87243d22ae8b19e14e071329ffb18 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 666ace228974ec35effb8cb4bd8ac8db3883a287/0x10 1520s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "666ace228974ec35effb8cb4bd8ac8db3883a287"}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Type" => "Changelog","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 666ace228974ec35effb8cb4bd8ac8db3883a287\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "e5a9e04273c87243d22ae8b19e14e071329ffb18"} 1520s git-debrebase get_differs 720a44ed6b94c15cec25cfbd027a838da0906bf1 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1520s git-debrebase classify 666ace228974ec35effb8cb4bd8ac8db3883a287 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 720a44ed6b94c15cec25cfbd027a838da0906bf1/0x2 1520s git-debrebase = Upstream {"CommitId" => "666ace228974ec35effb8cb4bd8ac8db3883a287","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 720a44ed6b94c15cec25cfbd027a838da0906bf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "720a44ed6b94c15cec25cfbd027a838da0906bf1"}]} 1520s git-debrebase get_differs cb925ecbd2cd9c4bf653109bbb7e48407fc1145d dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1520s git-debrebase classify 720a44ed6b94c15cec25cfbd027a838da0906bf1 $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p cb925ecbd2cd9c4bf653109bbb7e48407fc1145d/0x2 1520s git-debrebase = Upstream {"CommitId" => "720a44ed6b94c15cec25cfbd027a838da0906bf1","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent cb925ecbd2cd9c4bf653109bbb7e48407fc1145d\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","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"Differs" => 2,"CommitId" => "cb925ecbd2cd9c4bf653109bbb7e48407fc1145d","Ix" => 0}]} 1520s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1520s git-debrebase classify cb925ecbd2cd9c4bf653109bbb7e48407fc1145d $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x2 1520s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Ix" => 0}],"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "cb925ecbd2cd9c4bf653109bbb7e48407fc1145d","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream"} 1520s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1520s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1520s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1520s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0,"Differs" => 0},{"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","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" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 1520s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 4 upp 4 proc 9 pm -1 1520s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1520s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1520s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 10 1520s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1520s git-debrebase WALK BUILD e5a9e04273c87243d22ae8b19e14e071329ffb18 Debian (rewriting=0) 1520s git-debrebase WALK REWRITING NOW cl=HASH(0xd2f05fe9e8) procd=HASH(0xd2f05d9008) 1520s git-debrebase WALK BUILD e87c4212f4cc15514e64fbeaef167c7bbe6f4e6a Debian (rewriting=1) 1520s git-debrebase WALK BUILD b262858209fbcc06f0839029d6925c2a5cce27c1 Debian (rewriting=1) 1520s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1520s git-debrebase WALK BUILD b377a9960f3a99f617597d2203ab69805f4af3d1 Debian (rewriting=1) 1520s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1520s git-debrebase WALK BUILD cb925ecbd2cd9c4bf653109bbb7e48407fc1145d Upstream (rewriting=1) 1520s git-debrebase WALK BUILD 720a44ed6b94c15cec25cfbd027a838da0906bf1 Upstream (rewriting=1) 1520s git-debrebase WALK BUILD 666ace228974ec35effb8cb4bd8ac8db3883a287 Upstream (rewriting=1) 1520s git-debrebase WALK BUILD b1e7ebc736259434df63791de6511273538f36be Upstream (rewriting=1) 1520s git-debrebase WALK BUILD b377a9960f3a99f617597d2203ab69805f4af3d1 Upstream (rewriting=1) 1520s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1520s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 b377a9960f3a99f617597d2203ab69805f4af3d1 = 0 1520s git-debrebase *** WALK RETURN 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 48c55fcd6aad3671faeeedd232289eea48db8cce 1520s git-debrebase: laundered (head was b377a9960f3a99f617597d2203ab69805f4af3d1) 1520s git-debrebase >= update refs/ffq-prev/heads/master b377a9960f3a99f617597d2203ab69805f4af3d1 0000000000000000000000000000000000000000 1520s git-debrebase >= delete refs/debrebase-last/heads/master 1520s git-debrebase >= update HEAD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 b377a9960f3a99f617597d2203ab69805f4af3d1 1520s git-debrebase >$ 1520s Recorded previous head for preservation 1520s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1520s git-debrebase get_differs 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 1520s git-debrebase classify 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a/0x2 1520s git-debrebase = Upstream {"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Type" => "Upstream","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Differs" => 2}],"Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe"} 1520s git-debrebase get_differs 61838f71874d7ddb712bb3c25e0a0c91734bab47 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 1520s git-debrebase classify 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 61838f71874d7ddb712bb3c25e0a0c91734bab47/0x2 1520s git-debrebase = Upstream {"Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47"}],"Msg" => "UPSTREAM edit src.c (before)\n","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 61838f71874d7ddb712bb3c25e0a0c91734bab47\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Type" => "Upstream"} 1520s git-debrebase get_differs cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 1520s git-debrebase classify 61838f71874d7ddb712bb3c25e0a0c91734bab47 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p cfa06dbc0f977f48e1449a0f11ee4106d8bf1269/0x2 1520s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Parents" => [{"Ix" => 0,"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Differs" => 2}],"Type" => "Upstream","CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent cfa06dbc0f977f48e1449a0f11ee4106d8bf1269\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1520s git-debrebase get_differs 31cc003deb18794414e5604fc32fdd9819189100 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 1520s git-debrebase classify cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p 31cc003deb18794414e5604fc32fdd9819189100/0x2 1520s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent 31cc003deb18794414e5604fc32fdd9819189100\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Type" => "Upstream"} 1520s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 1520s git-debrebase classify 31cc003deb18794414e5604fc32fdd9819189100 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 1520s git-debrebase = Upstream {"Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0,"Differs" => 2}],"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream"} 1520s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1520s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1520s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1520s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1520s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1520s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Parents" => [{"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0,"Differs" => 32}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n"} 1520s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1520s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1520s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"}],"Msg" => "dch -r -D unstable\n"} 1520s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1520s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1520s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Differs" => 16}],"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"} 1520s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1520s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1520s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1520s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Type" => "Anchor","OrigParents" => [{"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Ix" => 1}],"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" => "23886cf8bbaefa175a2403d6556564175e096c16"},$VAR1->{"OrigParents"}[0]]} 1520s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1520s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1520s git-debrebase >= delete refs/ffq-prev/heads/master b377a9960f3a99f617597d2203ab69805f4af3d1 1520s git-debrebase >= update refs/debrebase-last/heads/master ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 0000000000000000000000000000000000000000 1520s git-debrebase >= update HEAD ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 1520s git-debrebase >$ 1520s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1520s ' 1520s + : ----- prepare LH branch ----- 1520s + git checkout -b other 1521s Switched to a new branch 'other' 1521s + t-some-changes other '' -other 1521s + local token=other 1521s + local which=dum 1521s + local fsuffix=-other 1521s + t-git-next-date 1521s + GIT_COMMITTER_DATE='1530000006 +0100' 1521s + GIT_AUTHOR_DATE='1530000006 +0100' 1521s + case "$which" in 1521s + echo '// debian other' 1521s + git add debian/zorkmid-other 1521s + git commit -m 'DEBIAN add zorkmid-other (other)' 1521s [other 93fb9b8] DEBIAN add zorkmid-other (other) 1521s 1 file changed, 1 insertion(+) 1521s create mode 100644 debian/zorkmid-other 1521s + case "$which" in 1521s + echo '// upstream other' 1521s + git add src-other.c 1521s + git commit -m 'UPSTREAM edit src-other.c (other)' 1521s [other c49d2b2] UPSTREAM edit src-other.c (other) 1521s 1 file changed, 1 insertion(+) 1521s create mode 100644 src-other.c 1521s + case "$which" in 1521s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1521s + echo '// both! other' 1521s + git add debian/zorkmid-other 1521s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1521s + echo '// both! other' 1521s + git add src-other.c 1521s + git commit -m 'MIXED add both(-other) (other)' 1521s [other 6ee89e4] MIXED add both(-other) (other) 1521s 2 files changed, 2 insertions(+) 1521s + t-git-next-date 1521s + GIT_COMMITTER_DATE='1530000007 +0100' 1521s + GIT_AUTHOR_DATE='1530000007 +0100' 1521s + echo other-conflict 1521s + git commit -m other-conflict debian/zorkmid 1521s [other 66770cc] other-conflict 1521s 1 file changed, 1 insertion(+) 1521s + : ----- prepare RH branch ----- 1521s + git checkout master 1521s Switched to branch 'master' 1521s Your branch is ahead of 'origin/master' by 13 commits. 1521s (use "git push" to publish your local commits) 1521s + t-some-changes us-1 '' -us 1521s + local token=us-1 1521s + local which=dum 1521s + local fsuffix=-us 1521s + t-git-next-date 1521s + GIT_COMMITTER_DATE='1530000008 +0100' 1521s + GIT_AUTHOR_DATE='1530000008 +0100' 1521s + case "$which" in 1521s + echo '// debian us-1' 1521s + git add debian/zorkmid-us 1521s + git commit -m 'DEBIAN add zorkmid-us (us-1)' 1521s [master b0c5def] DEBIAN add zorkmid-us (us-1) 1521s 1 file changed, 1 insertion(+) 1521s create mode 100644 debian/zorkmid-us 1521s + case "$which" in 1521s + echo '// upstream us-1' 1521s + git add src-us.c 1521s + git commit -m 'UPSTREAM edit src-us.c (us-1)' 1521s [master dfce397] UPSTREAM edit src-us.c (us-1) 1521s 1 file changed, 1 insertion(+) 1521s create mode 100644 src-us.c 1521s + case "$which" in 1521s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1521s + echo '// both! us-1' 1521s + git add debian/zorkmid-us 1521s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1521s + echo '// both! us-1' 1521s + git add src-us.c 1521s + git commit -m 'MIXED add both(-us) (us-1)' 1521s [master 5e15b7e] MIXED add both(-us) (us-1) 1521s 2 files changed, 2 insertions(+) 1521s + t-git-next-date 1521s + GIT_COMMITTER_DATE='1530000009 +0100' 1521s + GIT_AUTHOR_DATE='1530000009 +0100' 1521s + t-git-debrebase new-upstream 2.1 1521s + local gdr=git-debrebase 1521s + : ' 1521s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1521s + git-debrebase --dgit=dgit -D new-upstream 2.1 1521s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1521s git-debrebase ffq check_specs * 1521s git-debrebase ffq merge master 1521s git-debrebase ffq check_remote origin remote fetch/merge branch 1521s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1521s OK, you are ahead of refs/remotes/origin/master 1521s git-debrebase ffq check_remote undef remote push branch 1521s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1521s git-debrebase *** WALK 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1 0 - 1521s git-debrebase get_differs dfce397abf43d004e5f180372fd625e193ce9c7c 319adb4c2478530b475190beede9d125f3710a27 = 0x22 1521s git-debrebase classify 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1 $t=319adb4c2478530b475190beede9d125f3710a27 @p dfce397abf43d004e5f180372fd625e193ce9c7c/0x22 1521s git-debrebase = Mixed {"Msg" => "MIXED add both(-us) (us-1)\n","Tree" => "319adb4c2478530b475190beede9d125f3710a27","Type" => "Mixed","CommitId" => "5e15b7ee5c56d7b4d69ef8a086c30a66598958a1","Parents" => [{"CommitId" => "dfce397abf43d004e5f180372fd625e193ce9c7c","Differs" => 34,"Ix" => 0}],"Hdr" => "tree 319adb4c2478530b475190beede9d125f3710a27\nparent dfce397abf43d004e5f180372fd625e193ce9c7c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1521s git-debrebase get_differs b0c5def61080f2074e810a0d2d655aeb8bd0075f 3ef50c5188f657defd2a1d3bc41d901fd2957252 = 0x2 1521s git-debrebase classify dfce397abf43d004e5f180372fd625e193ce9c7c $t=3ef50c5188f657defd2a1d3bc41d901fd2957252 @p b0c5def61080f2074e810a0d2d655aeb8bd0075f/0x2 1521s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b0c5def61080f2074e810a0d2d655aeb8bd0075f","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 3ef50c5188f657defd2a1d3bc41d901fd2957252\nparent b0c5def61080f2074e810a0d2d655aeb8bd0075f\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-1)\n","Tree" => "3ef50c5188f657defd2a1d3bc41d901fd2957252","CommitId" => "dfce397abf43d004e5f180372fd625e193ce9c7c","Type" => "Upstream"} 1521s git-debrebase get_differs ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 b23b43bb55e90626a611f0de710a63a5c0af9778 = 0x20 1521s git-debrebase classify b0c5def61080f2074e810a0d2d655aeb8bd0075f $t=b23b43bb55e90626a611f0de710a63a5c0af9778 @p ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6/0x20 1521s git-debrebase = Packaging {"Tree" => "b23b43bb55e90626a611f0de710a63a5c0af9778","Msg" => "DEBIAN add zorkmid-us (us-1)\n","Type" => "Packaging","CommitId" => "b0c5def61080f2074e810a0d2d655aeb8bd0075f","Parents" => [{"Differs" => 32,"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Ix" => 0}],"Hdr" => "tree b23b43bb55e90626a611f0de710a63a5c0af9778\nparent ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1521s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1521s git-debrebase get_differs b377a9960f3a99f617597d2203ab69805f4af3d1 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1521s git-debrebase classify ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5/0 b377a9960f3a99f617597d2203ab69805f4af3d1/0 1521s git-debrebase = Pseudomerge {"SubType" => "Ambiguous","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5\nparent b377a9960f3a99f617597d2203ab69805f4af3d1\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Overwritten" => [{"Ix" => 1,"Differs" => 0,"CommitId" => "b377a9960f3a99f617597d2203ab69805f4af3d1"}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5"},$VAR1->{"Overwritten"}[0]],"Type" => "Pseudomerge","Contributor" => $VAR1->{"Parents"}[0],"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe"} 1521s git-debrebase get_differs 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 1521s git-debrebase classify 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a/0x2 1521s git-debrebase = Upstream {"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a"}],"Type" => "Upstream","CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe"} 1521s git-debrebase get_differs 61838f71874d7ddb712bb3c25e0a0c91734bab47 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 1521s git-debrebase classify 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 61838f71874d7ddb712bb3c25e0a0c91734bab47/0x2 1521s git-debrebase = Upstream {"Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 61838f71874d7ddb712bb3c25e0a0c91734bab47\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Differs" => 2}],"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd"} 1521s git-debrebase get_differs cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 1521s git-debrebase classify 61838f71874d7ddb712bb3c25e0a0c91734bab47 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p cfa06dbc0f977f48e1449a0f11ee4106d8bf1269/0x2 1521s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Differs" => 2}],"Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent cfa06dbc0f977f48e1449a0f11ee4106d8bf1269\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47"} 1521s git-debrebase get_differs 31cc003deb18794414e5604fc32fdd9819189100 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 1521s git-debrebase classify cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p 31cc003deb18794414e5604fc32fdd9819189100/0x2 1521s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Ix" => 0}],"Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent 31cc003deb18794414e5604fc32fdd9819189100\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","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Type" => "Upstream"} 1521s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 1521s git-debrebase classify 31cc003deb18794414e5604fc32fdd9819189100 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 1521s git-debrebase = Upstream {"Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 2,"Ix" => 0}],"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Type" => "Upstream","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1521s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1521s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1521s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Type" => "Packaging"} 1521s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1521s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1521s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "DEBIAN add zorkmid (before)\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"} 1521s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1521s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1521s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1521s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1521s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1521s git-debrebase = Changelog {"Parents" => [{"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Differs" => 16,"Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Type" => "Changelog"} 1521s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1521s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1521s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1521s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0},{"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\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","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Type" => "Anchor"} 1521s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 6 upp 7 proc 15 pm 0 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1521s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 16 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1521s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1521s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1521s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1521s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1521s git-debrebase WALK BUILD b0c5def61080f2074e810a0d2d655aeb8bd0075f Debian (rewriting=0) 1521s git-debrebase WALK REWRITING NOW cl=HASH(0xae72069ebb0) procd=HASH(0xae72072e388) 1521s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1521s git-debrebase WALK BUILD 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1 Debian (rewriting=1) 1521s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1521s git-debrebase WALK BUILD 31cc003deb18794414e5604fc32fdd9819189100 Upstream (rewriting=1) 1521s git-debrebase WALK BUILD cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 Upstream (rewriting=1) 1521s git-debrebase WALK BUILD 61838f71874d7ddb712bb3c25e0a0c91734bab47 Upstream (rewriting=1) 1521s git-debrebase WALK BUILD 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a Upstream (rewriting=1) 1521s git-debrebase WALK BUILD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 Upstream (rewriting=1) 1521s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1521s git-debrebase WALK BUILD dfce397abf43d004e5f180372fd625e193ce9c7c Upstream (rewriting=1) 1521s git-debrebase WALK BUILD 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1 Upstream (rewriting=1) 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1521s git-debrebase get_differs 851e4356e0c1a07535a1dbd75a0b8f9d32b2f4f4 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1 = 0 1521s git-debrebase *** WALK RETURN 851e4356e0c1a07535a1dbd75a0b8f9d32b2f4f4 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 48c55fcd6aad3671faeeedd232289eea48db8cce 1521s git-debrebase get_differs 451164abf3e86bd404c7e66ca8e7201e8a26014d 00e96a7b98e009a756e519af6302d1eeaa848e52 = 0x20 1521s git-debrebase classify 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 $t=00e96a7b98e009a756e519af6302d1eeaa848e52 @p 451164abf3e86bd404c7e66ca8e7201e8a26014d/0x20 1521s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "451164abf3e86bd404c7e66ca8e7201e8a26014d","Differs" => 32}],"Hdr" => "tree 00e96a7b98e009a756e519af6302d1eeaa848e52\nparent 451164abf3e86bd404c7e66ca8e7201e8a26014d\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "00e96a7b98e009a756e519af6302d1eeaa848e52","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70"} 1521s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1521s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1521s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1521s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0,"Ix" => 0},{"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Ix" => 1}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 1521s git-debrebase %pieces = {"" => {"New" => "38ee93726fb48a60962f8d01d367986becb682da","NewIx" => 0,"Old" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","OldIx" => 0,"Desc" => "upstream (main piece","Name" => ""}} 1521s git-debrebase @newpieces = [{"New" => "38ee93726fb48a60962f8d01d367986becb682da","NewIx" => 0,"Old" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","OldIx" => 0,"Desc" => "upstream (main piece","Name" => ""}] 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1521s + 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. 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1521s git-debrebase: laundered (head was 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1) 1521s git-debrebase >= update refs/ffq-prev/heads/master 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1 0000000000000000000000000000000000000000 1521s git-debrebase >= delete refs/debrebase-last/heads/master 1521s git-debrebase >= update HEAD 851e4356e0c1a07535a1dbd75a0b8f9d32b2f4f4 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1 1521s git-debrebase >$ 1521s Recorded previous head for preservation 1521s 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. 1521s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1521s ' 1521s + t-some-changes us-2 '' -us 1521s + local token=us-2 1521s + local which=dum 1521s + local fsuffix=-us 1521s + t-git-next-date 1521s + GIT_COMMITTER_DATE='1530000010 +0100' 1521s + GIT_AUTHOR_DATE='1530000010 +0100' 1521s + case "$which" in 1521s + echo '// debian us-2' 1521s + git add debian/zorkmid-us 1521s + git commit -m 'DEBIAN add zorkmid-us (us-2)' 1521s [master 59f80ae] DEBIAN add zorkmid-us (us-2) 1521s 1 file changed, 1 insertion(+) 1521s + case "$which" in 1521s + echo '// upstream us-2' 1521s + git add src-us.c 1521s + git commit -m 'UPSTREAM edit src-us.c (us-2)' 1521s [master b1a4539] UPSTREAM edit src-us.c (us-2) 1521s 1 file changed, 1 insertion(+) 1521s + case "$which" in 1521s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1521s + echo '// both! us-2' 1521s + git add debian/zorkmid-us 1521s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1521s + echo '// both! us-2' 1521s + git add src-us.c 1521s + git commit -m 'MIXED add both(-us) (us-2)' 1521s [master 9be4fe7] MIXED add both(-us) (us-2) 1521s 2 files changed, 2 insertions(+) 1521s + t-git-next-date 1521s + GIT_COMMITTER_DATE='1530000011 +0100' 1521s + GIT_AUTHOR_DATE='1530000011 +0100' 1521s + echo us-conflict 1521s + git commit -m us-conflict debian/zorkmid 1521s [master 84432de] us-conflict 1521s 1 file changed, 1 insertion(+) 1521s + t-git-debrebase quick 1521s + local gdr=git-debrebase 1521s + : ' 1521s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1521s + git-debrebase --dgit=dgit -D quick 1521s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1521s git-debrebase *** WALK 84432dec83d13b41823474d902ccd924c05d1e26 0 - 1521s git-debrebase get_differs 9be4fe771e02faabfc1df6efabddefc10651f07d e38de421676caa1148e6e5d6e455bf955514342f = 0x20 1521s git-debrebase classify 84432dec83d13b41823474d902ccd924c05d1e26 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 9be4fe771e02faabfc1df6efabddefc10651f07d/0x20 1521s git-debrebase = Packaging {"CommitId" => "84432dec83d13b41823474d902ccd924c05d1e26","Type" => "Packaging","Msg" => "us-conflict\n","Parents" => [{"Differs" => 32,"CommitId" => "9be4fe771e02faabfc1df6efabddefc10651f07d","Ix" => 0}],"Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 9be4fe771e02faabfc1df6efabddefc10651f07d\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "e38de421676caa1148e6e5d6e455bf955514342f"} 1521s git-debrebase get_differs b1a45399990ba66ccb602a5f81c928ae61fe77e2 baa9d1434e38fe40e0c5396228a31a19fe67d140 = 0x22 1521s git-debrebase classify 9be4fe771e02faabfc1df6efabddefc10651f07d $t=baa9d1434e38fe40e0c5396228a31a19fe67d140 @p b1a45399990ba66ccb602a5f81c928ae61fe77e2/0x22 1521s git-debrebase = Mixed {"Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "b1a45399990ba66ccb602a5f81c928ae61fe77e2"}],"Msg" => "MIXED add both(-us) (us-2)\n","CommitId" => "9be4fe771e02faabfc1df6efabddefc10651f07d","Type" => "Mixed","Tree" => "baa9d1434e38fe40e0c5396228a31a19fe67d140","Hdr" => "tree baa9d1434e38fe40e0c5396228a31a19fe67d140\nparent b1a45399990ba66ccb602a5f81c928ae61fe77e2\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1521s git-debrebase get_differs 59f80aead4cb31ca59a0ff9352a90336c3e860e1 080e8d204c6d5f1d877d1f1ea033f9a3f689ab38 = 0x2 1521s git-debrebase classify b1a45399990ba66ccb602a5f81c928ae61fe77e2 $t=080e8d204c6d5f1d877d1f1ea033f9a3f689ab38 @p 59f80aead4cb31ca59a0ff9352a90336c3e860e1/0x2 1521s git-debrebase = Upstream {"Tree" => "080e8d204c6d5f1d877d1f1ea033f9a3f689ab38","Hdr" => "tree 080e8d204c6d5f1d877d1f1ea033f9a3f689ab38\nparent 59f80aead4cb31ca59a0ff9352a90336c3e860e1\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "b1a45399990ba66ccb602a5f81c928ae61fe77e2","Type" => "Upstream","Msg" => "UPSTREAM edit src-us.c (us-2)\n","Parents" => [{"Ix" => 0,"CommitId" => "59f80aead4cb31ca59a0ff9352a90336c3e860e1","Differs" => 2}]} 1521s git-debrebase get_differs 16ea5e6b49f757e377e54f51a4654938aeb6a1e1 9d94f28bccabdde881eece4ca59005a478b23e66 = 0x20 1521s git-debrebase classify 59f80aead4cb31ca59a0ff9352a90336c3e860e1 $t=9d94f28bccabdde881eece4ca59005a478b23e66 @p 16ea5e6b49f757e377e54f51a4654938aeb6a1e1/0x20 1521s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "59f80aead4cb31ca59a0ff9352a90336c3e860e1","Parents" => [{"CommitId" => "16ea5e6b49f757e377e54f51a4654938aeb6a1e1","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 9d94f28bccabdde881eece4ca59005a478b23e66\nparent 16ea5e6b49f757e377e54f51a4654938aeb6a1e1\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "9d94f28bccabdde881eece4ca59005a478b23e66"} 1521s git-debrebase get_differs d8c6c9f200928c9b923f7bfa4474b7529e3f4ebe 619429df0fa739873f84522577953fa910fdc293 = 0x2 1521s git-debrebase classify 16ea5e6b49f757e377e54f51a4654938aeb6a1e1 $t=619429df0fa739873f84522577953fa910fdc293 @p d8c6c9f200928c9b923f7bfa4474b7529e3f4ebe/0x2 1521s git-debrebase = Upstream {"Tree" => "619429df0fa739873f84522577953fa910fdc293","Hdr" => "tree 619429df0fa739873f84522577953fa910fdc293\nparent d8c6c9f200928c9b923f7bfa4474b7529e3f4ebe\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream","CommitId" => "16ea5e6b49f757e377e54f51a4654938aeb6a1e1","Parents" => [{"Differs" => 2,"CommitId" => "d8c6c9f200928c9b923f7bfa4474b7529e3f4ebe","Ix" => 0}],"Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1521s git-debrebase get_differs c8bb4e7976f453aee13a8fbf6dbe23712b2c6414 01dac0365d50474b5282555dd542bfa89cedf668 = 0x2 1521s git-debrebase classify d8c6c9f200928c9b923f7bfa4474b7529e3f4ebe $t=01dac0365d50474b5282555dd542bfa89cedf668 @p c8bb4e7976f453aee13a8fbf6dbe23712b2c6414/0x2 1521s git-debrebase = Upstream {"CommitId" => "d8c6c9f200928c9b923f7bfa4474b7529e3f4ebe","Type" => "Upstream","Msg" => "UPSTREAM edit src-us.c (us-1)\n","Parents" => [{"Ix" => 0,"CommitId" => "c8bb4e7976f453aee13a8fbf6dbe23712b2c6414","Differs" => 2}],"Hdr" => "tree 01dac0365d50474b5282555dd542bfa89cedf668\nparent c8bb4e7976f453aee13a8fbf6dbe23712b2c6414\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "01dac0365d50474b5282555dd542bfa89cedf668"} 1521s git-debrebase get_differs 0b9e334eb315ff1a5c4cea4f20fa3d18db40d06e e26ab200a6c6e86af43e42998cfbc10caca316bf = 0x2 1521s git-debrebase classify c8bb4e7976f453aee13a8fbf6dbe23712b2c6414 $t=e26ab200a6c6e86af43e42998cfbc10caca316bf @p 0b9e334eb315ff1a5c4cea4f20fa3d18db40d06e/0x2 1521s git-debrebase = Upstream {"Hdr" => "tree e26ab200a6c6e86af43e42998cfbc10caca316bf\nparent 0b9e334eb315ff1a5c4cea4f20fa3d18db40d06e\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "e26ab200a6c6e86af43e42998cfbc10caca316bf","Type" => "Upstream","CommitId" => "c8bb4e7976f453aee13a8fbf6dbe23712b2c6414","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "0b9e334eb315ff1a5c4cea4f20fa3d18db40d06e","Differs" => 2,"Ix" => 0}]} 1521s git-debrebase get_differs 666e9078190a1b1c943ea9ea9e82d10ffb272667 6ff2df1a1f33b4082a03d1b1ff0c1bcb7758d047 = 0x2 1521s git-debrebase classify 0b9e334eb315ff1a5c4cea4f20fa3d18db40d06e $t=6ff2df1a1f33b4082a03d1b1ff0c1bcb7758d047 @p 666e9078190a1b1c943ea9ea9e82d10ffb272667/0x2 1521s git-debrebase = Upstream {"Tree" => "6ff2df1a1f33b4082a03d1b1ff0c1bcb7758d047","Hdr" => "tree 6ff2df1a1f33b4082a03d1b1ff0c1bcb7758d047\nparent 666e9078190a1b1c943ea9ea9e82d10ffb272667\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"CommitId" => "666e9078190a1b1c943ea9ea9e82d10ffb272667","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (before)\n","CommitId" => "0b9e334eb315ff1a5c4cea4f20fa3d18db40d06e","Type" => "Upstream"} 1521s git-debrebase get_differs 538f95e9d8f134862369b043afbec0d79ec3eea4 ea4e1694b6f490d2c02ce8461f745974dbc087b0 = 0x2 1521s git-debrebase classify 666e9078190a1b1c943ea9ea9e82d10ffb272667 $t=ea4e1694b6f490d2c02ce8461f745974dbc087b0 @p 538f95e9d8f134862369b043afbec0d79ec3eea4/0x2 1521s git-debrebase = Upstream {"Hdr" => "tree ea4e1694b6f490d2c02ce8461f745974dbc087b0\nparent 538f95e9d8f134862369b043afbec0d79ec3eea4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "ea4e1694b6f490d2c02ce8461f745974dbc087b0","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "538f95e9d8f134862369b043afbec0d79ec3eea4"}],"CommitId" => "666e9078190a1b1c943ea9ea9e82d10ffb272667","Type" => "Upstream"} 1521s git-debrebase get_differs 84a1919495328821732720c66753f97e0ea360f2 599cbc546fb8b019ccfe44b13fa91d69602459aa = 0x2 1521s git-debrebase classify 538f95e9d8f134862369b043afbec0d79ec3eea4 $t=599cbc546fb8b019ccfe44b13fa91d69602459aa @p 84a1919495328821732720c66753f97e0ea360f2/0x2 1521s git-debrebase = Upstream {"Hdr" => "tree 599cbc546fb8b019ccfe44b13fa91d69602459aa\nparent 84a1919495328821732720c66753f97e0ea360f2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "599cbc546fb8b019ccfe44b13fa91d69602459aa","CommitId" => "538f95e9d8f134862369b043afbec0d79ec3eea4","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "84a1919495328821732720c66753f97e0ea360f2"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1521s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 0d18055565ebd8a64d4dfbe83a9db11e41b7eee6 = 0x2 1521s git-debrebase classify 84a1919495328821732720c66753f97e0ea360f2 $t=0d18055565ebd8a64d4dfbe83a9db11e41b7eee6 @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x2 1521s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "84a1919495328821732720c66753f97e0ea360f2","Hdr" => "tree 0d18055565ebd8a64d4dfbe83a9db11e41b7eee6\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "0d18055565ebd8a64d4dfbe83a9db11e41b7eee6"} 1521s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1521s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1521s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a"}],"Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4"} 1521s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1521s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1521s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1521s git-debrebase = Anchor {"Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70","Differs" => 2},{"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Differs" => 48,"Ix" => 1}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]]} 1521s git-debrebase *** WALK prep done cur=d50318b393ee163dd38aa93c9427a1ce6a993b3a brw 4 upp 8 proc 13 pm -1 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1521s git-debrebase WALK REBUILD d50318b393ee163dd38aa93c9427a1ce6a993b3a 14 1521s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1521s git-debrebase WALK BUILD bbe1078ab4e02c973ffae4ecc124fccd0ebee298 Debian (rewriting=0) 1521s git-debrebase WALK BUILD 59f80aead4cb31ca59a0ff9352a90336c3e860e1 Debian (rewriting=0) 1521s git-debrebase WALK REWRITING NOW cl=HASH(0xa0090b2df80) procd=HASH(0xa0090b8ea18) 1521s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1521s git-debrebase WALK BUILD 9be4fe771e02faabfc1df6efabddefc10651f07d Debian (rewriting=1) 1521s git-debrebase WALK BUILD 84432dec83d13b41823474d902ccd924c05d1e26 Debian (rewriting=1) 1521s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1521s git-debrebase WALK BUILD 84a1919495328821732720c66753f97e0ea360f2 Upstream (rewriting=1) 1521s git-debrebase WALK BUILD 538f95e9d8f134862369b043afbec0d79ec3eea4 Upstream (rewriting=1) 1521s git-debrebase WALK BUILD 666e9078190a1b1c943ea9ea9e82d10ffb272667 Upstream (rewriting=1) 1521s git-debrebase WALK BUILD 0b9e334eb315ff1a5c4cea4f20fa3d18db40d06e Upstream (rewriting=1) 1521s git-debrebase WALK BUILD c8bb4e7976f453aee13a8fbf6dbe23712b2c6414 Upstream (rewriting=1) 1521s git-debrebase WALK BUILD d8c6c9f200928c9b923f7bfa4474b7529e3f4ebe Upstream (rewriting=1) 1521s git-debrebase WALK BUILD 16ea5e6b49f757e377e54f51a4654938aeb6a1e1 Upstream (rewriting=1) 1522s git-debrebase WALK BUILD b1a45399990ba66ccb602a5f81c928ae61fe77e2 Upstream (rewriting=1) 1522s git-debrebase WALK BUILD 9be4fe771e02faabfc1df6efabddefc10651f07d Upstream (rewriting=1) 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1522s git-debrebase get_differs 23622c7321349049ab04c3e2f87531a494b246a1 84432dec83d13b41823474d902ccd924c05d1e26 = 0 1522s git-debrebase *** WALK RETURN 23622c7321349049ab04c3e2f87531a494b246a1 f77f5a3cf715442ff9af63f94215e720d5c7249e d50318b393ee163dd38aa93c9427a1ce6a993b3a 1522s git-debrebase: laundered (head was 84432dec83d13b41823474d902ccd924c05d1e26) 1522s git-debrebase >= update HEAD 23622c7321349049ab04c3e2f87531a494b246a1 84432dec83d13b41823474d902ccd924c05d1e26 1522s git-debrebase >$ 1522s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1522s git-debrebase get_differs 81888cd1ecc5ca646e576d8a540db94208710647 e38de421676caa1148e6e5d6e455bf955514342f = 0x2 1522s git-debrebase classify 23622c7321349049ab04c3e2f87531a494b246a1 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 81888cd1ecc5ca646e576d8a540db94208710647/0x2 1522s git-debrebase = Upstream {"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "81888cd1ecc5ca646e576d8a540db94208710647","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "23622c7321349049ab04c3e2f87531a494b246a1","Tree" => "e38de421676caa1148e6e5d6e455bf955514342f","Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 81888cd1ecc5ca646e576d8a540db94208710647\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1522s git-debrebase get_differs 60f576c6186efb32ddd3cce7c8d618e0838f3ebd 698a2560d79a004c2c8f172bfb77966a4d931ec1 = 0x2 1522s git-debrebase classify 81888cd1ecc5ca646e576d8a540db94208710647 $t=698a2560d79a004c2c8f172bfb77966a4d931ec1 @p 60f576c6186efb32ddd3cce7c8d618e0838f3ebd/0x2 1522s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-us.c (us-2)\n","Parents" => [{"Ix" => 0,"CommitId" => "60f576c6186efb32ddd3cce7c8d618e0838f3ebd","Differs" => 2}],"CommitId" => "81888cd1ecc5ca646e576d8a540db94208710647","Type" => "Upstream","Tree" => "698a2560d79a004c2c8f172bfb77966a4d931ec1","Hdr" => "tree 698a2560d79a004c2c8f172bfb77966a4d931ec1\nparent 60f576c6186efb32ddd3cce7c8d618e0838f3ebd\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1522s git-debrebase get_differs 773840a34b78968a5547ba99b314542fd263dfc0 e8b94450cb8e681e494689fb8332a4becf2fd75d = 0x2 1522s git-debrebase classify 60f576c6186efb32ddd3cce7c8d618e0838f3ebd $t=e8b94450cb8e681e494689fb8332a4becf2fd75d @p 773840a34b78968a5547ba99b314542fd263dfc0/0x2 1522s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "773840a34b78968a5547ba99b314542fd263dfc0","Ix" => 0}],"Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "60f576c6186efb32ddd3cce7c8d618e0838f3ebd","Type" => "Upstream","Hdr" => "tree e8b94450cb8e681e494689fb8332a4becf2fd75d\nparent 773840a34b78968a5547ba99b314542fd263dfc0\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "e8b94450cb8e681e494689fb8332a4becf2fd75d"} 1522s git-debrebase get_differs b9cff9c120d085330ed394d99fcc23a45714eeec af732c5124a36938b085e0b7c534b2935a2519bf = 0x2 1522s git-debrebase classify 773840a34b78968a5547ba99b314542fd263dfc0 $t=af732c5124a36938b085e0b7c534b2935a2519bf @p b9cff9c120d085330ed394d99fcc23a45714eeec/0x2 1522s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "773840a34b78968a5547ba99b314542fd263dfc0","Msg" => "UPSTREAM edit src-us.c (us-1)\n","Parents" => [{"Differs" => 2,"CommitId" => "b9cff9c120d085330ed394d99fcc23a45714eeec","Ix" => 0}],"Tree" => "af732c5124a36938b085e0b7c534b2935a2519bf","Hdr" => "tree af732c5124a36938b085e0b7c534b2935a2519bf\nparent b9cff9c120d085330ed394d99fcc23a45714eeec\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1522s git-debrebase get_differs 5c95dd8effd34ae96b528da18ad695d34a56b6b0 3e1d62be2276fc0c07e618f0afa1c015ba613ae1 = 0x2 1522s git-debrebase classify b9cff9c120d085330ed394d99fcc23a45714eeec $t=3e1d62be2276fc0c07e618f0afa1c015ba613ae1 @p 5c95dd8effd34ae96b528da18ad695d34a56b6b0/0x2 1522s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "5c95dd8effd34ae96b528da18ad695d34a56b6b0","Differs" => 2}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "b9cff9c120d085330ed394d99fcc23a45714eeec","Hdr" => "tree 3e1d62be2276fc0c07e618f0afa1c015ba613ae1\nparent 5c95dd8effd34ae96b528da18ad695d34a56b6b0\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "3e1d62be2276fc0c07e618f0afa1c015ba613ae1"} 1522s git-debrebase get_differs b3a7b35aedeb0f06f45908772ba2fe6ab61451f5 e0b7dfbd5a539e0394c71cfd449ea9de3914f928 = 0x2 1522s git-debrebase classify 5c95dd8effd34ae96b528da18ad695d34a56b6b0 $t=e0b7dfbd5a539e0394c71cfd449ea9de3914f928 @p b3a7b35aedeb0f06f45908772ba2fe6ab61451f5/0x2 1522s git-debrebase = Upstream {"CommitId" => "5c95dd8effd34ae96b528da18ad695d34a56b6b0","Type" => "Upstream","Parents" => [{"CommitId" => "b3a7b35aedeb0f06f45908772ba2fe6ab61451f5","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "e0b7dfbd5a539e0394c71cfd449ea9de3914f928","Hdr" => "tree e0b7dfbd5a539e0394c71cfd449ea9de3914f928\nparent b3a7b35aedeb0f06f45908772ba2fe6ab61451f5\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1522s git-debrebase get_differs e81f8d58e13d770dab8f85facd9a5035ae7bdb17 5f7f15e4216ca911d7d124f6ecc91b968ab63310 = 0x2 1522s git-debrebase classify b3a7b35aedeb0f06f45908772ba2fe6ab61451f5 $t=5f7f15e4216ca911d7d124f6ecc91b968ab63310 @p e81f8d58e13d770dab8f85facd9a5035ae7bdb17/0x2 1522s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "b3a7b35aedeb0f06f45908772ba2fe6ab61451f5","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "e81f8d58e13d770dab8f85facd9a5035ae7bdb17","Differs" => 2,"Ix" => 0}],"Tree" => "5f7f15e4216ca911d7d124f6ecc91b968ab63310","Hdr" => "tree 5f7f15e4216ca911d7d124f6ecc91b968ab63310\nparent e81f8d58e13d770dab8f85facd9a5035ae7bdb17\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1522s git-debrebase get_differs 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b 290db9f88b6ffa542315f3f8b5f24f15797c33d2 = 0x2 1522s git-debrebase classify e81f8d58e13d770dab8f85facd9a5035ae7bdb17 $t=290db9f88b6ffa542315f3f8b5f24f15797c33d2 @p 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b/0x2 1522s git-debrebase = Upstream {"Tree" => "290db9f88b6ffa542315f3f8b5f24f15797c33d2","Hdr" => "tree 290db9f88b6ffa542315f3f8b5f24f15797c33d2\nparent 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b\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","Parents" => [{"CommitId" => "15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "e81f8d58e13d770dab8f85facd9a5035ae7bdb17"} 1522s git-debrebase get_differs f77f5a3cf715442ff9af63f94215e720d5c7249e 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd = 0x2 1522s git-debrebase classify 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b $t=7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd @p f77f5a3cf715442ff9af63f94215e720d5c7249e/0x2 1522s 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" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Ix" => 0}],"Type" => "Upstream","CommitId" => "15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b","Tree" => "7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd","Hdr" => "tree 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd\nparent f77f5a3cf715442ff9af63f94215e720d5c7249e\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n"} 1522s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1522s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1522s git-debrebase = Packaging {"Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b"}],"Msg" => "us-conflict\n"} 1522s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1522s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1522s git-debrebase = Packaging {"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Type" => "Packaging","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Ix" => 0}],"Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103"} 1522s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1522s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1522s git-debrebase = Packaging {"Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Type" => "Packaging","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298"}]} 1522s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1522s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1522s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"Differs" => 16,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Ix" => 0}],"Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 1522s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1522s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1522s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1522s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da"}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Ix" => 0,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70","Differs" => 2},$VAR1->{"OrigParents"}[0]],"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Type" => "Anchor","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c"} 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1522s git-debrebase >= delete refs/ffq-prev/heads/master 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1 1522s git-debrebase >= update refs/debrebase-last/heads/master d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 0000000000000000000000000000000000000000 1522s git-debrebase >= update HEAD d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 23622c7321349049ab04c3e2f87531a494b246a1 1522s git-debrebase >$ 1522s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1522s ' 1522s + : ----- introduce a vanilla merge ----- 1522s + t-merge-conflicted-stripping-conflict-markers other debian/zorkmid 1522s + local otherbranch=other 1522s + local file=debian/zorkmid 1522s + t-expect-fail 'F:Merge conflict in debian/zorkmid' git merge other 1522s + local 'mpat=F:Merge conflict in debian/zorkmid' 1522s + shift 1522s + set +o pipefail 1522s + LC_MESSAGES=C 1522s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1522s + LANGUAGE=C 1522s + git merge other 1522s Auto-merging debian/zorkmid 1522s CONFLICT (content): Merge conflict in debian/zorkmid 1522s Automatic merge failed; fix conflicts and then commit the result. 1522s + local 'ps=1 0' 1522s + set -o pipefail 1522s + case $ps in 1522s + t-grep-mpat 'F:Merge conflict in debian/zorkmid' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1522s + local 'mpat=F:Merge conflict in debian/zorkmid' 1522s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1522s + local grepper=fgrep 1522s + case "$mpat" in 1522s + case "$mpat" in 1522s + grepper=fgrep 1522s + mpat='Merge conflict in debian/zorkmid' 1522s + fgrep -e 'Merge conflict in debian/zorkmid' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1522s CONFLICT (content): Merge conflict in debian/zorkmid 1522s + perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' debian/zorkmid 1522s + git add debian/zorkmid 1522s + git commit --no-edit 1522s [master 43ca8e1] Merge branch 'other' 1522s + t-expect-fail 'E:general two-parent merge' t-git-debrebase 1522s + local 'mpat=E:general two-parent merge' 1522s + shift 1522s + set +o pipefail 1522s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1522s + LC_MESSAGES=C 1522s + LANGUAGE=C 1522s + t-git-debrebase 1522s + local gdr=git-debrebase 1522s + : ' 1522s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1522s + git-debrebase --dgit=dgit -D 1522s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1522s git-debrebase ffq check_specs * 1522s git-debrebase ffq merge master 1522s git-debrebase ffq check_remote origin remote fetch/merge branch 1522s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1522s OK, you are ahead of refs/remotes/origin/master 1522s git-debrebase ffq check_remote undef remote push branch 1522s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1522s git-debrebase *** WALK 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 0 - 1522s git-debrebase get_differs d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 deabef6f96bb1b7178f35d435657581e016549cf = 0x22 1522s git-debrebase get_differs 66770cce31f14cd16c7b57514e38b1f59a29a856 deabef6f96bb1b7178f35d435657581e016549cf = 0x32 1522s git-debrebase classify 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf $t=deabef6f96bb1b7178f35d435657581e016549cf @p d61fb6d45ea3ff4eedf9ec866c6941c743205eb7/0x22 66770cce31f14cd16c7b57514e38b1f59a29a856/0x32 1522s git-debrebase ** Unknown 1522s git-debrebase *** WALK BOMB unrecognised 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1522s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1522s 1522s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf) (d.0x22 0x32) 1522s git-debrebase: Branch/history seems mangled - no longer in gdr format. 1522s git-debrebase: See ILLEGAL OPERATIONS in git-debrebase(5). 1522s + local 'ps=255 0' 1522s + set -o pipefail 1522s + case $ps in 1522s + t-grep-mpat 'E:general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1522s + local 'mpat=E:general two-parent merge' 1522s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1522s + local grepper=fgrep 1522s + case "$mpat" in 1522s + case "$mpat" in 1522s + grepper=egrep 1522s + mpat='general two-parent merge' 1522s + egrep -e 'general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1522s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf) (d.0x22 0x32) 1522s + t_gdr_xopts+=' --experimental-merge-resolution' 1522s + : ----- expect to be able to merge ----- 1522s + t-git-debrebase 1522s + local gdr=git-debrebase 1522s + : ' 1522s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1522s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 1522s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1522s git-debrebase ffq check_specs * 1522s git-debrebase ffq merge master 1522s git-debrebase ffq check_remote origin remote fetch/merge branch 1522s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1522s OK, you are ahead of refs/remotes/origin/master 1522s git-debrebase ffq check_remote undef remote push branch 1522s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1522s git-debrebase *** WALK 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 0 - 1522s git-debrebase get_differs d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 deabef6f96bb1b7178f35d435657581e016549cf = 0x22 1522s git-debrebase get_differs 66770cce31f14cd16c7b57514e38b1f59a29a856 deabef6f96bb1b7178f35d435657581e016549cf = 0x32 1522s git-debrebase classify 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf $t=deabef6f96bb1b7178f35d435657581e016549cf @p d61fb6d45ea3ff4eedf9ec866c6941c743205eb7/0x22 66770cce31f14cd16c7b57514e38b1f59a29a856/0x32 1522s git-debrebase = VanillaMerge {"Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n","Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent d61fb6d45ea3ff4eedf9ec866c6941c743205eb7\nparent 66770cce31f14cd16c7b57514e38b1f59a29a856\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "d61fb6d45ea3ff4eedf9ec866c6941c743205eb7","Differs" => 34,"IsDgitImport" => undef,"IsOrigin" => "","Ix" => 0},{"IsDgitImport" => undef,"IsOrigin" => "","Ix" => 1,"CommitId" => "66770cce31f14cd16c7b57514e38b1f59a29a856","Differs" => 50}],"Type" => "VanillaMerge","Tree" => "deabef6f96bb1b7178f35d435657581e016549cf","CommitId" => "43ca8e1f591491b1c5f8f4bc3b8018ee98970daf"} 1522s git-debrebase *** MERGE 1522s git-debrebase mwrecknote vanilla-merge 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 1522s git-debrebase *** WALK d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 0 - 1522s git-debrebase get_differs 23622c7321349049ab04c3e2f87531a494b246a1 e38de421676caa1148e6e5d6e455bf955514342f = 0 1522s git-debrebase get_differs 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1 e38de421676caa1148e6e5d6e455bf955514342f = 0x32 1522s git-debrebase classify d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 23622c7321349049ab04c3e2f87531a494b246a1/0 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1/0x32 1522s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Parents" => [{"Ix" => 0,"CommitId" => "23622c7321349049ab04c3e2f87531a494b246a1","Differs" => 0},{"Ix" => 1,"CommitId" => "5e15b7ee5c56d7b4d69ef8a086c30a66598958a1","Differs" => 50}],"Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 23622c7321349049ab04c3e2f87531a494b246a1\nparent 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "d61fb6d45ea3ff4eedf9ec866c6941c743205eb7","Tree" => "e38de421676caa1148e6e5d6e455bf955514342f","Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0]} 1522s git-debrebase get_differs 81888cd1ecc5ca646e576d8a540db94208710647 e38de421676caa1148e6e5d6e455bf955514342f = 0x2 1522s git-debrebase classify 23622c7321349049ab04c3e2f87531a494b246a1 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 81888cd1ecc5ca646e576d8a540db94208710647/0x2 1522s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "e38de421676caa1148e6e5d6e455bf955514342f","CommitId" => "23622c7321349049ab04c3e2f87531a494b246a1","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 81888cd1ecc5ca646e576d8a540db94208710647\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "81888cd1ecc5ca646e576d8a540db94208710647"}]} 1522s git-debrebase get_differs 60f576c6186efb32ddd3cce7c8d618e0838f3ebd 698a2560d79a004c2c8f172bfb77966a4d931ec1 = 0x2 1522s git-debrebase classify 81888cd1ecc5ca646e576d8a540db94208710647 $t=698a2560d79a004c2c8f172bfb77966a4d931ec1 @p 60f576c6186efb32ddd3cce7c8d618e0838f3ebd/0x2 1522s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-us.c (us-2)\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "60f576c6186efb32ddd3cce7c8d618e0838f3ebd"}],"Hdr" => "tree 698a2560d79a004c2c8f172bfb77966a4d931ec1\nparent 60f576c6186efb32ddd3cce7c8d618e0838f3ebd\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "698a2560d79a004c2c8f172bfb77966a4d931ec1","CommitId" => "81888cd1ecc5ca646e576d8a540db94208710647","Type" => "Upstream"} 1522s git-debrebase get_differs 773840a34b78968a5547ba99b314542fd263dfc0 e8b94450cb8e681e494689fb8332a4becf2fd75d = 0x2 1522s git-debrebase classify 60f576c6186efb32ddd3cce7c8d618e0838f3ebd $t=e8b94450cb8e681e494689fb8332a4becf2fd75d @p 773840a34b78968a5547ba99b314542fd263dfc0/0x2 1522s git-debrebase = Upstream {"Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "773840a34b78968a5547ba99b314542fd263dfc0","Ix" => 0}],"Hdr" => "tree e8b94450cb8e681e494689fb8332a4becf2fd75d\nparent 773840a34b78968a5547ba99b314542fd263dfc0\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "60f576c6186efb32ddd3cce7c8d618e0838f3ebd","Tree" => "e8b94450cb8e681e494689fb8332a4becf2fd75d","Type" => "Upstream"} 1522s git-debrebase get_differs b9cff9c120d085330ed394d99fcc23a45714eeec af732c5124a36938b085e0b7c534b2935a2519bf = 0x2 1522s git-debrebase classify 773840a34b78968a5547ba99b314542fd263dfc0 $t=af732c5124a36938b085e0b7c534b2935a2519bf @p b9cff9c120d085330ed394d99fcc23a45714eeec/0x2 1522s git-debrebase = Upstream {"CommitId" => "773840a34b78968a5547ba99b314542fd263dfc0","Tree" => "af732c5124a36938b085e0b7c534b2935a2519bf","Type" => "Upstream","Msg" => "UPSTREAM edit src-us.c (us-1)\n","Parents" => [{"Ix" => 0,"CommitId" => "b9cff9c120d085330ed394d99fcc23a45714eeec","Differs" => 2}],"Hdr" => "tree af732c5124a36938b085e0b7c534b2935a2519bf\nparent b9cff9c120d085330ed394d99fcc23a45714eeec\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1522s git-debrebase get_differs 5c95dd8effd34ae96b528da18ad695d34a56b6b0 3e1d62be2276fc0c07e618f0afa1c015ba613ae1 = 0x2 1522s git-debrebase classify b9cff9c120d085330ed394d99fcc23a45714eeec $t=3e1d62be2276fc0c07e618f0afa1c015ba613ae1 @p 5c95dd8effd34ae96b528da18ad695d34a56b6b0/0x2 1522s git-debrebase = Upstream {"Hdr" => "tree 3e1d62be2276fc0c07e618f0afa1c015ba613ae1\nparent 5c95dd8effd34ae96b528da18ad695d34a56b6b0\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "5c95dd8effd34ae96b528da18ad695d34a56b6b0","Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "b9cff9c120d085330ed394d99fcc23a45714eeec","Tree" => "3e1d62be2276fc0c07e618f0afa1c015ba613ae1"} 1522s git-debrebase get_differs b3a7b35aedeb0f06f45908772ba2fe6ab61451f5 e0b7dfbd5a539e0394c71cfd449ea9de3914f928 = 0x2 1522s git-debrebase classify 5c95dd8effd34ae96b528da18ad695d34a56b6b0 $t=e0b7dfbd5a539e0394c71cfd449ea9de3914f928 @p b3a7b35aedeb0f06f45908772ba2fe6ab61451f5/0x2 1522s git-debrebase = Upstream {"Hdr" => "tree e0b7dfbd5a539e0394c71cfd449ea9de3914f928\nparent b3a7b35aedeb0f06f45908772ba2fe6ab61451f5\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "b3a7b35aedeb0f06f45908772ba2fe6ab61451f5","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream","CommitId" => "5c95dd8effd34ae96b528da18ad695d34a56b6b0","Tree" => "e0b7dfbd5a539e0394c71cfd449ea9de3914f928"} 1522s git-debrebase get_differs e81f8d58e13d770dab8f85facd9a5035ae7bdb17 5f7f15e4216ca911d7d124f6ecc91b968ab63310 = 0x2 1522s git-debrebase classify b3a7b35aedeb0f06f45908772ba2fe6ab61451f5 $t=5f7f15e4216ca911d7d124f6ecc91b968ab63310 @p e81f8d58e13d770dab8f85facd9a5035ae7bdb17/0x2 1522s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "b3a7b35aedeb0f06f45908772ba2fe6ab61451f5","Tree" => "5f7f15e4216ca911d7d124f6ecc91b968ab63310","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 5f7f15e4216ca911d7d124f6ecc91b968ab63310\nparent e81f8d58e13d770dab8f85facd9a5035ae7bdb17\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "e81f8d58e13d770dab8f85facd9a5035ae7bdb17","Ix" => 0}]} 1522s git-debrebase get_differs 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b 290db9f88b6ffa542315f3f8b5f24f15797c33d2 = 0x2 1522s git-debrebase classify e81f8d58e13d770dab8f85facd9a5035ae7bdb17 $t=290db9f88b6ffa542315f3f8b5f24f15797c33d2 @p 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b/0x2 1522s git-debrebase = Upstream {"Tree" => "290db9f88b6ffa542315f3f8b5f24f15797c33d2","CommitId" => "e81f8d58e13d770dab8f85facd9a5035ae7bdb17","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b","Ix" => 0}],"Hdr" => "tree 290db9f88b6ffa542315f3f8b5f24f15797c33d2\nparent 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n"} 1522s git-debrebase get_differs f77f5a3cf715442ff9af63f94215e720d5c7249e 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd = 0x2 1522s git-debrebase classify 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b $t=7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd @p f77f5a3cf715442ff9af63f94215e720d5c7249e/0x2 1522s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd","CommitId" => "15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b","Hdr" => "tree 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd\nparent f77f5a3cf715442ff9af63f94215e720d5c7249e\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1522s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1522s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1522s git-debrebase = Packaging {"Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Differs" => 32}],"Msg" => "us-conflict\n","Type" => "Packaging","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e"} 1522s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1522s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1522s git-debrebase = Packaging {"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Type" => "Packaging","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1522s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1522s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1522s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Differs" => 32}],"Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "DEBIAN add zorkmid-us (us-2)\n","CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Type" => "Packaging"} 1522s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1522s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1522s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"Ix" => 0,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Differs" => 16}],"Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Type" => "Changelog"} 1522s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1522s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1522s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1522s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","OrigParents" => [{"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Differs" => 48,"Ix" => 1}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70"},$VAR1->{"OrigParents"}[0]]} 1522s git-debrebase *** WALK prep done cur=d50318b393ee163dd38aa93c9427a1ce6a993b3a brw 3 upp 9 proc 15 pm 0 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1522s git-debrebase WALK REBUILD d50318b393ee163dd38aa93c9427a1ce6a993b3a 16 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1522s git-debrebase WALK BUILD bbe1078ab4e02c973ffae4ecc124fccd0ebee298 Debian (rewriting=0) 1522s git-debrebase WALK BUILD 16f86dfb60387585ebd2714c26703a02aa3d2265 Debian (rewriting=0) 1522s git-debrebase WALK BUILD 679a57a2fb7abcea83d6a6401e6ed325b289669b Debian (rewriting=0) 1522s git-debrebase WALK BUILD f77f5a3cf715442ff9af63f94215e720d5c7249e Debian (rewriting=0) 1522s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1522s git-debrebase WALK BUILD 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b Upstream (rewriting=0) 1522s git-debrebase WALK BUILD e81f8d58e13d770dab8f85facd9a5035ae7bdb17 Upstream (rewriting=0) 1522s git-debrebase WALK BUILD b3a7b35aedeb0f06f45908772ba2fe6ab61451f5 Upstream (rewriting=0) 1522s git-debrebase WALK BUILD 5c95dd8effd34ae96b528da18ad695d34a56b6b0 Upstream (rewriting=0) 1522s git-debrebase WALK BUILD b9cff9c120d085330ed394d99fcc23a45714eeec Upstream (rewriting=0) 1522s git-debrebase WALK BUILD 773840a34b78968a5547ba99b314542fd263dfc0 Upstream (rewriting=0) 1522s git-debrebase WALK BUILD 60f576c6186efb32ddd3cce7c8d618e0838f3ebd Upstream (rewriting=0) 1522s git-debrebase WALK BUILD 81888cd1ecc5ca646e576d8a540db94208710647 Upstream (rewriting=0) 1522s git-debrebase WALK BUILD 23622c7321349049ab04c3e2f87531a494b246a1 Upstream (rewriting=0) 1522s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1522s git-debrebase get_differs 23622c7321349049ab04c3e2f87531a494b246a1 d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 = 0 1522s git-debrebase *** WALK RETURN 23622c7321349049ab04c3e2f87531a494b246a1 f77f5a3cf715442ff9af63f94215e720d5c7249e d50318b393ee163dd38aa93c9427a1ce6a993b3a 1522s git-debrebase mwrecknote left-input d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 1522s git-debrebase mwrecknote left-laundered 23622c7321349049ab04c3e2f87531a494b246a1 1522s git-debrebase mwrecknote left-breakwater f77f5a3cf715442ff9af63f94215e720d5c7249e 1522s git-debrebase mwrecknote left-anchor d50318b393ee163dd38aa93c9427a1ce6a993b3a 1522s git-debrebase MERGE BA best=d50318b393ee163dd38aa93c9427a1ce6a993b3a p=d50318b393ee163dd38aa93c9427a1ce6a993b3a 1522s git-debrebase *** WALK 66770cce31f14cd16c7b57514e38b1f59a29a856 0 - 1522s git-debrebase get_differs 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca 11cb3d048b147c76ac8e15998d01b777a72434a7 = 0x20 1522s git-debrebase classify 66770cce31f14cd16c7b57514e38b1f59a29a856 $t=11cb3d048b147c76ac8e15998d01b777a72434a7 @p 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca/0x20 1522s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "11cb3d048b147c76ac8e15998d01b777a72434a7","CommitId" => "66770cce31f14cd16c7b57514e38b1f59a29a856","Msg" => "other-conflict\n","Hdr" => "tree 11cb3d048b147c76ac8e15998d01b777a72434a7\nparent 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000007 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca","Ix" => 0}]} 1522s git-debrebase get_differs c49d2b2a9ad96cef20289702368179fbf9451928 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x22 1522s git-debrebase classify 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p c49d2b2a9ad96cef20289702368179fbf9451928/0x22 1522s git-debrebase = Mixed {"Parents" => [{"Differs" => 34,"CommitId" => "c49d2b2a9ad96cef20289702368179fbf9451928","Ix" => 0}],"Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent c49d2b2a9ad96cef20289702368179fbf9451928\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Msg" => "MIXED add both(-other) (other)\n","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca","Type" => "Mixed"} 1522s git-debrebase get_differs 93fb9b858aa57847959deb395e6e7f54a29d8459 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 = 0x2 1522s git-debrebase classify c49d2b2a9ad96cef20289702368179fbf9451928 $t=6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 @p 93fb9b858aa57847959deb395e6e7f54a29d8459/0x2 1522s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "c49d2b2a9ad96cef20289702368179fbf9451928","Tree" => "6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3","Msg" => "UPSTREAM edit src-other.c (other)\n","Hdr" => "tree 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3\nparent 93fb9b858aa57847959deb395e6e7f54a29d8459\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "93fb9b858aa57847959deb395e6e7f54a29d8459","Ix" => 0}]} 1522s git-debrebase get_differs ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 0b23db5d4cdb928c7302154a99ab0e961fcb877a = 0x20 1522s git-debrebase classify 93fb9b858aa57847959deb395e6e7f54a29d8459 $t=0b23db5d4cdb928c7302154a99ab0e961fcb877a @p ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6/0x20 1522s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6"}],"Hdr" => "tree 0b23db5d4cdb928c7302154a99ab0e961fcb877a\nparent ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","CommitId" => "93fb9b858aa57847959deb395e6e7f54a29d8459","Tree" => "0b23db5d4cdb928c7302154a99ab0e961fcb877a","Type" => "Packaging"} 1522s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1522s git-debrebase get_differs b377a9960f3a99f617597d2203ab69805f4af3d1 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1522s git-debrebase classify ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5/0 b377a9960f3a99f617597d2203ab69805f4af3d1/0 1522s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","SubType" => "Ambiguous","Parents" => [{"Ix" => 0,"CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Differs" => 0},{"Ix" => 1,"Differs" => 0,"CommitId" => "b377a9960f3a99f617597d2203ab69805f4af3d1"}],"Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5\nparent b377a9960f3a99f617597d2203ab69805f4af3d1\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0]} 1522s git-debrebase get_differs 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 1522s git-debrebase classify 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a/0x2 1522s git-debrebase = Upstream {"Parents" => [{"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Differs" => 2,"Ix" => 0}],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a\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","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Type" => "Upstream"} 1522s git-debrebase get_differs 61838f71874d7ddb712bb3c25e0a0c91734bab47 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 1522s git-debrebase classify 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 61838f71874d7ddb712bb3c25e0a0c91734bab47/0x2 1522s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Msg" => "UPSTREAM edit src.c (before)\n","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 61838f71874d7ddb712bb3c25e0a0c91734bab47\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Differs" => 2}]} 1522s git-debrebase get_differs cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 1522s git-debrebase classify 61838f71874d7ddb712bb3c25e0a0c91734bab47 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p cfa06dbc0f977f48e1449a0f11ee4106d8bf1269/0x2 1522s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent cfa06dbc0f977f48e1449a0f11ee4106d8bf1269\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1522s git-debrebase get_differs 31cc003deb18794414e5604fc32fdd9819189100 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 1522s git-debrebase classify cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p 31cc003deb18794414e5604fc32fdd9819189100/0x2 1522s git-debrebase = Upstream {"Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent 31cc003deb18794414e5604fc32fdd9819189100\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c"} 1522s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 1522s git-debrebase classify 31cc003deb18794414e5604fc32fdd9819189100 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 1522s 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" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 2}],"Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Type" => "Upstream"} 1522s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1522s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1522s git-debrebase = Packaging {"Parents" => [{"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32,"Ix" => 0}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\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" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging"} 1522s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1522s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1522s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "DEBIAN add zorkmid (before)\n"} 1522s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1522s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1522s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog"} 1522s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1522s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1522s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Differs" => 16,"Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog"} 1522s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1522s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1522s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1522s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\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","OrigParents" => [{"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48,"Ix" => 1}],"Parents" => [{"Ix" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"} 1522s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 7 upp 7 proc 16 pm 0 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1522s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 17 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1522s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1522s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1522s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1522s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1522s git-debrebase WALK BUILD 93fb9b858aa57847959deb395e6e7f54a29d8459 Debian (rewriting=0) 1522s git-debrebase WALK REWRITING NOW cl=HASH(0xa0288f0aa8) procd=HASH(0xa0288f7bb0) 1522s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1522s git-debrebase WALK BUILD 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca Debian (rewriting=1) 1522s git-debrebase WALK BUILD 66770cce31f14cd16c7b57514e38b1f59a29a856 Debian (rewriting=1) 1522s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1522s git-debrebase WALK BUILD 31cc003deb18794414e5604fc32fdd9819189100 Upstream (rewriting=1) 1522s git-debrebase WALK BUILD cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 Upstream (rewriting=1) 1522s git-debrebase WALK BUILD 61838f71874d7ddb712bb3c25e0a0c91734bab47 Upstream (rewriting=1) 1522s git-debrebase WALK BUILD 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a Upstream (rewriting=1) 1522s git-debrebase WALK BUILD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 Upstream (rewriting=1) 1522s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1522s git-debrebase WALK BUILD c49d2b2a9ad96cef20289702368179fbf9451928 Upstream (rewriting=1) 1522s git-debrebase WALK BUILD 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca Upstream (rewriting=1) 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1522s git-debrebase get_differs 9019de9f8896aea2dd0f60e07d5f7b85ee5a3c86 66770cce31f14cd16c7b57514e38b1f59a29a856 = 0 1522s git-debrebase *** WALK RETURN 9019de9f8896aea2dd0f60e07d5f7b85ee5a3c86 2e477ebdadbfd34200641bc4d10e83fddd22be86 48c55fcd6aad3671faeeedd232289eea48db8cce 1522s git-debrebase mwrecknote right-input 66770cce31f14cd16c7b57514e38b1f59a29a856 1522s git-debrebase mwrecknote right-laundered 9019de9f8896aea2dd0f60e07d5f7b85ee5a3c86 1522s git-debrebase mwrecknote right-breakwater 2e477ebdadbfd34200641bc4d10e83fddd22be86 1522s git-debrebase mwrecknote right-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1522s git-debrebase MERGE BA best=d50318b393ee163dd38aa93c9427a1ce6a993b3a p=48c55fcd6aad3671faeeedd232289eea48db8cce 1522s git-debrebase mwrecknote result-anchor d50318b393ee163dd38aa93c9427a1ce6a993b3a 1522s git-debrebase mwrecknote interchange-mbcand-ok-0 ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 1522s git-debrebase *** WALK ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 0 - 1522s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1522s git-debrebase get_differs b377a9960f3a99f617597d2203ab69805f4af3d1 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1522s git-debrebase classify ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5/0 b377a9960f3a99f617597d2203ab69805f4af3d1/0 1522s git-debrebase = Pseudomerge {"Parents" => [{"CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Differs" => 0,"Ix" => 0},{"Ix" => 1,"CommitId" => "b377a9960f3a99f617597d2203ab69805f4af3d1","Differs" => 0}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","SubType" => "Ambiguous","CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5\nparent b377a9960f3a99f617597d2203ab69805f4af3d1\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge"} 1522s git-debrebase get_differs 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 1522s git-debrebase classify 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a/0x2 1522s git-debrebase = Upstream {"Parents" => [{"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Differs" => 2,"Ix" => 0}],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a\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","CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Type" => "Upstream"} 1522s git-debrebase get_differs 61838f71874d7ddb712bb3c25e0a0c91734bab47 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 1522s git-debrebase classify 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 61838f71874d7ddb712bb3c25e0a0c91734bab47/0x2 1522s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 61838f71874d7ddb712bb3c25e0a0c91734bab47\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (before)\n"} 1522s git-debrebase get_differs cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 1522s git-debrebase classify 61838f71874d7ddb712bb3c25e0a0c91734bab47 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p cfa06dbc0f977f48e1449a0f11ee4106d8bf1269/0x2 1522s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent cfa06dbc0f977f48e1449a0f11ee4106d8bf1269\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269"}]} 1522s git-debrebase get_differs 31cc003deb18794414e5604fc32fdd9819189100 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 1522s git-debrebase classify cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p 31cc003deb18794414e5604fc32fdd9819189100/0x2 1522s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent 31cc003deb18794414e5604fc32fdd9819189100\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Ix" => 0}],"Type" => "Upstream","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269"} 1522s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 1522s git-debrebase classify 31cc003deb18794414e5604fc32fdd9819189100 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 1522s git-debrebase = Upstream {"Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 2,"Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666"} 1522s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1522s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1522s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32}]} 1522s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1522s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1522s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "DEBIAN add zorkmid (before)\n"} 1522s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1522s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1522s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16}],"Type" => "Changelog","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1522s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1522s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1522s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1522s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1522s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1522s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1522s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48,"Ix" => 1}],"Parents" => [{"Ix" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1522s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 3 upp 5 proc 11 pm 0 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1522s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 12 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1522s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1522s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1522s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1522s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1522s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1522s git-debrebase WALK BUILD 31cc003deb18794414e5604fc32fdd9819189100 Upstream (rewriting=0) 1522s git-debrebase WALK BUILD cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 Upstream (rewriting=0) 1522s git-debrebase WALK BUILD 61838f71874d7ddb712bb3c25e0a0c91734bab47 Upstream (rewriting=0) 1522s git-debrebase WALK BUILD 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a Upstream (rewriting=0) 1522s git-debrebase WALK BUILD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 Upstream (rewriting=0) 1522s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1522s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 = 0 1522s git-debrebase *** WALK RETURN 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 48c55fcd6aad3671faeeedd232289eea48db8cce 1522s git-debrebase mwrecknote mergebase-laundered 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 1522s git-debrebase mwrecknote mergebase-breakwater 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1522s git-debrebase mwrecknote mergebase-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1522s git-debrebase *** WALK prep done cur=43ca8e1f591491b1c5f8f4bc3b8018ee98970daf brw 0 upp 0 proc 0 pm -1 1522s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1523s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1523s git-debrebase WALK REBUILD 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 1 1523s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1523s git-debrebase WALK BUILD 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf MergeCreateMergedBreakwaters (rewriting=0) 1523s Found a general merge, will try to tidy it up. 1523s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1523s git-debrebase WALK BUILD 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf MergeMergeSeries (rewriting=1) 1523s git-debrebase >(no reflog) 1523s Running merge resolution for 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf... 1523s git-debrebase mwrecknote new-base 531003972219750d3af702dacee662b59fa321b3 1523s git-debrebase merge_series newbase=531003972219750d3af702dacee662b59fa321b3 1523s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1523s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1523s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1523s git-debrebase gbp_pq_export p-base 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 1523s git-debrebase merge_series pec 03d60a2524e3e0b3a0281be728df4028f9bcb793 pec' eedf2a3c6ed53d55b4bbfb7d682395270eedf604 1523s git-debrebase mwrecknote mergebase-patchqueue eedf2a3c6ed53d55b4bbfb7d682395270eedf604 1523s git-debrebase gbp_pq_export p-1 2e477ebdadbfd34200641bc4d10e83fddd22be86 9019de9f8896aea2dd0f60e07d5f7b85ee5a3c86 1523s git-debrebase merge_series pec 7bb77161678e5330059b4645e7d07c7f39bf6631 pec' 4b214fa6ce2cd4150e98e0c73673e9e9a8055698 1523s git-debrebase mwrecknote right-patchqueue 4b214fa6ce2cd4150e98e0c73673e9e9a8055698 1523s git-debrebase gbp_pq_export p-0 f77f5a3cf715442ff9af63f94215e720d5c7249e 23622c7321349049ab04c3e2f87531a494b246a1 1523s git-debrebase merge_series pec d3e27d1a88bd0deb007fe388e858393becaf22b1 pec' 6178e5d30f2ce2266a1324dac57b5da19c574b51 1523s git-debrebase mwrecknote left-patchqueue 6178e5d30f2ce2266a1324dac57b5da19c574b51 1523s git-debrebase merge_series merging... 1523s git-debrebase merge_series merge ok, series... 1523s git-debrebase merge_series patch 0001-Add-a-new-upstream-file.patch keep 1523s merge_series patch 0002-Edit-the-.c-file.patch keep 1523s merge_series prereq 0002-Edit-the-.c-file.patch -> 0001-Add-a-new-upstream-file.patch keep 1523s merge_series patch 0004-UPSTREAM-edit-src.c-before.patch keep 1523s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0001-Add-a-new-upstream-file.patch keep 1523s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0002-Edit-the-.c-file.patch keep 1523s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> subdir/addnewups keep 1523s merge_series patch 0005-MIXED-add-both-before.patch keep 1523s merge_series prereq 0005-MIXED-add-both-before.patch -> 0001-Add-a-new-upstream-file.patch keep 1523s merge_series prereq 0005-MIXED-add-both-before.patch -> 0002-Edit-the-.c-file.patch keep 1523s merge_series prereq 0005-MIXED-add-both-before.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1523s merge_series prereq 0005-MIXED-add-both-before.patch -> subdir/addnewups keep 1523s merge_series patch 0006-UPSTREAM-edit-src-other.c-other.patch keep 1523s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0001-Add-a-new-upstream-file.patch keep 1523s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0002-Edit-the-.c-file.patch keep 1523s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1523s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0005-MIXED-add-both-before.patch keep 1523s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> subdir/addnewups keep 1523s merge_series patch 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 1523s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0001-Add-a-new-upstream-file.patch keep 1523s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0002-Edit-the-.c-file.patch keep 1523s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1523s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0005-MIXED-add-both-before.patch keep 1523s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> subdir/addnewups keep 1523s merge_series patch 0007-MIXED-add-both-other-other.patch keep 1523s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0001-Add-a-new-upstream-file.patch keep 1523s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0002-Edit-the-.c-file.patch keep 1523s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1523s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0005-MIXED-add-both-before.patch keep 1523s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 1523s merge_series prereq 0007-MIXED-add-both-other-other.patch -> subdir/addnewups keep 1523s merge_series patch 0007-MIXED-add-both-us-us-1.patch keep 1523s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0001-Add-a-new-upstream-file.patch keep 1523s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0002-Edit-the-.c-file.patch keep 1523s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1523s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0005-MIXED-add-both-before.patch keep 1523s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 1523s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> subdir/addnewups keep 1523s merge_series patch 0008-UPSTREAM-edit-src-us.c-us-2.patch keep 1523s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0001-Add-a-new-upstream-file.patch keep 1523s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0002-Edit-the-.c-file.patch keep 1523s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1523s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0005-MIXED-add-both-before.patch keep 1523s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 1523s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0007-MIXED-add-both-us-us-1.patch keep 1523s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> subdir/addnewups keep 1523s merge_series patch 0009-MIXED-add-both-us-us-2.patch keep 1523s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0001-Add-a-new-upstream-file.patch keep 1523s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0002-Edit-the-.c-file.patch keep 1523s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1523s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0005-MIXED-add-both-before.patch keep 1523s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 1523s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0007-MIXED-add-both-us-us-1.patch keep 1523s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0008-UPSTREAM-edit-src-us.c-us-2.patch keep 1523s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> subdir/addnewups keep 1523s merge_series patch subdir/addnewups keep 1523s merge_series prereq subdir/addnewups -> 0001-Add-a-new-upstream-file.patch keep 1523s merge_series prereq subdir/addnewups -> 0002-Edit-the-.c-file.patch keep 1523s merge_series series next 0001-Add-a-new-upstream-file.patch 1523s git-debrebase merge_series series next 0002-Edit-the-.c-file.patch 1523s git-debrebase merge_series series next subdir/addnewups 1523s git-debrebase merge_series series next 0004-UPSTREAM-edit-src.c-before.patch 1523s git-debrebase merge_series series next 0005-MIXED-add-both-before.patch 1523s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-other.c-other.patch 1523s git-debrebase merge_series series next 0007-MIXED-add-both-other-other.patch 1523s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-us.c-us-1.patch 1523s git-debrebase merge_series series next 0007-MIXED-add-both-us-us-1.patch 1523s git-debrebase merge_series series next 0008-UPSTREAM-edit-src-us.c-us-2.patch 1523s git-debrebase merge_series series next 0009-MIXED-add-both-us-us-2.patch 1523s git-debrebase mwrecknote merged-patchqueue 4c61000702ef56bd36a7bd757a79d699267d0489 1523s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1523s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1523s git-debrebase merge_series series gbp pq import 1523s gbp:info: Trying to apply patches at '4c61000702ef56bd36a7bd757a79d699267d0489' 1524s gbp:info: 11 patches listed in 'debian/patches/series' imported on 'patch-queue/mergec' 1524s git-debrebase merge_series series ok, building... 1524s git-debrebase merge_series series ok, building f6865c827f51cf81c7d609faa0835fbe58b97764 1524s git-debrebase merge_series series ok, building f4df155e0834e8105574f155d5b2a0dcebcade62 1524s git-debrebase merge_series series ok, building 841a63a7a949f584040d9077fb41d78199d2abe8 1524s git-debrebase merge_series series ok, building ecd6820dbfeaa559926302925501939fe4d22a2f 1524s git-debrebase merge_series series ok, building 5a15bcf66c3e4d36d2940c2324739de9a34a7bcb 1524s git-debrebase merge_series series ok, building c8c98104f22d2de3c273496bc723526bc40f8200 1524s git-debrebase merge_series series ok, building 31afbe371ee13b0ca8499a198cf6c4025aa25d13 1524s git-debrebase merge_series series ok, building 63ef538e56a46f073b6a54e04aaa5e806f7f9a06 1524s git-debrebase merge_series series ok, building ebd449fd9754fc753e076c23ab7d18d99cc431cc 1524s git-debrebase merge_series series ok, building 3f7bdfccac59dbb7b46ed2c39c1653fe77ef0bf1 1524s git-debrebase merge_series series ok, building c2c86934cb5a6a3f318c2eef650146b381194ac9 1524s git-debrebase mwrecknote merged-result c27beccf459a62bf651764dddc020fa7c837a706 1524s git-debrebase merge_series done debug=03d14f4ce80fc2f7e60225320e117962ea913a12 1524s git-debrebase mwrecknote merged-debug 03d14f4ce80fc2f7e60225320e117962ea913a12 1524s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1524s git-debrebase merge_series returns c27beccf459a62bf651764dddc020fa7c837a706 1524s git-debrebase get_differs c27beccf459a62bf651764dddc020fa7c837a706 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf = 0 1524s git-debrebase get_differs c27beccf459a62bf651764dddc020fa7c837a706 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf = 0 1524s Merge resolution successful. 1524s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1524s git-debrebase get_differs c27beccf459a62bf651764dddc020fa7c837a706 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf = 0 1524s git-debrebase *** WALK RETURN c27beccf459a62bf651764dddc020fa7c837a706 531003972219750d3af702dacee662b59fa321b3 d50318b393ee163dd38aa93c9427a1ce6a993b3a 1524s git-debrebase: laundered (head was 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf) 1524s git-debrebase >= update refs/ffq-prev/heads/master 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 0000000000000000000000000000000000000000 1524s git-debrebase >= delete refs/debrebase-last/heads/master 1524s git-debrebase >= update HEAD c27beccf459a62bf651764dddc020fa7c837a706 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 1524s git-debrebase >$ 1524s Recorded previous head for preservation 1524s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1524s ' 1524s + t-gdr-good laundered 1524s + local state=laundered 1524s + local beforetag= 1524s + case $state in 1524s + git diff --quiet -- :. ':!debian/patches' 1524s + LC_MESSAGES=C 1524s + t-git-debrebase status 1524s + local gdr=git-debrebase 1524s + : ' 1524s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1524s + git-debrebase --dgit=dgit -D --experimental-merge-resolution status 1524s git-debrebase get_differs 1f557e51ff27fe3f1d68461818d0a399e715151a deabef6f96bb1b7178f35d435657581e016549cf = 0x2 1524s git-debrebase classify c27beccf459a62bf651764dddc020fa7c837a706 $t=deabef6f96bb1b7178f35d435657581e016549cf @p 1f557e51ff27fe3f1d68461818d0a399e715151a/0x2 1524s 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","Type" => "Upstream","CommitId" => "c27beccf459a62bf651764dddc020fa7c837a706","Tree" => "deabef6f96bb1b7178f35d435657581e016549cf","Parents" => [{"Differs" => 2,"CommitId" => "1f557e51ff27fe3f1d68461818d0a399e715151a","Ix" => 0}],"Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent 1f557e51ff27fe3f1d68461818d0a399e715151a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs 7b76b54ea39f772ad8d64f830dae314a3c96aa72 a5b847c5f5608d10a68a18fee7f620409d6acdff = 0x2 1524s git-debrebase classify 1f557e51ff27fe3f1d68461818d0a399e715151a $t=a5b847c5f5608d10a68a18fee7f620409d6acdff @p 7b76b54ea39f772ad8d64f830dae314a3c96aa72/0x2 1524s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "1f557e51ff27fe3f1d68461818d0a399e715151a","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 7b76b54ea39f772ad8d64f830dae314a3c96aa72\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "a5b847c5f5608d10a68a18fee7f620409d6acdff","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "7b76b54ea39f772ad8d64f830dae314a3c96aa72"}]} 1524s git-debrebase get_differs 9457f0319c958b48982521510148a1a7932c438d acf4d861de73e2116f79da4799bd30ae73dc369c = 0x2 1524s git-debrebase classify 7b76b54ea39f772ad8d64f830dae314a3c96aa72 $t=acf4d861de73e2116f79da4799bd30ae73dc369c @p 9457f0319c958b48982521510148a1a7932c438d/0x2 1524s git-debrebase = 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","Type" => "Upstream","CommitId" => "7b76b54ea39f772ad8d64f830dae314a3c96aa72","Tree" => "acf4d861de73e2116f79da4799bd30ae73dc369c","Parents" => [{"Ix" => 0,"CommitId" => "9457f0319c958b48982521510148a1a7932c438d","Differs" => 2}],"Hdr" => "tree acf4d861de73e2116f79da4799bd30ae73dc369c\nparent 9457f0319c958b48982521510148a1a7932c438d\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 92aac2dbe83cd0960a78439e44ee36c146c5df98 = 0x2 1524s git-debrebase classify 9457f0319c958b48982521510148a1a7932c438d $t=92aac2dbe83cd0960a78439e44ee36c146c5df98 @p 9db4da97d5f8680310f8ab8723be8cbabee8e0a3/0x2 1524s 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","CommitId" => "9457f0319c958b48982521510148a1a7932c438d","Type" => "Upstream","Parents" => [{"CommitId" => "9db4da97d5f8680310f8ab8723be8cbabee8e0a3","Ix" => 0,"Differs" => 2}],"Tree" => "92aac2dbe83cd0960a78439e44ee36c146c5df98","Hdr" => "tree 92aac2dbe83cd0960a78439e44ee36c146c5df98\nparent 9db4da97d5f8680310f8ab8723be8cbabee8e0a3\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs 5a0dd58d83fc87c160def1a96fb25b4568f04cec 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 = 0x2 1524s git-debrebase classify 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 $t=9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 @p 5a0dd58d83fc87c160def1a96fb25b4568f04cec/0x2 1524s git-debrebase = Upstream {"Hdr" => "tree 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4\nparent 5a0dd58d83fc87c160def1a96fb25b4568f04cec\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4","Parents" => [{"Ix" => 0,"CommitId" => "5a0dd58d83fc87c160def1a96fb25b4568f04cec","Differs" => 2}],"Type" => "Upstream","CommitId" => "9db4da97d5f8680310f8ab8723be8cbabee8e0a3","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"} 1524s git-debrebase get_differs 70b07d5fdfff717e5ae09350777924d86465f02f 4844b97a44f315daca96b2361badd4d135ea373c = 0x2 1524s git-debrebase classify 5a0dd58d83fc87c160def1a96fb25b4568f04cec $t=4844b97a44f315daca96b2361badd4d135ea373c @p 70b07d5fdfff717e5ae09350777924d86465f02f/0x2 1524s git-debrebase = Upstream {"Hdr" => "tree 4844b97a44f315daca96b2361badd4d135ea373c\nparent 70b07d5fdfff717e5ae09350777924d86465f02f\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "4844b97a44f315daca96b2361badd4d135ea373c","Parents" => [{"CommitId" => "70b07d5fdfff717e5ae09350777924d86465f02f","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","CommitId" => "5a0dd58d83fc87c160def1a96fb25b4568f04cec","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch"} 1524s git-debrebase get_differs a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 0e902e52f7664910822aaa8b2c8ce07adbe82b4b = 0x2 1524s git-debrebase classify 70b07d5fdfff717e5ae09350777924d86465f02f $t=0e902e52f7664910822aaa8b2c8ce07adbe82b4b @p a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393/0x2 1524s git-debrebase = Upstream {"Hdr" => "tree 0e902e52f7664910822aaa8b2c8ce07adbe82b4b\nparent a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393"}],"Tree" => "0e902e52f7664910822aaa8b2c8ce07adbe82b4b","CommitId" => "70b07d5fdfff717e5ae09350777924d86465f02f","Type" => "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"} 1524s git-debrebase get_differs 894792d8499295fadeaf57b4144ce5c9888916b6 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 = 0x2 1524s git-debrebase classify a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 $t=2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 @p 894792d8499295fadeaf57b4144ce5c9888916b6/0x2 1524s git-debrebase = Upstream {"Hdr" => "tree 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488\nparent 894792d8499295fadeaf57b4144ce5c9888916b6\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "894792d8499295fadeaf57b4144ce5c9888916b6"}],"Tree" => "2a7ff02ad3fb5c8ef0b42810651560a14f1f7488","CommitId" => "a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch"} 1524s git-debrebase get_differs edd43a440203725dfb4eb77fe703f18f4338ae81 e604da492dadb01ff5ab227f55c684c7c9f7c4d0 = 0x2 1524s git-debrebase classify 894792d8499295fadeaf57b4144ce5c9888916b6 $t=e604da492dadb01ff5ab227f55c684c7c9f7c4d0 @p edd43a440203725dfb4eb77fe703f18f4338ae81/0x2 1524s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "894792d8499295fadeaf57b4144ce5c9888916b6","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree e604da492dadb01ff5ab227f55c684c7c9f7c4d0\nparent edd43a440203725dfb4eb77fe703f18f4338ae81\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "e604da492dadb01ff5ab227f55c684c7c9f7c4d0","Parents" => [{"Ix" => 0,"CommitId" => "edd43a440203725dfb4eb77fe703f18f4338ae81","Differs" => 2}]} 1524s git-debrebase get_differs 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 de8b92be7dce908cca5da61f752d0fff8f7c774d = 0x2 1524s git-debrebase classify edd43a440203725dfb4eb77fe703f18f4338ae81 $t=de8b92be7dce908cca5da61f752d0fff8f7c774d @p 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840/0x2 1524s git-debrebase = Upstream {"CommitId" => "edd43a440203725dfb4eb77fe703f18f4338ae81","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree de8b92be7dce908cca5da61f752d0fff8f7c774d\nparent 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "2d2d5a347e8baf5bea48f63d3e661ce16b1aa840","Ix" => 0,"Differs" => 2}],"Tree" => "de8b92be7dce908cca5da61f752d0fff8f7c774d"} 1524s git-debrebase get_differs 531003972219750d3af702dacee662b59fa321b3 75f063f3c83d7c2317a507777c57d79aff85b4e6 = 0x2 1524s git-debrebase classify 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 $t=75f063f3c83d7c2317a507777c57d79aff85b4e6 @p 531003972219750d3af702dacee662b59fa321b3/0x2 1524s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "2d2d5a347e8baf5bea48f63d3e661ce16b1aa840","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 75f063f3c83d7c2317a507777c57d79aff85b4e6\nparent 531003972219750d3af702dacee662b59fa321b3\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "75f063f3c83d7c2317a507777c57d79aff85b4e6","Parents" => [{"CommitId" => "531003972219750d3af702dacee662b59fa321b3","Ix" => 0,"Differs" => 2}]} 1524s git-debrebase get_differs f77f5a3cf715442ff9af63f94215e720d5c7249e c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 1524s git-debrebase get_differs 2e477ebdadbfd34200641bc4d10e83fddd22be86 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 1524s git-debrebase classify 531003972219750d3af702dacee662b59fa321b3 $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p f77f5a3cf715442ff9af63f94215e720d5c7249e/0x20 2e477ebdadbfd34200641bc4d10e83fddd22be86/0x32 1524s git-debrebase = MergedBreakwaters {"CommitId" => "531003972219750d3af702dacee662b59fa321b3","Type" => "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 f77f5a3cf715442ff9af63f94215e720d5c7249e\nparent 2e477ebdadbfd34200641bc4d10e83fddd22be86\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"IsDgitImport" => undef,"Differs" => 32,"IsOrigin" => "","CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Ix" => 0},{"IsDgitImport" => undef,"CommitId" => "2e477ebdadbfd34200641bc4d10e83fddd22be86","Ix" => 1,"IsOrigin" => "","Differs" => 50}],"Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6"} 1524s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1524s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1524s git-debrebase = Packaging {"Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Parents" => [{"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "us-conflict\n","Type" => "Packaging","CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e"} 1524s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1524s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1524s git-debrebase = Packaging {"Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265"}],"Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\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","CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b"} 1524s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1524s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1524s git-debrebase = Packaging {"Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Parents" => [{"Differs" => 32,"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Ix" => 0}],"Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Type" => "Packaging","CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265"} 1524s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1524s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1524s git-debrebase = Changelog {"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Differs" => 16}],"Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4"} 1524s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1524s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1524s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1524s git-debrebase = Anchor {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70"},{"Differs" => 48,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Ix" => 1}],"Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Type" => "Anchor","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n"} 1524s git-debrebase get_differs 0a0b882081203204ada50ec42c5325d6bb787bb1 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 1524s git-debrebase classify 2e477ebdadbfd34200641bc4d10e83fddd22be86 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 0a0b882081203204ada50ec42c5325d6bb787bb1/0x20 1524s git-debrebase = Packaging {"Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 0a0b882081203204ada50ec42c5325d6bb787bb1\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "0a0b882081203204ada50ec42c5325d6bb787bb1"}],"Type" => "Packaging","CommitId" => "2e477ebdadbfd34200641bc4d10e83fddd22be86","Msg" => "other-conflict\n"} 1524s git-debrebase get_differs 6d3531222a3d37679ba79f70739ccac18d016196 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1524s git-debrebase classify 0a0b882081203204ada50ec42c5325d6bb787bb1 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 6d3531222a3d37679ba79f70739ccac18d016196/0x20 1524s git-debrebase = Packaging {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "0a0b882081203204ada50ec42c5325d6bb787bb1","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "6d3531222a3d37679ba79f70739ccac18d016196","Differs" => 32}],"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 6d3531222a3d37679ba79f70739ccac18d016196\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1524s git-debrebase classify 6d3531222a3d37679ba79f70739ccac18d016196 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1524s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"}],"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","CommitId" => "6d3531222a3d37679ba79f70739ccac18d016196","Type" => "Packaging"} 1524s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1524s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1524s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1524s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1524s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1524s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Parents" => [{"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32}]} 1524s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1524s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1524s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16}],"Type" => "Changelog","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Msg" => "dch -r -D unstable\n"} 1524s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1524s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1524s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1524s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1524s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1524s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1524s git-debrebase = Anchor {"Type" => "Anchor","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Ix" => 0},{"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\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"} 1524s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1524s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1524s ' 1524s + case $state in 1524s + egrep '^ *branch is laundered' ../status.check 1524s branch is laundered 1524s + t-gdr-good-analyse HEAD laundered 1524s + local head=HEAD 1524s + local state=laundered 1524s + local wsfx= 1524s + local etypes bwtip 1524s + case $state in 1524s + etypes=Upstream 1524s ++ t-git-debrebase breakwater 1524s ++ local gdr=git-debrebase 1524s ++ : ' 1524s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1524s ++ git-debrebase --dgit=dgit -D --experimental-merge-resolution breakwater 1524s git-debrebase get_differs 1f557e51ff27fe3f1d68461818d0a399e715151a deabef6f96bb1b7178f35d435657581e016549cf = 0x2 1524s git-debrebase classify c27beccf459a62bf651764dddc020fa7c837a706 $t=deabef6f96bb1b7178f35d435657581e016549cf @p 1f557e51ff27fe3f1d68461818d0a399e715151a/0x2 1524s git-debrebase = Upstream {"Parents" => [{"CommitId" => "1f557e51ff27fe3f1d68461818d0a399e715151a","Differs" => 2,"Ix" => 0}],"Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent 1f557e51ff27fe3f1d68461818d0a399e715151a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","CommitId" => "c27beccf459a62bf651764dddc020fa7c837a706","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"} 1524s git-debrebase get_differs 7b76b54ea39f772ad8d64f830dae314a3c96aa72 a5b847c5f5608d10a68a18fee7f620409d6acdff = 0x2 1524s git-debrebase classify 1f557e51ff27fe3f1d68461818d0a399e715151a $t=a5b847c5f5608d10a68a18fee7f620409d6acdff @p 7b76b54ea39f772ad8d64f830dae314a3c96aa72/0x2 1524s git-debrebase = Upstream {"CommitId" => "1f557e51ff27fe3f1d68461818d0a399e715151a","Type" => "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","Parents" => [{"Differs" => 2,"CommitId" => "7b76b54ea39f772ad8d64f830dae314a3c96aa72","Ix" => 0}],"Hdr" => "tree a5b847c5f5608d10a68a18fee7f620409d6acdff\nparent 7b76b54ea39f772ad8d64f830dae314a3c96aa72\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs 9457f0319c958b48982521510148a1a7932c438d acf4d861de73e2116f79da4799bd30ae73dc369c = 0x2 1524s git-debrebase classify 7b76b54ea39f772ad8d64f830dae314a3c96aa72 $t=acf4d861de73e2116f79da4799bd30ae73dc369c @p 9457f0319c958b48982521510148a1a7932c438d/0x2 1524s git-debrebase = Upstream {"Hdr" => "tree acf4d861de73e2116f79da4799bd30ae73dc369c\nparent 9457f0319c958b48982521510148a1a7932c438d\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "9457f0319c958b48982521510148a1a7932c438d","Ix" => 0}],"Tree" => "acf4d861de73e2116f79da4799bd30ae73dc369c","Type" => "Upstream","CommitId" => "7b76b54ea39f772ad8d64f830dae314a3c96aa72","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"} 1524s git-debrebase get_differs 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 92aac2dbe83cd0960a78439e44ee36c146c5df98 = 0x2 1524s git-debrebase classify 9457f0319c958b48982521510148a1a7932c438d $t=92aac2dbe83cd0960a78439e44ee36c146c5df98 @p 9db4da97d5f8680310f8ab8723be8cbabee8e0a3/0x2 1524s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "9db4da97d5f8680310f8ab8723be8cbabee8e0a3"}],"Hdr" => "tree 92aac2dbe83cd0960a78439e44ee36c146c5df98\nparent 9db4da97d5f8680310f8ab8723be8cbabee8e0a3\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-1)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-us.c-us-1.patch","Type" => "Upstream","CommitId" => "9457f0319c958b48982521510148a1a7932c438d","Tree" => "92aac2dbe83cd0960a78439e44ee36c146c5df98"} 1524s git-debrebase get_differs 5a0dd58d83fc87c160def1a96fb25b4568f04cec 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 = 0x2 1524s git-debrebase classify 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 $t=9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 @p 5a0dd58d83fc87c160def1a96fb25b4568f04cec/0x2 1524s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "5a0dd58d83fc87c160def1a96fb25b4568f04cec","Ix" => 0}],"Hdr" => "tree 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4\nparent 5a0dd58d83fc87c160def1a96fb25b4568f04cec\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","CommitId" => "9db4da97d5f8680310f8ab8723be8cbabee8e0a3","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"} 1524s git-debrebase get_differs 70b07d5fdfff717e5ae09350777924d86465f02f 4844b97a44f315daca96b2361badd4d135ea373c = 0x2 1524s git-debrebase classify 5a0dd58d83fc87c160def1a96fb25b4568f04cec $t=4844b97a44f315daca96b2361badd4d135ea373c @p 70b07d5fdfff717e5ae09350777924d86465f02f/0x2 1524s git-debrebase = Upstream {"Tree" => "4844b97a44f315daca96b2361badd4d135ea373c","Type" => "Upstream","CommitId" => "5a0dd58d83fc87c160def1a96fb25b4568f04cec","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Hdr" => "tree 4844b97a44f315daca96b2361badd4d135ea373c\nparent 70b07d5fdfff717e5ae09350777924d86465f02f\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "70b07d5fdfff717e5ae09350777924d86465f02f","Ix" => 0}]} 1524s git-debrebase get_differs a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 0e902e52f7664910822aaa8b2c8ce07adbe82b4b = 0x2 1524s git-debrebase classify 70b07d5fdfff717e5ae09350777924d86465f02f $t=0e902e52f7664910822aaa8b2c8ce07adbe82b4b @p a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393/0x2 1524s git-debrebase = Upstream {"CommitId" => "70b07d5fdfff717e5ae09350777924d86465f02f","Type" => "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","Tree" => "0e902e52f7664910822aaa8b2c8ce07adbe82b4b","Parents" => [{"CommitId" => "a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 0e902e52f7664910822aaa8b2c8ce07adbe82b4b\nparent a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs 894792d8499295fadeaf57b4144ce5c9888916b6 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 = 0x2 1524s git-debrebase classify a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 $t=2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 @p 894792d8499295fadeaf57b4144ce5c9888916b6/0x2 1524s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Type" => "Upstream","CommitId" => "a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393","Tree" => "2a7ff02ad3fb5c8ef0b42810651560a14f1f7488","Parents" => [{"Ix" => 0,"CommitId" => "894792d8499295fadeaf57b4144ce5c9888916b6","Differs" => 2}],"Hdr" => "tree 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488\nparent 894792d8499295fadeaf57b4144ce5c9888916b6\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs edd43a440203725dfb4eb77fe703f18f4338ae81 e604da492dadb01ff5ab227f55c684c7c9f7c4d0 = 0x2 1524s git-debrebase classify 894792d8499295fadeaf57b4144ce5c9888916b6 $t=e604da492dadb01ff5ab227f55c684c7c9f7c4d0 @p edd43a440203725dfb4eb77fe703f18f4338ae81/0x2 1524s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "edd43a440203725dfb4eb77fe703f18f4338ae81","Differs" => 2}],"Hdr" => "tree e604da492dadb01ff5ab227f55c684c7c9f7c4d0\nparent edd43a440203725dfb4eb77fe703f18f4338ae81\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","CommitId" => "894792d8499295fadeaf57b4144ce5c9888916b6","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "e604da492dadb01ff5ab227f55c684c7c9f7c4d0"} 1524s git-debrebase get_differs 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 de8b92be7dce908cca5da61f752d0fff8f7c774d = 0x2 1524s git-debrebase classify edd43a440203725dfb4eb77fe703f18f4338ae81 $t=de8b92be7dce908cca5da61f752d0fff8f7c774d @p 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840/0x2 1524s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "edd43a440203725dfb4eb77fe703f18f4338ae81","Type" => "Upstream","Tree" => "de8b92be7dce908cca5da61f752d0fff8f7c774d","Parents" => [{"Differs" => 2,"CommitId" => "2d2d5a347e8baf5bea48f63d3e661ce16b1aa840","Ix" => 0}],"Hdr" => "tree de8b92be7dce908cca5da61f752d0fff8f7c774d\nparent 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs 531003972219750d3af702dacee662b59fa321b3 75f063f3c83d7c2317a507777c57d79aff85b4e6 = 0x2 1524s git-debrebase classify 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 $t=75f063f3c83d7c2317a507777c57d79aff85b4e6 @p 531003972219750d3af702dacee662b59fa321b3/0x2 1524s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "2d2d5a347e8baf5bea48f63d3e661ce16b1aa840","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "75f063f3c83d7c2317a507777c57d79aff85b4e6","Parents" => [{"CommitId" => "531003972219750d3af702dacee662b59fa321b3","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 75f063f3c83d7c2317a507777c57d79aff85b4e6\nparent 531003972219750d3af702dacee662b59fa321b3\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs f77f5a3cf715442ff9af63f94215e720d5c7249e c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 1524s git-debrebase get_differs 2e477ebdadbfd34200641bc4d10e83fddd22be86 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 1524s git-debrebase classify 531003972219750d3af702dacee662b59fa321b3 $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p f77f5a3cf715442ff9af63f94215e720d5c7249e/0x20 2e477ebdadbfd34200641bc4d10e83fddd22be86/0x32 1524s git-debrebase = MergedBreakwaters {"Parents" => [{"Ix" => 0,"IsOrigin" => "","Differs" => 32,"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","IsDgitImport" => undef},{"IsDgitImport" => undef,"Ix" => 1,"CommitId" => "2e477ebdadbfd34200641bc4d10e83fddd22be86","Differs" => 50,"IsOrigin" => ""}],"Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent f77f5a3cf715442ff9af63f94215e720d5c7249e\nparent 2e477ebdadbfd34200641bc4d10e83fddd22be86\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","CommitId" => "531003972219750d3af702dacee662b59fa321b3","Type" => "MergedBreakwaters","Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6"} 1524s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1524s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1524s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Differs" => 32}],"Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "us-conflict\n","Type" => "Packaging","CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6"} 1524s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1524s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1524s git-debrebase = Packaging {"Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265"}],"Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Type" => "Packaging","CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1524s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1524s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1524s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-us (us-2)\n","Type" => "Packaging","CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Parents" => [{"Differs" => 32,"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Ix" => 0}],"Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1524s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1524s git-debrebase = Changelog {"Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Differs" => 16}],"Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog","CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298"} 1524s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1524s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1524s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1524s git-debrebase = Anchor {"Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Type" => "Anchor","CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","OrigParents" => [{"Differs" => 48,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Ix" => 1}],"Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70"},$VAR1->{"OrigParents"}[0]]} 1524s git-debrebase get_differs 0a0b882081203204ada50ec42c5325d6bb787bb1 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 1524s git-debrebase classify 2e477ebdadbfd34200641bc4d10e83fddd22be86 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 0a0b882081203204ada50ec42c5325d6bb787bb1/0x20 1524s git-debrebase = Packaging {"Msg" => "other-conflict\n","CommitId" => "2e477ebdadbfd34200641bc4d10e83fddd22be86","Type" => "Packaging","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "0a0b882081203204ada50ec42c5325d6bb787bb1"}],"Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 0a0b882081203204ada50ec42c5325d6bb787bb1\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs 6d3531222a3d37679ba79f70739ccac18d016196 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1524s git-debrebase classify 0a0b882081203204ada50ec42c5325d6bb787bb1 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 6d3531222a3d37679ba79f70739ccac18d016196/0x20 1524s git-debrebase = Packaging {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "0a0b882081203204ada50ec42c5325d6bb787bb1","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Parents" => [{"CommitId" => "6d3531222a3d37679ba79f70739ccac18d016196","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 6d3531222a3d37679ba79f70739ccac18d016196\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1524s git-debrebase classify 6d3531222a3d37679ba79f70739ccac18d016196 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1524s git-debrebase = Packaging {"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","CommitId" => "6d3531222a3d37679ba79f70739ccac18d016196","Type" => "Packaging","Msg" => "DEBIAN add zorkmid-other (other)\n","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 32,"Ix" => 0}]} 1524s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1524s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1524s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Ix" => 0}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 1524s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1524s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1524s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","Type" => "Packaging","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"}]} 1524s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1524s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1524s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Ix" => 0}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1524s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1524s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1524s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1524s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1524s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1524s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1524s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16"},{"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48,"Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1524s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1524s ' 1524s + bwtip=Y:531003972219750d3af702dacee662b59fa321b3 1524s + anal=../anal 1524s + t-git-debrebase analyse HEAD 1524s + local gdr=git-debrebase 1524s + : ' 1524s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1524s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse HEAD 1524s git-debrebase *** WALK c27beccf459a62bf651764dddc020fa7c837a706 1 *main::STDOUT 1524s git-debrebase get_differs 1f557e51ff27fe3f1d68461818d0a399e715151a deabef6f96bb1b7178f35d435657581e016549cf = 0x2 1524s git-debrebase classify c27beccf459a62bf651764dddc020fa7c837a706 $t=deabef6f96bb1b7178f35d435657581e016549cf @p 1f557e51ff27fe3f1d68461818d0a399e715151a/0x2 1524s 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 1f557e51ff27fe3f1d68461818d0a399e715151a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "deabef6f96bb1b7178f35d435657581e016549cf","CommitId" => "c27beccf459a62bf651764dddc020fa7c837a706","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1f557e51ff27fe3f1d68461818d0a399e715151a"}]} 1524s git-debrebase get_differs 7b76b54ea39f772ad8d64f830dae314a3c96aa72 a5b847c5f5608d10a68a18fee7f620409d6acdff = 0x2 1524s git-debrebase classify 1f557e51ff27fe3f1d68461818d0a399e715151a $t=a5b847c5f5608d10a68a18fee7f620409d6acdff @p 7b76b54ea39f772ad8d64f830dae314a3c96aa72/0x2 1524s git-debrebase = Upstream {"Hdr" => "tree a5b847c5f5608d10a68a18fee7f620409d6acdff\nparent 7b76b54ea39f772ad8d64f830dae314a3c96aa72\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","CommitId" => "1f557e51ff27fe3f1d68461818d0a399e715151a","Tree" => "a5b847c5f5608d10a68a18fee7f620409d6acdff","Parents" => [{"Differs" => 2,"CommitId" => "7b76b54ea39f772ad8d64f830dae314a3c96aa72","Ix" => 0}]} 1524s git-debrebase get_differs 9457f0319c958b48982521510148a1a7932c438d acf4d861de73e2116f79da4799bd30ae73dc369c = 0x2 1524s git-debrebase classify 7b76b54ea39f772ad8d64f830dae314a3c96aa72 $t=acf4d861de73e2116f79da4799bd30ae73dc369c @p 9457f0319c958b48982521510148a1a7932c438d/0x2 1524s git-debrebase = 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","Hdr" => "tree acf4d861de73e2116f79da4799bd30ae73dc369c\nparent 9457f0319c958b48982521510148a1a7932c438d\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "acf4d861de73e2116f79da4799bd30ae73dc369c","CommitId" => "7b76b54ea39f772ad8d64f830dae314a3c96aa72","Parents" => [{"CommitId" => "9457f0319c958b48982521510148a1a7932c438d","Differs" => 2,"Ix" => 0}]} 1524s git-debrebase get_differs 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 92aac2dbe83cd0960a78439e44ee36c146c5df98 = 0x2 1524s git-debrebase classify 9457f0319c958b48982521510148a1a7932c438d $t=92aac2dbe83cd0960a78439e44ee36c146c5df98 @p 9db4da97d5f8680310f8ab8723be8cbabee8e0a3/0x2 1524s git-debrebase = Upstream {"Parents" => [{"CommitId" => "9db4da97d5f8680310f8ab8723be8cbabee8e0a3","Differs" => 2,"Ix" => 0}],"CommitId" => "9457f0319c958b48982521510148a1a7932c438d","Tree" => "92aac2dbe83cd0960a78439e44ee36c146c5df98","Hdr" => "tree 92aac2dbe83cd0960a78439e44ee36c146c5df98\nparent 9db4da97d5f8680310f8ab8723be8cbabee8e0a3\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-1)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-us.c-us-1.patch","Type" => "Upstream"} 1524s git-debrebase get_differs 5a0dd58d83fc87c160def1a96fb25b4568f04cec 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 = 0x2 1524s git-debrebase classify 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 $t=9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 @p 5a0dd58d83fc87c160def1a96fb25b4568f04cec/0x2 1524s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4\nparent 5a0dd58d83fc87c160def1a96fb25b4568f04cec\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +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","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5a0dd58d83fc87c160def1a96fb25b4568f04cec"}],"CommitId" => "9db4da97d5f8680310f8ab8723be8cbabee8e0a3","Tree" => "9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4"} 1524s git-debrebase get_differs 70b07d5fdfff717e5ae09350777924d86465f02f 4844b97a44f315daca96b2361badd4d135ea373c = 0x2 1524s git-debrebase classify 5a0dd58d83fc87c160def1a96fb25b4568f04cec $t=4844b97a44f315daca96b2361badd4d135ea373c @p 70b07d5fdfff717e5ae09350777924d86465f02f/0x2 1524s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Hdr" => "tree 4844b97a44f315daca96b2361badd4d135ea373c\nparent 70b07d5fdfff717e5ae09350777924d86465f02f\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "4844b97a44f315daca96b2361badd4d135ea373c","CommitId" => "5a0dd58d83fc87c160def1a96fb25b4568f04cec","Parents" => [{"Ix" => 0,"CommitId" => "70b07d5fdfff717e5ae09350777924d86465f02f","Differs" => 2}]} 1524s git-debrebase get_differs a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 0e902e52f7664910822aaa8b2c8ce07adbe82b4b = 0x2 1524s git-debrebase classify 70b07d5fdfff717e5ae09350777924d86465f02f $t=0e902e52f7664910822aaa8b2c8ce07adbe82b4b @p a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393/0x2 1524s git-debrebase = Upstream {"Tree" => "0e902e52f7664910822aaa8b2c8ce07adbe82b4b","CommitId" => "70b07d5fdfff717e5ae09350777924d86465f02f","Parents" => [{"Differs" => 2,"CommitId" => "a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393","Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 0e902e52f7664910822aaa8b2c8ce07adbe82b4b\nparent a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393\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"} 1524s git-debrebase get_differs 894792d8499295fadeaf57b4144ce5c9888916b6 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 = 0x2 1524s git-debrebase classify a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 $t=2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 @p 894792d8499295fadeaf57b4144ce5c9888916b6/0x2 1524s git-debrebase = Upstream {"CommitId" => "a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393","Tree" => "2a7ff02ad3fb5c8ef0b42810651560a14f1f7488","Parents" => [{"Differs" => 2,"CommitId" => "894792d8499295fadeaf57b4144ce5c9888916b6","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Hdr" => "tree 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488\nparent 894792d8499295fadeaf57b4144ce5c9888916b6\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream"} 1524s git-debrebase get_differs edd43a440203725dfb4eb77fe703f18f4338ae81 e604da492dadb01ff5ab227f55c684c7c9f7c4d0 = 0x2 1524s git-debrebase classify 894792d8499295fadeaf57b4144ce5c9888916b6 $t=e604da492dadb01ff5ab227f55c684c7c9f7c4d0 @p edd43a440203725dfb4eb77fe703f18f4338ae81/0x2 1524s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree e604da492dadb01ff5ab227f55c684c7c9f7c4d0\nparent edd43a440203725dfb4eb77fe703f18f4338ae81\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" => "894792d8499295fadeaf57b4144ce5c9888916b6","Tree" => "e604da492dadb01ff5ab227f55c684c7c9f7c4d0","Parents" => [{"Ix" => 0,"CommitId" => "edd43a440203725dfb4eb77fe703f18f4338ae81","Differs" => 2}]} 1524s git-debrebase get_differs 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 de8b92be7dce908cca5da61f752d0fff8f7c774d = 0x2 1524s git-debrebase classify edd43a440203725dfb4eb77fe703f18f4338ae81 $t=de8b92be7dce908cca5da61f752d0fff8f7c774d @p 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840/0x2 1524s git-debrebase = Upstream {"Parents" => [{"CommitId" => "2d2d5a347e8baf5bea48f63d3e661ce16b1aa840","Differs" => 2,"Ix" => 0}],"Tree" => "de8b92be7dce908cca5da61f752d0fff8f7c774d","CommitId" => "edd43a440203725dfb4eb77fe703f18f4338ae81","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree de8b92be7dce908cca5da61f752d0fff8f7c774d\nparent 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n"} 1524s git-debrebase get_differs 531003972219750d3af702dacee662b59fa321b3 75f063f3c83d7c2317a507777c57d79aff85b4e6 = 0x2 1524s git-debrebase classify 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 $t=75f063f3c83d7c2317a507777c57d79aff85b4e6 @p 531003972219750d3af702dacee662b59fa321b3/0x2 1524s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 75f063f3c83d7c2317a507777c57d79aff85b4e6\nparent 531003972219750d3af702dacee662b59fa321b3\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "75f063f3c83d7c2317a507777c57d79aff85b4e6","CommitId" => "2d2d5a347e8baf5bea48f63d3e661ce16b1aa840","Parents" => [{"Ix" => 0,"CommitId" => "531003972219750d3af702dacee662b59fa321b3","Differs" => 2}]} 1524s git-debrebase get_differs f77f5a3cf715442ff9af63f94215e720d5c7249e c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 1524s git-debrebase get_differs 2e477ebdadbfd34200641bc4d10e83fddd22be86 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 1524s git-debrebase classify 531003972219750d3af702dacee662b59fa321b3 $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p f77f5a3cf715442ff9af63f94215e720d5c7249e/0x20 2e477ebdadbfd34200641bc4d10e83fddd22be86/0x32 1524s git-debrebase = MergedBreakwaters {"Type" => "MergedBreakwaters","Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent f77f5a3cf715442ff9af63f94215e720d5c7249e\nparent 2e477ebdadbfd34200641bc4d10e83fddd22be86\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","CommitId" => "531003972219750d3af702dacee662b59fa321b3","Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6","Parents" => [{"Ix" => 0,"IsOrigin" => "","Differs" => 32,"IsDgitImport" => undef,"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e"},{"CommitId" => "2e477ebdadbfd34200641bc4d10e83fddd22be86","IsDgitImport" => undef,"Differs" => 50,"Ix" => 1,"IsOrigin" => ""}]} 1524s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1524s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1524s git-debrebase = Packaging {"Parents" => [{"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Differs" => 32,"Ix" => 0}],"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "us-conflict\n","Type" => "Packaging"} 1525s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1525s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1525s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Differs" => 32}],"Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\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"} 1525s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1525s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1525s git-debrebase = Packaging {"Parents" => [{"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Differs" => 32,"Ix" => 0}],"Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging"} 1525s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1525s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1525s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Changelog","CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Parents" => [{"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Differs" => 16,"Ix" => 0}]} 1525s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1525s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1525s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1525s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\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" => "38ee93726fb48a60962f8d01d367986becb682da","Differs" => 48,"Ix" => 1}],"Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Parents" => [{"Ix" => 0,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70","Differs" => 2},$VAR1->{"OrigParents"}[0]]} 1525s git-debrebase get_differs 0a0b882081203204ada50ec42c5325d6bb787bb1 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 1525s git-debrebase classify 2e477ebdadbfd34200641bc4d10e83fddd22be86 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 0a0b882081203204ada50ec42c5325d6bb787bb1/0x20 1525s git-debrebase = Packaging {"Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","CommitId" => "2e477ebdadbfd34200641bc4d10e83fddd22be86","Parents" => [{"CommitId" => "0a0b882081203204ada50ec42c5325d6bb787bb1","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 0a0b882081203204ada50ec42c5325d6bb787bb1\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "other-conflict\n","Type" => "Packaging"} 1525s git-debrebase get_differs 6d3531222a3d37679ba79f70739ccac18d016196 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1525s git-debrebase classify 0a0b882081203204ada50ec42c5325d6bb787bb1 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 6d3531222a3d37679ba79f70739ccac18d016196/0x20 1525s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 6d3531222a3d37679ba79f70739ccac18d016196\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6d3531222a3d37679ba79f70739ccac18d016196"}],"CommitId" => "0a0b882081203204ada50ec42c5325d6bb787bb1","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6"} 1525s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1525s git-debrebase classify 6d3531222a3d37679ba79f70739ccac18d016196 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1525s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"}],"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","CommitId" => "6d3531222a3d37679ba79f70739ccac18d016196","Type" => "Packaging","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n"} 1525s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1525s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1525s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32}],"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\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"} 1525s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1525s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1525s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"}]} 1525s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1525s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1525s git-debrebase = Changelog {"Parents" => [{"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n"} 1525s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1525s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1525s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\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","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"} 1525s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1525s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1525s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1525s 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 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","OrigParents" => [{"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48}],"Parents" => [{"Ix" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0},$VAR1->{"OrigParents"}[0]]} 1525s git-debrebase *** WALK prep done cur=531003972219750d3af702dacee662b59fa321b3 brw -1 upp 10 proc 11 pm -1 1525s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1525s ' 1525s ++ git rev-parse HEAD 1525s + expect=c27beccf459a62bf651764dddc020fa7c837a706 1525s + exec 1525s + local cid ctype info nparents 1525s + read cid ctype info 1525s + : ===== c27beccf459a62bf651764dddc020fa7c837a706 Upstream ===== 1525s + test c27beccf459a62bf651764dddc020fa7c837a706 = c27beccf459a62bf651764dddc020fa7c837a706 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P c27beccf459a62bf651764dddc020fa7c837a706 1525s + local parents=1f557e51ff27fe3f1d68461818d0a399e715151a 1525s + expect=1f557e51ff27fe3f1d68461818d0a399e715151a 1525s + enparents=1 1525s + : Upstream/SAME 1f557e51ff27fe3f1d68461818d0a399e715151a 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s 1f557e51ff27fe3f1d68461818d0a399e715151a 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 1f557e51ff27fe3f1d68461818d0a399e715151a 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s ++ wc -w 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 1f557e51ff27fe3f1d68461818d0a399e715151a Upstream ===== 1525s + test 1f557e51ff27fe3f1d68461818d0a399e715151a = 1f557e51ff27fe3f1d68461818d0a399e715151a 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 1f557e51ff27fe3f1d68461818d0a399e715151a 1525s + local parents=7b76b54ea39f772ad8d64f830dae314a3c96aa72 1525s + expect=7b76b54ea39f772ad8d64f830dae314a3c96aa72 1525s + enparents=1 1525s + : Upstream/SAME 7b76b54ea39f772ad8d64f830dae314a3c96aa72 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s 7b76b54ea39f772ad8d64f830dae314a3c96aa72 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 7b76b54ea39f772ad8d64f830dae314a3c96aa72 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 7b76b54ea39f772ad8d64f830dae314a3c96aa72 Upstream ===== 1525s + test 7b76b54ea39f772ad8d64f830dae314a3c96aa72 = 7b76b54ea39f772ad8d64f830dae314a3c96aa72 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 7b76b54ea39f772ad8d64f830dae314a3c96aa72 1525s + local parents=9457f0319c958b48982521510148a1a7932c438d 1525s + expect=9457f0319c958b48982521510148a1a7932c438d 1525s + enparents=1 1525s + : Upstream/SAME 9457f0319c958b48982521510148a1a7932c438d 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s 9457f0319c958b48982521510148a1a7932c438d 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 9457f0319c958b48982521510148a1a7932c438d 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 9457f0319c958b48982521510148a1a7932c438d Upstream ===== 1525s + test 9457f0319c958b48982521510148a1a7932c438d = 9457f0319c958b48982521510148a1a7932c438d 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 9457f0319c958b48982521510148a1a7932c438d 1525s + local parents=9db4da97d5f8680310f8ab8723be8cbabee8e0a3 1525s + expect=9db4da97d5f8680310f8ab8723be8cbabee8e0a3 1525s + enparents=1 1525s + : Upstream/SAME 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 Upstream ===== 1525s + test 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 = 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 1525s + local parents=5a0dd58d83fc87c160def1a96fb25b4568f04cec 1525s + expect=5a0dd58d83fc87c160def1a96fb25b4568f04cec 1525s + enparents=1 1525s + : Upstream/SAME 5a0dd58d83fc87c160def1a96fb25b4568f04cec 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s 5a0dd58d83fc87c160def1a96fb25b4568f04cec 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 5a0dd58d83fc87c160def1a96fb25b4568f04cec 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 5a0dd58d83fc87c160def1a96fb25b4568f04cec Upstream ===== 1525s + test 5a0dd58d83fc87c160def1a96fb25b4568f04cec = 5a0dd58d83fc87c160def1a96fb25b4568f04cec 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 5a0dd58d83fc87c160def1a96fb25b4568f04cec 1525s + local parents=70b07d5fdfff717e5ae09350777924d86465f02f 1525s + expect=70b07d5fdfff717e5ae09350777924d86465f02f 1525s + enparents=1 1525s + : Upstream/SAME 70b07d5fdfff717e5ae09350777924d86465f02f 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s 70b07d5fdfff717e5ae09350777924d86465f02f 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 70b07d5fdfff717e5ae09350777924d86465f02f 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 70b07d5fdfff717e5ae09350777924d86465f02f Upstream ===== 1525s + test 70b07d5fdfff717e5ae09350777924d86465f02f = 70b07d5fdfff717e5ae09350777924d86465f02f 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 70b07d5fdfff717e5ae09350777924d86465f02f 1525s + local parents=a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 1525s + expect=a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 1525s + enparents=1 1525s + : Upstream/SAME a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 1525s ++ t-sort -u 1525s ++ wc -w 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 Upstream ===== 1525s + test a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 = a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 1525s + local parents=894792d8499295fadeaf57b4144ce5c9888916b6 1525s + expect=894792d8499295fadeaf57b4144ce5c9888916b6 1525s + enparents=1 1525s + : Upstream/SAME 894792d8499295fadeaf57b4144ce5c9888916b6 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s 894792d8499295fadeaf57b4144ce5c9888916b6 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 894792d8499295fadeaf57b4144ce5c9888916b6 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 894792d8499295fadeaf57b4144ce5c9888916b6 Upstream ===== 1525s + test 894792d8499295fadeaf57b4144ce5c9888916b6 = 894792d8499295fadeaf57b4144ce5c9888916b6 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 894792d8499295fadeaf57b4144ce5c9888916b6 1525s + local parents=edd43a440203725dfb4eb77fe703f18f4338ae81 1525s + expect=edd43a440203725dfb4eb77fe703f18f4338ae81 1525s + enparents=1 1525s + : Upstream/SAME edd43a440203725dfb4eb77fe703f18f4338ae81 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s edd43a440203725dfb4eb77fe703f18f4338ae81 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo edd43a440203725dfb4eb77fe703f18f4338ae81 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== edd43a440203725dfb4eb77fe703f18f4338ae81 Upstream ===== 1525s + test edd43a440203725dfb4eb77fe703f18f4338ae81 = edd43a440203725dfb4eb77fe703f18f4338ae81 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P edd43a440203725dfb4eb77fe703f18f4338ae81 1525s + local parents=2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 1525s + expect=2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 1525s + enparents=1 1525s + : Upstream/SAME 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 Upstream ===== 1525s + test 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 = 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 1525s + local cetype=Upstream 1525s + '[' xUpstream = xUpstream ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 1525s + local parents=531003972219750d3af702dacee662b59fa321b3 1525s + expect=531003972219750d3af702dacee662b59fa321b3 1525s + enparents=1 1525s + : Upstream/SAME 531003972219750d3af702dacee662b59fa321b3 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s ++ printf %s 531003972219750d3af702dacee662b59fa321b3 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 531003972219750d3af702dacee662b59fa321b3 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 531003972219750d3af702dacee662b59fa321b3 MergedBreakwaters ===== 1525s + test 531003972219750d3af702dacee662b59fa321b3 = 531003972219750d3af702dacee662b59fa321b3 1525s + local cetype=Upstream 1525s + '[' xMergedBreakwaters = xUpstream ']' 1525s ++ git log -n1 --pretty=format:%P 531003972219750d3af702dacee662b59fa321b3 1525s + local 'parents=f77f5a3cf715442ff9af63f94215e720d5c7249e 2e477ebdadbfd34200641bc4d10e83fddd22be86' 1525s + expect='f77f5a3cf715442ff9af63f94215e720d5c7249e 2e477ebdadbfd34200641bc4d10e83fddd22be86' 1525s + enparents=1 1525s + : MergedBreakwaters/Upstream 'f77f5a3cf715442ff9af63f94215e720d5c7249e 2e477ebdadbfd34200641bc4d10e83fddd22be86' 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + enparents=2 1525s ++ printf %s 'f77f5a3cf715442ff9af63f94215e720d5c7249e 2e477ebdadbfd34200641bc4d10e83fddd22be86' 1525s ++ wc -w 1525s + local cnparents=2 1525s + test 2 = 2 1525s ++ for f in $parents 1525s ++ echo f77f5a3cf715442ff9af63f94215e720d5c7249e 1525s ++ for f in $parents 1525s ++ echo 2e477ebdadbfd34200641bc4d10e83fddd22be86 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=2 1525s + test 2 = 2 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + local f 1525s + local parent_ix=0 1525s + for f in $parents 1525s + t-gdr-good-analyse f77f5a3cf715442ff9af63f94215e720d5c7249e breakwater -mp0 1525s + local head=f77f5a3cf715442ff9af63f94215e720d5c7249e 1525s + local state=breakwater 1525s + local wsfx=-mp0 1525s + local etypes bwtip 1525s + case $state in 1525s + etypes=Packaging 1525s + anal=../anal-mp0 1525s + t-git-debrebase analyse f77f5a3cf715442ff9af63f94215e720d5c7249e 1525s + local gdr=git-debrebase 1525s + : ' 1525s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1525s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse f77f5a3cf715442ff9af63f94215e720d5c7249e 1525s git-debrebase *** WALK f77f5a3cf715442ff9af63f94215e720d5c7249e 1 *main::STDOUT 1525s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1525s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1525s git-debrebase = Packaging {"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Msg" => "us-conflict\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b"}],"Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Type" => "Packaging","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1525s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1525s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1525s git-debrebase = Packaging {"Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Parents" => [{"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Ix" => 0,"Differs" => 32}],"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging"} 1525s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1525s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1525s git-debrebase = Packaging {"Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Parents" => [{"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging"} 1525s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1525s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1525s git-debrebase = Changelog {"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Parents" => [{"Differs" => 16,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","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 d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 1525s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1525s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1525s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1525s git-debrebase = Anchor {"Type" => "Anchor","Parents" => [{"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70","Ix" => 0,"Differs" => 2},{"Differs" => 48,"Ix" => 1,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da"}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 1525s git-debrebase *** WALK prep done cur=d50318b393ee163dd38aa93c9427a1ce6a993b3a brw 3 upp -1 proc 4 pm -1 1525s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1525s ' 1525s ++ git rev-parse f77f5a3cf715442ff9af63f94215e720d5c7249e 1525s + expect=f77f5a3cf715442ff9af63f94215e720d5c7249e 1525s + exec 1525s + local cid ctype info nparents 1525s + read cid ctype info 1525s + : ===== f77f5a3cf715442ff9af63f94215e720d5c7249e Packaging ===== 1525s + test f77f5a3cf715442ff9af63f94215e720d5c7249e = f77f5a3cf715442ff9af63f94215e720d5c7249e 1525s + local cetype=Packaging 1525s + '[' xPackaging = xPackaging ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P f77f5a3cf715442ff9af63f94215e720d5c7249e 1525s + local parents=679a57a2fb7abcea83d6a6401e6ed325b289669b 1525s + expect=679a57a2fb7abcea83d6a6401e6ed325b289669b 1525s + enparents=1 1525s + : Packaging/SAME 679a57a2fb7abcea83d6a6401e6ed325b289669b 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet 679a57a2fb7abcea83d6a6401e6ed325b289669b..f77f5a3cf715442ff9af63f94215e720d5c7249e -- :. ':!debian' 1525s + git diff --quiet 679a57a2fb7abcea83d6a6401e6ed325b289669b..f77f5a3cf715442ff9af63f94215e720d5c7249e -- :debian/patches 1525s + etypes=Packaging 1525s ++ printf %s 679a57a2fb7abcea83d6a6401e6ed325b289669b 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 679a57a2fb7abcea83d6a6401e6ed325b289669b 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 679a57a2fb7abcea83d6a6401e6ed325b289669b Packaging ===== 1525s + test 679a57a2fb7abcea83d6a6401e6ed325b289669b = 679a57a2fb7abcea83d6a6401e6ed325b289669b 1525s + local cetype=Packaging 1525s + '[' xPackaging = xPackaging ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 679a57a2fb7abcea83d6a6401e6ed325b289669b 1525s + local parents=16f86dfb60387585ebd2714c26703a02aa3d2265 1525s + expect=16f86dfb60387585ebd2714c26703a02aa3d2265 1525s + enparents=1 1525s + : Packaging/SAME 16f86dfb60387585ebd2714c26703a02aa3d2265 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet 16f86dfb60387585ebd2714c26703a02aa3d2265..679a57a2fb7abcea83d6a6401e6ed325b289669b -- :. ':!debian' 1525s + git diff --quiet 16f86dfb60387585ebd2714c26703a02aa3d2265..679a57a2fb7abcea83d6a6401e6ed325b289669b -- :debian/patches 1525s + etypes=Packaging 1525s ++ printf %s 16f86dfb60387585ebd2714c26703a02aa3d2265 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 16f86dfb60387585ebd2714c26703a02aa3d2265 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s ++ wc -w 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 16f86dfb60387585ebd2714c26703a02aa3d2265 Packaging ===== 1525s + test 16f86dfb60387585ebd2714c26703a02aa3d2265 = 16f86dfb60387585ebd2714c26703a02aa3d2265 1525s + local cetype=Packaging 1525s + '[' xPackaging = xPackaging ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 16f86dfb60387585ebd2714c26703a02aa3d2265 1525s + local parents=bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1525s + expect=bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1525s + enparents=1 1525s + : Packaging/SAME bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet bbe1078ab4e02c973ffae4ecc124fccd0ebee298..16f86dfb60387585ebd2714c26703a02aa3d2265 -- :. ':!debian' 1525s + git diff --quiet bbe1078ab4e02c973ffae4ecc124fccd0ebee298..16f86dfb60387585ebd2714c26703a02aa3d2265 -- :debian/patches 1525s + etypes=Packaging 1525s ++ printf %s bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== bbe1078ab4e02c973ffae4ecc124fccd0ebee298 Changelog ===== 1525s + test bbe1078ab4e02c973ffae4ecc124fccd0ebee298 = bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1525s + local cetype=Packaging 1525s + '[' xChangelog = xPackaging ']' 1525s ++ git log -n1 --pretty=format:%P bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1525s + local parents=d50318b393ee163dd38aa93c9427a1ce6a993b3a 1525s + expect=d50318b393ee163dd38aa93c9427a1ce6a993b3a 1525s + enparents=1 1525s + : Changelog/Packaging d50318b393ee163dd38aa93c9427a1ce6a993b3a 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet d50318b393ee163dd38aa93c9427a1ce6a993b3a..bbe1078ab4e02c973ffae4ecc124fccd0ebee298 -- :. ':!debian/changelog' 1525s + etypes=Packaging 1525s ++ printf %s d50318b393ee163dd38aa93c9427a1ce6a993b3a 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo d50318b393ee163dd38aa93c9427a1ce6a993b3a 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== d50318b393ee163dd38aa93c9427a1ce6a993b3a Anchor ===== 1525s + test d50318b393ee163dd38aa93c9427a1ce6a993b3a = d50318b393ee163dd38aa93c9427a1ce6a993b3a 1525s + local cetype=Packaging 1525s + '[' xAnchor = xPackaging ']' 1525s ++ git log -n1 --pretty=format:%P d50318b393ee163dd38aa93c9427a1ce6a993b3a 1525s + local 'parents=1fcdf5538d01a16ab5223fb916f79abf4efd6b70 38ee93726fb48a60962f8d01d367986becb682da' 1525s + expect='1fcdf5538d01a16ab5223fb916f79abf4efd6b70 38ee93726fb48a60962f8d01d367986becb682da' 1525s + enparents=1 1525s + : Anchor/Packaging '1fcdf5538d01a16ab5223fb916f79abf4efd6b70 38ee93726fb48a60962f8d01d367986becb682da' 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + break 1525s + parent_ix=1 1525s + for f in $parents 1525s + t-gdr-good-analyse 2e477ebdadbfd34200641bc4d10e83fddd22be86 breakwater -mp1 1525s + local head=2e477ebdadbfd34200641bc4d10e83fddd22be86 1525s + local state=breakwater 1525s + local wsfx=-mp1 1525s + local etypes bwtip 1525s + case $state in 1525s + etypes=Packaging 1525s + anal=../anal-mp1 1525s + t-git-debrebase analyse 2e477ebdadbfd34200641bc4d10e83fddd22be86 1525s + local gdr=git-debrebase 1525s + : ' 1525s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1525s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse 2e477ebdadbfd34200641bc4d10e83fddd22be86 1525s git-debrebase *** WALK 2e477ebdadbfd34200641bc4d10e83fddd22be86 1 *main::STDOUT 1525s git-debrebase get_differs 0a0b882081203204ada50ec42c5325d6bb787bb1 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 1525s git-debrebase classify 2e477ebdadbfd34200641bc4d10e83fddd22be86 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 0a0b882081203204ada50ec42c5325d6bb787bb1/0x20 1525s git-debrebase = Packaging {"CommitId" => "2e477ebdadbfd34200641bc4d10e83fddd22be86","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Msg" => "other-conflict\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "0a0b882081203204ada50ec42c5325d6bb787bb1"}],"Type" => "Packaging","Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 0a0b882081203204ada50ec42c5325d6bb787bb1\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1525s git-debrebase get_differs 6d3531222a3d37679ba79f70739ccac18d016196 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1525s git-debrebase classify 0a0b882081203204ada50ec42c5325d6bb787bb1 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 6d3531222a3d37679ba79f70739ccac18d016196/0x20 1525s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "6d3531222a3d37679ba79f70739ccac18d016196","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 6d3531222a3d37679ba79f70739ccac18d016196\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "0a0b882081203204ada50ec42c5325d6bb787bb1","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6"} 1525s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1525s git-debrebase classify 6d3531222a3d37679ba79f70739ccac18d016196 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1525s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-other (other)\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","CommitId" => "6d3531222a3d37679ba79f70739ccac18d016196","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"}],"Type" => "Packaging","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1525s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1525s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1525s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"}],"Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 1525s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1525s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1525s git-debrebase = Packaging {"Parents" => [{"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"} 1525s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1525s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1525s git-debrebase = Changelog {"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"}]} 1525s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1525s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1525s git-debrebase = Changelog {"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"Type" => "Changelog"} 1525s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1525s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1525s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1525s git-debrebase = Anchor {"Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0,"Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1525s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 6 upp -1 proc 7 pm -1 1525s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1525s ' 1525s ++ git rev-parse 2e477ebdadbfd34200641bc4d10e83fddd22be86 1525s + expect=2e477ebdadbfd34200641bc4d10e83fddd22be86 1525s + exec 1525s + local cid ctype info nparents 1525s + read cid ctype info 1525s + : ===== 2e477ebdadbfd34200641bc4d10e83fddd22be86 Packaging ===== 1525s + test 2e477ebdadbfd34200641bc4d10e83fddd22be86 = 2e477ebdadbfd34200641bc4d10e83fddd22be86 1525s + local cetype=Packaging 1525s + '[' xPackaging = xPackaging ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 2e477ebdadbfd34200641bc4d10e83fddd22be86 1525s + local parents=0a0b882081203204ada50ec42c5325d6bb787bb1 1525s + expect=0a0b882081203204ada50ec42c5325d6bb787bb1 1525s + enparents=1 1525s + : Packaging/SAME 0a0b882081203204ada50ec42c5325d6bb787bb1 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet 0a0b882081203204ada50ec42c5325d6bb787bb1..2e477ebdadbfd34200641bc4d10e83fddd22be86 -- :. ':!debian' 1525s + git diff --quiet 0a0b882081203204ada50ec42c5325d6bb787bb1..2e477ebdadbfd34200641bc4d10e83fddd22be86 -- :debian/patches 1525s + etypes=Packaging 1525s ++ printf %s 0a0b882081203204ada50ec42c5325d6bb787bb1 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 0a0b882081203204ada50ec42c5325d6bb787bb1 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 0a0b882081203204ada50ec42c5325d6bb787bb1 Packaging ===== 1525s + test 0a0b882081203204ada50ec42c5325d6bb787bb1 = 0a0b882081203204ada50ec42c5325d6bb787bb1 1525s + local cetype=Packaging 1525s + '[' xPackaging = xPackaging ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 0a0b882081203204ada50ec42c5325d6bb787bb1 1525s + local parents=6d3531222a3d37679ba79f70739ccac18d016196 1525s + expect=6d3531222a3d37679ba79f70739ccac18d016196 1525s + enparents=1 1525s + : Packaging/SAME 6d3531222a3d37679ba79f70739ccac18d016196 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet 6d3531222a3d37679ba79f70739ccac18d016196..0a0b882081203204ada50ec42c5325d6bb787bb1 -- :. ':!debian' 1525s + git diff --quiet 6d3531222a3d37679ba79f70739ccac18d016196..0a0b882081203204ada50ec42c5325d6bb787bb1 -- :debian/patches 1525s + etypes=Packaging 1525s ++ printf %s 6d3531222a3d37679ba79f70739ccac18d016196 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 6d3531222a3d37679ba79f70739ccac18d016196 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 6d3531222a3d37679ba79f70739ccac18d016196 Packaging ===== 1525s + test 6d3531222a3d37679ba79f70739ccac18d016196 = 6d3531222a3d37679ba79f70739ccac18d016196 1525s + local cetype=Packaging 1525s + '[' xPackaging = xPackaging ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 6d3531222a3d37679ba79f70739ccac18d016196 1525s + local parents=4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1525s + expect=4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1525s + enparents=1 1525s + : Packaging/SAME 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet 4fac284b9a57ca57ecdeffa6278dea2759cd00e9..6d3531222a3d37679ba79f70739ccac18d016196 -- :. ':!debian' 1525s + git diff --quiet 4fac284b9a57ca57ecdeffa6278dea2759cd00e9..6d3531222a3d37679ba79f70739ccac18d016196 -- :debian/patches 1525s + etypes=Packaging 1525s ++ printf %s 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Packaging ===== 1525s + test 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 = 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1525s + local cetype=Packaging 1525s + '[' xPackaging = xPackaging ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1525s + local parents=6820a0900873c206f54cab6ac552afb016b49205 1525s + expect=6820a0900873c206f54cab6ac552afb016b49205 1525s + enparents=1 1525s + : Packaging/SAME 6820a0900873c206f54cab6ac552afb016b49205 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet 6820a0900873c206f54cab6ac552afb016b49205..4fac284b9a57ca57ecdeffa6278dea2759cd00e9 -- :. ':!debian' 1525s + git diff --quiet 6820a0900873c206f54cab6ac552afb016b49205..4fac284b9a57ca57ecdeffa6278dea2759cd00e9 -- :debian/patches 1525s + etypes=Packaging 1525s ++ wc -w 1525s ++ printf %s 6820a0900873c206f54cab6ac552afb016b49205 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 6820a0900873c206f54cab6ac552afb016b49205 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s ++ wc -w 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 6820a0900873c206f54cab6ac552afb016b49205 Packaging ===== 1525s + test 6820a0900873c206f54cab6ac552afb016b49205 = 6820a0900873c206f54cab6ac552afb016b49205 1525s + local cetype=Packaging 1525s + '[' xPackaging = xPackaging ']' 1525s + cetype=SAME 1525s ++ git log -n1 --pretty=format:%P 6820a0900873c206f54cab6ac552afb016b49205 1525s + local parents=db129944b7f434b59509f6c007624fd8a89fe823 1525s + expect=db129944b7f434b59509f6c007624fd8a89fe823 1525s + enparents=1 1525s + : Packaging/SAME db129944b7f434b59509f6c007624fd8a89fe823 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet db129944b7f434b59509f6c007624fd8a89fe823..6820a0900873c206f54cab6ac552afb016b49205 -- :. ':!debian' 1525s + git diff --quiet db129944b7f434b59509f6c007624fd8a89fe823..6820a0900873c206f54cab6ac552afb016b49205 -- :debian/patches 1525s + etypes=Packaging 1525s ++ printf %s db129944b7f434b59509f6c007624fd8a89fe823 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo db129944b7f434b59509f6c007624fd8a89fe823 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s ++ wc -w 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== db129944b7f434b59509f6c007624fd8a89fe823 Changelog ===== 1525s + test db129944b7f434b59509f6c007624fd8a89fe823 = db129944b7f434b59509f6c007624fd8a89fe823 1525s + local cetype=Packaging 1525s + '[' xChangelog = xPackaging ']' 1525s ++ git log -n1 --pretty=format:%P db129944b7f434b59509f6c007624fd8a89fe823 1525s + local parents=eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1525s + expect=eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1525s + enparents=1 1525s + : Changelog/Packaging eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2..db129944b7f434b59509f6c007624fd8a89fe823 -- :. ':!debian/changelog' 1525s + etypes=Packaging 1525s ++ printf %s eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1525s ++ wc -w 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Changelog ===== 1525s + test eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 = eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1525s + local cetype=Packaging 1525s + '[' xChangelog = xPackaging ']' 1525s ++ git log -n1 --pretty=format:%P eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1525s + local parents=48c55fcd6aad3671faeeedd232289eea48db8cce 1525s + expect=48c55fcd6aad3671faeeedd232289eea48db8cce 1525s + enparents=1 1525s + : Changelog/Packaging 48c55fcd6aad3671faeeedd232289eea48db8cce 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + git diff --quiet 48c55fcd6aad3671faeeedd232289eea48db8cce..eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 -- :. ':!debian/changelog' 1525s + etypes=Packaging 1525s ++ wc -w 1525s ++ printf %s 48c55fcd6aad3671faeeedd232289eea48db8cce 1525s + local cnparents=1 1525s + test 1 = 1 1525s ++ for f in $parents 1525s ++ echo 48c55fcd6aad3671faeeedd232289eea48db8cce 1525s ++ wc -w 1525s ++ t-sort -u 1525s ++ LC_COLLATE=C 1525s ++ sort -u 1525s + local cndparents=1 1525s + test 1 = 1 1525s + case "$parents" in 1525s + case "$ctype" in 1525s + read cid ctype info 1525s + : ===== 48c55fcd6aad3671faeeedd232289eea48db8cce Anchor ===== 1525s + test 48c55fcd6aad3671faeeedd232289eea48db8cce = 48c55fcd6aad3671faeeedd232289eea48db8cce 1525s + local cetype=Packaging 1525s + '[' xAnchor = xPackaging ']' 1525s ++ git log -n1 --pretty=format:%P 48c55fcd6aad3671faeeedd232289eea48db8cce 1525s + local 'parents=23886cf8bbaefa175a2403d6556564175e096c16 c503a3d8e91a8fe38919c1795f29cacc3a671c3e' 1525s + expect='23886cf8bbaefa175a2403d6556564175e096c16 c503a3d8e91a8fe38919c1795f29cacc3a671c3e' 1525s + enparents=1 1525s + : Anchor/Packaging '23886cf8bbaefa175a2403d6556564175e096c16 c503a3d8e91a8fe38919c1795f29cacc3a671c3e' 1525s + case "$ctype/$cetype" in 1525s + case "$ctype/$etypes" in 1525s + case "$cetype" in 1525s + case "$ctype" in 1525s + break 1525s + parent_ix=2 1525s + return 1525s + t-refs-same-start 1525s + unset t_ref_val 1525s + t_ref_names=() 1525s + t-ref-head 1525s + local val 1525s ++ git rev-parse HEAD 1525s + val=c27beccf459a62bf651764dddc020fa7c837a706 1525s + t-ref-same-val HEAD c27beccf459a62bf651764dddc020fa7c837a706 1525s + local name=HEAD 1525s + local val=c27beccf459a62bf651764dddc020fa7c837a706 1525s + case "${t_ref_val-unset}" in 1525s + t_ref_val=c27beccf459a62bf651764dddc020fa7c837a706 1525s + t_ref_names+=("$name") 1525s + t-git-debrebase 1525s + local gdr=git-debrebase 1525s + : ' 1525s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1525s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 1525s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1525s git-debrebase *** WALK c27beccf459a62bf651764dddc020fa7c837a706 0 - 1525s git-debrebase get_differs 1f557e51ff27fe3f1d68461818d0a399e715151a deabef6f96bb1b7178f35d435657581e016549cf = 0x2 1525s git-debrebase classify c27beccf459a62bf651764dddc020fa7c837a706 $t=deabef6f96bb1b7178f35d435657581e016549cf @p 1f557e51ff27fe3f1d68461818d0a399e715151a/0x2 1525s git-debrebase = Upstream {"CommitId" => "c27beccf459a62bf651764dddc020fa7c837a706","Type" => "Upstream","Parents" => [{"CommitId" => "1f557e51ff27fe3f1d68461818d0a399e715151a","Ix" => 0,"Differs" => 2}],"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","Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent 1f557e51ff27fe3f1d68461818d0a399e715151a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1525s git-debrebase get_differs 7b76b54ea39f772ad8d64f830dae314a3c96aa72 a5b847c5f5608d10a68a18fee7f620409d6acdff = 0x2 1525s git-debrebase classify 1f557e51ff27fe3f1d68461818d0a399e715151a $t=a5b847c5f5608d10a68a18fee7f620409d6acdff @p 7b76b54ea39f772ad8d64f830dae314a3c96aa72/0x2 1525s git-debrebase = Upstream {"CommitId" => "1f557e51ff27fe3f1d68461818d0a399e715151a","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "7b76b54ea39f772ad8d64f830dae314a3c96aa72","Ix" => 0}],"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 7b76b54ea39f772ad8d64f830dae314a3c96aa72\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "a5b847c5f5608d10a68a18fee7f620409d6acdff"} 1525s git-debrebase get_differs 9457f0319c958b48982521510148a1a7932c438d acf4d861de73e2116f79da4799bd30ae73dc369c = 0x2 1525s git-debrebase classify 7b76b54ea39f772ad8d64f830dae314a3c96aa72 $t=acf4d861de73e2116f79da4799bd30ae73dc369c @p 9457f0319c958b48982521510148a1a7932c438d/0x2 1525s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "9457f0319c958b48982521510148a1a7932c438d","Differs" => 2}],"Tree" => "acf4d861de73e2116f79da4799bd30ae73dc369c","Hdr" => "tree acf4d861de73e2116f79da4799bd30ae73dc369c\nparent 9457f0319c958b48982521510148a1a7932c438d\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","CommitId" => "7b76b54ea39f772ad8d64f830dae314a3c96aa72","Type" => "Upstream"} 1525s git-debrebase get_differs 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 92aac2dbe83cd0960a78439e44ee36c146c5df98 = 0x2 1525s git-debrebase classify 9457f0319c958b48982521510148a1a7932c438d $t=92aac2dbe83cd0960a78439e44ee36c146c5df98 @p 9db4da97d5f8680310f8ab8723be8cbabee8e0a3/0x2 1525s git-debrebase = Upstream {"CommitId" => "9457f0319c958b48982521510148a1a7932c438d","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "9db4da97d5f8680310f8ab8723be8cbabee8e0a3"}],"Tree" => "92aac2dbe83cd0960a78439e44ee36c146c5df98","Hdr" => "tree 92aac2dbe83cd0960a78439e44ee36c146c5df98\nparent 9db4da97d5f8680310f8ab8723be8cbabee8e0a3\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-1)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-us.c-us-1.patch"} 1525s git-debrebase get_differs 5a0dd58d83fc87c160def1a96fb25b4568f04cec 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 = 0x2 1525s git-debrebase classify 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 $t=9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 @p 5a0dd58d83fc87c160def1a96fb25b4568f04cec/0x2 1525s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "9db4da97d5f8680310f8ab8723be8cbabee8e0a3","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 5a0dd58d83fc87c160def1a96fb25b4568f04cec\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4","Parents" => [{"Ix" => 0,"CommitId" => "5a0dd58d83fc87c160def1a96fb25b4568f04cec","Differs" => 2}]} 1525s git-debrebase get_differs 70b07d5fdfff717e5ae09350777924d86465f02f 4844b97a44f315daca96b2361badd4d135ea373c = 0x2 1525s git-debrebase classify 5a0dd58d83fc87c160def1a96fb25b4568f04cec $t=4844b97a44f315daca96b2361badd4d135ea373c @p 70b07d5fdfff717e5ae09350777924d86465f02f/0x2 1525s git-debrebase = Upstream {"CommitId" => "5a0dd58d83fc87c160def1a96fb25b4568f04cec","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "70b07d5fdfff717e5ae09350777924d86465f02f","Differs" => 2}],"Tree" => "4844b97a44f315daca96b2361badd4d135ea373c","Hdr" => "tree 4844b97a44f315daca96b2361badd4d135ea373c\nparent 70b07d5fdfff717e5ae09350777924d86465f02f\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"} 1525s git-debrebase get_differs a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 0e902e52f7664910822aaa8b2c8ce07adbe82b4b = 0x2 1525s git-debrebase classify 70b07d5fdfff717e5ae09350777924d86465f02f $t=0e902e52f7664910822aaa8b2c8ce07adbe82b4b @p a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393/0x2 1525s git-debrebase = Upstream {"CommitId" => "70b07d5fdfff717e5ae09350777924d86465f02f","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393","Differs" => 2}],"Tree" => "0e902e52f7664910822aaa8b2c8ce07adbe82b4b","Hdr" => "tree 0e902e52f7664910822aaa8b2c8ce07adbe82b4b\nparent a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393\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"} 1525s git-debrebase get_differs 894792d8499295fadeaf57b4144ce5c9888916b6 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 = 0x2 1525s git-debrebase classify a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 $t=2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 @p 894792d8499295fadeaf57b4144ce5c9888916b6/0x2 1525s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Tree" => "2a7ff02ad3fb5c8ef0b42810651560a14f1f7488","Hdr" => "tree 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488\nparent 894792d8499295fadeaf57b4144ce5c9888916b6\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "894792d8499295fadeaf57b4144ce5c9888916b6"}],"Type" => "Upstream","CommitId" => "a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393"} 1525s git-debrebase get_differs edd43a440203725dfb4eb77fe703f18f4338ae81 e604da492dadb01ff5ab227f55c684c7c9f7c4d0 = 0x2 1525s git-debrebase classify 894792d8499295fadeaf57b4144ce5c9888916b6 $t=e604da492dadb01ff5ab227f55c684c7c9f7c4d0 @p edd43a440203725dfb4eb77fe703f18f4338ae81/0x2 1525s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "894792d8499295fadeaf57b4144ce5c9888916b6","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree e604da492dadb01ff5ab227f55c684c7c9f7c4d0\nparent edd43a440203725dfb4eb77fe703f18f4338ae81\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "e604da492dadb01ff5ab227f55c684c7c9f7c4d0","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "edd43a440203725dfb4eb77fe703f18f4338ae81"}]} 1525s git-debrebase get_differs 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 de8b92be7dce908cca5da61f752d0fff8f7c774d = 0x2 1525s git-debrebase classify edd43a440203725dfb4eb77fe703f18f4338ae81 $t=de8b92be7dce908cca5da61f752d0fff8f7c774d @p 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840/0x2 1525s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "edd43a440203725dfb4eb77fe703f18f4338ae81","Tree" => "de8b92be7dce908cca5da61f752d0fff8f7c774d","Hdr" => "tree de8b92be7dce908cca5da61f752d0fff8f7c774d\nparent 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840\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","Parents" => [{"Differs" => 2,"CommitId" => "2d2d5a347e8baf5bea48f63d3e661ce16b1aa840","Ix" => 0}]} 1525s git-debrebase get_differs 531003972219750d3af702dacee662b59fa321b3 75f063f3c83d7c2317a507777c57d79aff85b4e6 = 0x2 1525s git-debrebase classify 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 $t=75f063f3c83d7c2317a507777c57d79aff85b4e6 @p 531003972219750d3af702dacee662b59fa321b3/0x2 1525s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "531003972219750d3af702dacee662b59fa321b3"}],"Tree" => "75f063f3c83d7c2317a507777c57d79aff85b4e6","Hdr" => "tree 75f063f3c83d7c2317a507777c57d79aff85b4e6\nparent 531003972219750d3af702dacee662b59fa321b3\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","CommitId" => "2d2d5a347e8baf5bea48f63d3e661ce16b1aa840","Type" => "Upstream"} 1525s git-debrebase get_differs f77f5a3cf715442ff9af63f94215e720d5c7249e c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 1525s git-debrebase get_differs 2e477ebdadbfd34200641bc4d10e83fddd22be86 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 1525s git-debrebase classify 531003972219750d3af702dacee662b59fa321b3 $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p f77f5a3cf715442ff9af63f94215e720d5c7249e/0x20 2e477ebdadbfd34200641bc4d10e83fddd22be86/0x32 1525s git-debrebase = MergedBreakwaters {"CommitId" => "531003972219750d3af702dacee662b59fa321b3","Type" => "MergedBreakwaters","Parents" => [{"Ix" => 0,"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","IsDgitImport" => undef,"Differs" => 32,"IsOrigin" => ""},{"IsOrigin" => "","Differs" => 50,"IsDgitImport" => undef,"CommitId" => "2e477ebdadbfd34200641bc4d10e83fddd22be86","Ix" => 1}],"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 f77f5a3cf715442ff9af63f94215e720d5c7249e\nparent 2e477ebdadbfd34200641bc4d10e83fddd22be86\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6"} 1525s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1525s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1525s git-debrebase = Packaging {"Msg" => "us-conflict\n","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e"} 1525s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1525s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1525s git-debrebase = Packaging {"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Parents" => [{"Ix" => 0,"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Differs" => 32}],"Type" => "Packaging","CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b"} 1525s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1525s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1525s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298"}],"Type" => "Packaging","CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265"} 1525s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1525s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1525s git-debrebase = Changelog {"Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"Differs" => 16,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Ix" => 0}],"Type" => "Changelog","CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298"} 1525s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1525s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1525s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1525s git-debrebase = Anchor {"Type" => "Anchor","CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da"}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70"},$VAR1->{"OrigParents"}[0]]} 1525s git-debrebase get_differs 0a0b882081203204ada50ec42c5325d6bb787bb1 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 1525s git-debrebase classify 2e477ebdadbfd34200641bc4d10e83fddd22be86 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 0a0b882081203204ada50ec42c5325d6bb787bb1/0x20 1525s git-debrebase = Packaging {"Msg" => "other-conflict\n","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 0a0b882081203204ada50ec42c5325d6bb787bb1\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "0a0b882081203204ada50ec42c5325d6bb787bb1"}],"Type" => "Packaging","CommitId" => "2e477ebdadbfd34200641bc4d10e83fddd22be86"} 1525s git-debrebase get_differs 6d3531222a3d37679ba79f70739ccac18d016196 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1525s git-debrebase classify 0a0b882081203204ada50ec42c5325d6bb787bb1 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 6d3531222a3d37679ba79f70739ccac18d016196/0x20 1525s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "6d3531222a3d37679ba79f70739ccac18d016196","Ix" => 0}],"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 6d3531222a3d37679ba79f70739ccac18d016196\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "0a0b882081203204ada50ec42c5325d6bb787bb1","Type" => "Packaging"} 1525s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1525s git-debrebase classify 6d3531222a3d37679ba79f70739ccac18d016196 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1525s git-debrebase = Packaging {"CommitId" => "6d3531222a3d37679ba79f70739ccac18d016196","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 32}],"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Msg" => "DEBIAN add zorkmid-other (other)\n"} 1525s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1525s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1525s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\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" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Type" => "Packaging"} 1525s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1525s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1525s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32}],"Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Type" => "Packaging"} 1525s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1525s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1525s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"}],"Type" => "Changelog","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"} 1525s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1525s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1525s git-debrebase = Changelog {"Parents" => [{"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Ix" => 0,"Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\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" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Type" => "Changelog"} 1525s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1525s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1525s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1525s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"} 1525s git-debrebase *** WALK prep done cur=531003972219750d3af702dacee662b59fa321b3 brw -1 upp 10 proc 11 pm -1 1525s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1525s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1525s git-debrebase WALK REBUILD 531003972219750d3af702dacee662b59fa321b3 12 1525s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1525s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1525s git-debrebase WALK BUILD 2d2d5a347e8baf5bea48f63d3e661ce16b1aa840 Upstream (rewriting=0) 1525s git-debrebase WALK BUILD edd43a440203725dfb4eb77fe703f18f4338ae81 Upstream (rewriting=0) 1525s git-debrebase WALK BUILD 894792d8499295fadeaf57b4144ce5c9888916b6 Upstream (rewriting=0) 1525s git-debrebase WALK BUILD a5b4cca5e755b0c1d87d5e3d320a5b393b8f2393 Upstream (rewriting=0) 1525s git-debrebase WALK BUILD 70b07d5fdfff717e5ae09350777924d86465f02f Upstream (rewriting=0) 1525s git-debrebase WALK BUILD 5a0dd58d83fc87c160def1a96fb25b4568f04cec Upstream (rewriting=0) 1525s git-debrebase WALK BUILD 9db4da97d5f8680310f8ab8723be8cbabee8e0a3 Upstream (rewriting=0) 1525s git-debrebase WALK BUILD 9457f0319c958b48982521510148a1a7932c438d Upstream (rewriting=0) 1525s git-debrebase WALK BUILD 7b76b54ea39f772ad8d64f830dae314a3c96aa72 Upstream (rewriting=0) 1525s git-debrebase WALK BUILD 1f557e51ff27fe3f1d68461818d0a399e715151a Upstream (rewriting=0) 1525s git-debrebase WALK BUILD c27beccf459a62bf651764dddc020fa7c837a706 Upstream (rewriting=0) 1525s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1525s git-debrebase get_differs c27beccf459a62bf651764dddc020fa7c837a706 c27beccf459a62bf651764dddc020fa7c837a706 = 0 1525s git-debrebase *** WALK RETURN c27beccf459a62bf651764dddc020fa7c837a706 531003972219750d3af702dacee662b59fa321b3 d50318b393ee163dd38aa93c9427a1ce6a993b3a 1525s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1525s ' 1525s + t-ref-head 1525s + local val 1525s ++ git rev-parse HEAD 1525s + val=c27beccf459a62bf651764dddc020fa7c837a706 1525s + t-ref-same-val HEAD c27beccf459a62bf651764dddc020fa7c837a706 1525s + local name=HEAD 1525s + local val=c27beccf459a62bf651764dddc020fa7c837a706 1525s + case "${t_ref_val-unset}" in 1525s + t_ref_val=c27beccf459a62bf651764dddc020fa7c837a706 1525s + t_ref_names+=("$name") 1525s + t-git-debrebase scrap 1525s + local gdr=git-debrebase 1525s + : ' 1525s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1525s + git-debrebase --dgit=dgit -D --experimental-merge-resolution scrap 1525s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1525s git-debrebase >= update refs/debrebase-last/heads/master 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 0000000000000000000000000000000000000000 1525s git-debrebase >= update refs/ffq-prev/heads/master 0000000000000000000000000000000000000000 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 1525s git-debrebase >= update HEAD 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf c27beccf459a62bf651764dddc020fa7c837a706 1525s git-debrebase >$ 1525s HEAD is now at 43ca8e1 Merge branch 'other' 1525s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1525s ' 1525s + t-some-changes after 1525s + local token=after 1525s + local which=dum 1525s + local fsuffix= 1525s + t-git-next-date 1525s + GIT_COMMITTER_DATE='1530000012 +0100' 1525s + GIT_AUTHOR_DATE='1530000012 +0100' 1525s + case "$which" in 1525s + echo '// debian after' 1525s + git add debian/zorkmid 1525s + git commit -m 'DEBIAN add zorkmid (after)' 1525s [master b3df710] DEBIAN add zorkmid (after) 1525s 1 file changed, 1 insertion(+) 1525s + case "$which" in 1525s + echo '// upstream after' 1525s + git add src.c 1525s + git commit -m 'UPSTREAM edit src.c (after)' 1525s [master ebf09ae] UPSTREAM edit src.c (after) 1525s 1 file changed, 1 insertion(+) 1525s + case "$which" in 1525s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1525s + echo '// both! after' 1525s + git add debian/zorkmid 1525s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1525s + echo '// both! after' 1525s + git add src.c 1525s + git commit -m 'MIXED add both() (after)' 1525s [master 4d0ed0e] MIXED add both() (after) 1525s 2 files changed, 2 insertions(+) 1525s + t-git-next-date 1525s + GIT_COMMITTER_DATE='1530000013 +0100' 1525s + GIT_AUTHOR_DATE='1530000013 +0100' 1525s + t-git-debrebase 1525s + local gdr=git-debrebase 1525s + : ' 1525s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1525s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 1526s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1526s git-debrebase ffq check_specs * 1526s git-debrebase ffq merge master 1526s git-debrebase ffq check_remote origin remote fetch/merge branch 1526s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1526s OK, you are ahead of refs/remotes/origin/master 1526s git-debrebase ffq check_remote undef remote push branch 1526s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1526s git-debrebase *** WALK 4d0ed0e33f3480faf1e633cf8814660a041789f7 0 - 1526s git-debrebase get_differs ebf09aee38effa3e52e848d0bbc0c6d655aad950 08b4d440266f8a32c8baf2817a7ed53db9476b94 = 0x22 1526s git-debrebase classify 4d0ed0e33f3480faf1e633cf8814660a041789f7 $t=08b4d440266f8a32c8baf2817a7ed53db9476b94 @p ebf09aee38effa3e52e848d0bbc0c6d655aad950/0x22 1526s git-debrebase = Mixed {"Msg" => "MIXED add both() (after)\n","CommitId" => "4d0ed0e33f3480faf1e633cf8814660a041789f7","Type" => "Mixed","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "ebf09aee38effa3e52e848d0bbc0c6d655aad950"}],"Hdr" => "tree 08b4d440266f8a32c8baf2817a7ed53db9476b94\nparent ebf09aee38effa3e52e848d0bbc0c6d655aad950\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "08b4d440266f8a32c8baf2817a7ed53db9476b94"} 1526s git-debrebase get_differs b3df710d5d583e5feffb7799c72f3b7d5303ab13 918c82da492809b49682be9409696c6897e8e7cc = 0x2 1526s git-debrebase classify ebf09aee38effa3e52e848d0bbc0c6d655aad950 $t=918c82da492809b49682be9409696c6897e8e7cc @p b3df710d5d583e5feffb7799c72f3b7d5303ab13/0x2 1526s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "b3df710d5d583e5feffb7799c72f3b7d5303ab13","Differs" => 2}],"Hdr" => "tree 918c82da492809b49682be9409696c6897e8e7cc\nparent b3df710d5d583e5feffb7799c72f3b7d5303ab13\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "918c82da492809b49682be9409696c6897e8e7cc","Type" => "Upstream","CommitId" => "ebf09aee38effa3e52e848d0bbc0c6d655aad950","Msg" => "UPSTREAM edit src.c (after)\n"} 1526s git-debrebase get_differs 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 4a2544d3f07debb25659ba494041c70c896e5887 = 0x20 1526s git-debrebase classify b3df710d5d583e5feffb7799c72f3b7d5303ab13 $t=4a2544d3f07debb25659ba494041c70c896e5887 @p 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf/0x20 1526s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 4a2544d3f07debb25659ba494041c70c896e5887\nparent 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "4a2544d3f07debb25659ba494041c70c896e5887","Parents" => [{"Differs" => 32,"CommitId" => "43ca8e1f591491b1c5f8f4bc3b8018ee98970daf","Ix" => 0}],"Msg" => "DEBIAN add zorkmid (after)\n","CommitId" => "b3df710d5d583e5feffb7799c72f3b7d5303ab13"} 1526s git-debrebase get_differs d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 deabef6f96bb1b7178f35d435657581e016549cf = 0x22 1526s git-debrebase get_differs 66770cce31f14cd16c7b57514e38b1f59a29a856 deabef6f96bb1b7178f35d435657581e016549cf = 0x32 1526s git-debrebase classify 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf $t=deabef6f96bb1b7178f35d435657581e016549cf @p d61fb6d45ea3ff4eedf9ec866c6941c743205eb7/0x22 66770cce31f14cd16c7b57514e38b1f59a29a856/0x32 1526s git-debrebase = VanillaMerge {"Type" => "VanillaMerge","Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent d61fb6d45ea3ff4eedf9ec866c6941c743205eb7\nparent 66770cce31f14cd16c7b57514e38b1f59a29a856\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "deabef6f96bb1b7178f35d435657581e016549cf","Parents" => [{"Ix" => 0,"IsDgitImport" => undef,"CommitId" => "d61fb6d45ea3ff4eedf9ec866c6941c743205eb7","IsOrigin" => "","Differs" => 34},{"IsDgitImport" => undef,"CommitId" => "66770cce31f14cd16c7b57514e38b1f59a29a856","IsOrigin" => "","Differs" => 50,"Ix" => 1}],"CommitId" => "43ca8e1f591491b1c5f8f4bc3b8018ee98970daf","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n"} 1526s git-debrebase *** MERGE 1526s git-debrebase mwrecknote vanilla-merge 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 1526s git-debrebase *** WALK d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 0 - 1526s git-debrebase get_differs 23622c7321349049ab04c3e2f87531a494b246a1 e38de421676caa1148e6e5d6e455bf955514342f = 0 1526s git-debrebase get_differs 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1 e38de421676caa1148e6e5d6e455bf955514342f = 0x32 1526s git-debrebase classify d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 23622c7321349049ab04c3e2f87531a494b246a1/0 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1/0x32 1526s git-debrebase = Pseudomerge {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "23622c7321349049ab04c3e2f87531a494b246a1"},{"Ix" => 1,"Differs" => 50,"CommitId" => "5e15b7ee5c56d7b4d69ef8a086c30a66598958a1"}],"Tree" => "e38de421676caa1148e6e5d6e455bf955514342f","Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[1]],"CommitId" => "d61fb6d45ea3ff4eedf9ec866c6941c743205eb7","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 23622c7321349049ab04c3e2f87531a494b246a1\nparent 5e15b7ee5c56d7b4d69ef8a086c30a66598958a1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Contributor" => $VAR1->{"Parents"}[0]} 1526s git-debrebase get_differs 81888cd1ecc5ca646e576d8a540db94208710647 e38de421676caa1148e6e5d6e455bf955514342f = 0x2 1526s git-debrebase classify 23622c7321349049ab04c3e2f87531a494b246a1 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 81888cd1ecc5ca646e576d8a540db94208710647/0x2 1526s git-debrebase = Upstream {"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "23622c7321349049ab04c3e2f87531a494b246a1","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "81888cd1ecc5ca646e576d8a540db94208710647","Differs" => 2}],"Tree" => "e38de421676caa1148e6e5d6e455bf955514342f","Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 81888cd1ecc5ca646e576d8a540db94208710647\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1526s git-debrebase get_differs 60f576c6186efb32ddd3cce7c8d618e0838f3ebd 698a2560d79a004c2c8f172bfb77966a4d931ec1 = 0x2 1526s git-debrebase classify 81888cd1ecc5ca646e576d8a540db94208710647 $t=698a2560d79a004c2c8f172bfb77966a4d931ec1 @p 60f576c6186efb32ddd3cce7c8d618e0838f3ebd/0x2 1526s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 698a2560d79a004c2c8f172bfb77966a4d931ec1\nparent 60f576c6186efb32ddd3cce7c8d618e0838f3ebd\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "698a2560d79a004c2c8f172bfb77966a4d931ec1","Parents" => [{"CommitId" => "60f576c6186efb32ddd3cce7c8d618e0838f3ebd","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src-us.c (us-2)\n","CommitId" => "81888cd1ecc5ca646e576d8a540db94208710647"} 1526s git-debrebase get_differs 773840a34b78968a5547ba99b314542fd263dfc0 e8b94450cb8e681e494689fb8332a4becf2fd75d = 0x2 1526s git-debrebase classify 60f576c6186efb32ddd3cce7c8d618e0838f3ebd $t=e8b94450cb8e681e494689fb8332a4becf2fd75d @p 773840a34b78968a5547ba99b314542fd263dfc0/0x2 1526s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "773840a34b78968a5547ba99b314542fd263dfc0","Ix" => 0}],"Hdr" => "tree e8b94450cb8e681e494689fb8332a4becf2fd75d\nparent 773840a34b78968a5547ba99b314542fd263dfc0\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "e8b94450cb8e681e494689fb8332a4becf2fd75d","CommitId" => "60f576c6186efb32ddd3cce7c8d618e0838f3ebd","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1526s git-debrebase get_differs b9cff9c120d085330ed394d99fcc23a45714eeec af732c5124a36938b085e0b7c534b2935a2519bf = 0x2 1526s git-debrebase classify 773840a34b78968a5547ba99b314542fd263dfc0 $t=af732c5124a36938b085e0b7c534b2935a2519bf @p b9cff9c120d085330ed394d99fcc23a45714eeec/0x2 1526s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "af732c5124a36938b085e0b7c534b2935a2519bf","Hdr" => "tree af732c5124a36938b085e0b7c534b2935a2519bf\nparent b9cff9c120d085330ed394d99fcc23a45714eeec\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "b9cff9c120d085330ed394d99fcc23a45714eeec","Differs" => 2}],"Msg" => "UPSTREAM edit src-us.c (us-1)\n","CommitId" => "773840a34b78968a5547ba99b314542fd263dfc0"} 1526s git-debrebase get_differs 5c95dd8effd34ae96b528da18ad695d34a56b6b0 3e1d62be2276fc0c07e618f0afa1c015ba613ae1 = 0x2 1526s git-debrebase classify b9cff9c120d085330ed394d99fcc23a45714eeec $t=3e1d62be2276fc0c07e618f0afa1c015ba613ae1 @p 5c95dd8effd34ae96b528da18ad695d34a56b6b0/0x2 1526s git-debrebase = Upstream {"CommitId" => "b9cff9c120d085330ed394d99fcc23a45714eeec","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "5c95dd8effd34ae96b528da18ad695d34a56b6b0","Ix" => 0}],"Tree" => "3e1d62be2276fc0c07e618f0afa1c015ba613ae1","Hdr" => "tree 3e1d62be2276fc0c07e618f0afa1c015ba613ae1\nparent 5c95dd8effd34ae96b528da18ad695d34a56b6b0\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1526s git-debrebase get_differs b3a7b35aedeb0f06f45908772ba2fe6ab61451f5 e0b7dfbd5a539e0394c71cfd449ea9de3914f928 = 0x2 1526s git-debrebase classify 5c95dd8effd34ae96b528da18ad695d34a56b6b0 $t=e0b7dfbd5a539e0394c71cfd449ea9de3914f928 @p b3a7b35aedeb0f06f45908772ba2fe6ab61451f5/0x2 1526s git-debrebase = Upstream {"CommitId" => "5c95dd8effd34ae96b528da18ad695d34a56b6b0","Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream","Hdr" => "tree e0b7dfbd5a539e0394c71cfd449ea9de3914f928\nparent b3a7b35aedeb0f06f45908772ba2fe6ab61451f5\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "e0b7dfbd5a539e0394c71cfd449ea9de3914f928","Parents" => [{"Ix" => 0,"CommitId" => "b3a7b35aedeb0f06f45908772ba2fe6ab61451f5","Differs" => 2}]} 1526s git-debrebase get_differs e81f8d58e13d770dab8f85facd9a5035ae7bdb17 5f7f15e4216ca911d7d124f6ecc91b968ab63310 = 0x2 1526s git-debrebase classify b3a7b35aedeb0f06f45908772ba2fe6ab61451f5 $t=5f7f15e4216ca911d7d124f6ecc91b968ab63310 @p e81f8d58e13d770dab8f85facd9a5035ae7bdb17/0x2 1526s git-debrebase = Upstream {"CommitId" => "b3a7b35aedeb0f06f45908772ba2fe6ab61451f5","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "5f7f15e4216ca911d7d124f6ecc91b968ab63310","Hdr" => "tree 5f7f15e4216ca911d7d124f6ecc91b968ab63310\nparent e81f8d58e13d770dab8f85facd9a5035ae7bdb17\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "e81f8d58e13d770dab8f85facd9a5035ae7bdb17","Ix" => 0}],"Type" => "Upstream"} 1526s git-debrebase get_differs 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b 290db9f88b6ffa542315f3f8b5f24f15797c33d2 = 0x2 1526s git-debrebase classify e81f8d58e13d770dab8f85facd9a5035ae7bdb17 $t=290db9f88b6ffa542315f3f8b5f24f15797c33d2 @p 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b/0x2 1526s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b","Differs" => 2}],"Hdr" => "tree 290db9f88b6ffa542315f3f8b5f24f15797c33d2\nparent 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "290db9f88b6ffa542315f3f8b5f24f15797c33d2","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e81f8d58e13d770dab8f85facd9a5035ae7bdb17"} 1526s git-debrebase get_differs f77f5a3cf715442ff9af63f94215e720d5c7249e 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd = 0x2 1526s git-debrebase classify 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b $t=7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd @p f77f5a3cf715442ff9af63f94215e720d5c7249e/0x2 1526s git-debrebase = Upstream {"Tree" => "7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd","Hdr" => "tree 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd\nparent f77f5a3cf715442ff9af63f94215e720d5c7249e\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Differs" => 2}],"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b"} 1526s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1526s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1526s git-debrebase = Packaging {"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Msg" => "us-conflict\n","Parents" => [{"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Differs" => 32,"Ix" => 0}],"Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging"} 1526s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1526s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1526s git-debrebase = Packaging {"Parents" => [{"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Differs" => 32,"Ix" => 0}],"Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b"} 1526s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1526s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1526s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-us (us-2)\n","CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298"}],"Type" => "Packaging"} 1526s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1526s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1526s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Type" => "Changelog","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Parents" => [{"Differs" => 16,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Ix" => 0}]} 1526s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1526s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1526s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1526s git-debrebase = Anchor {"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Type" => "Anchor","Parents" => [{"Differs" => 2,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70","Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da"}],"Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 1526s git-debrebase *** WALK prep done cur=d50318b393ee163dd38aa93c9427a1ce6a993b3a brw 3 upp 9 proc 15 pm 0 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1526s git-debrebase WALK REBUILD d50318b393ee163dd38aa93c9427a1ce6a993b3a 16 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1526s git-debrebase WALK BUILD bbe1078ab4e02c973ffae4ecc124fccd0ebee298 Debian (rewriting=0) 1526s git-debrebase WALK BUILD 16f86dfb60387585ebd2714c26703a02aa3d2265 Debian (rewriting=0) 1526s git-debrebase WALK BUILD 679a57a2fb7abcea83d6a6401e6ed325b289669b Debian (rewriting=0) 1526s git-debrebase WALK BUILD f77f5a3cf715442ff9af63f94215e720d5c7249e Debian (rewriting=0) 1526s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1526s git-debrebase WALK BUILD 15d5e29596e7ae9a0725fa5ccaa7dd7c122d8c1b Upstream (rewriting=0) 1526s git-debrebase WALK BUILD e81f8d58e13d770dab8f85facd9a5035ae7bdb17 Upstream (rewriting=0) 1526s git-debrebase WALK BUILD b3a7b35aedeb0f06f45908772ba2fe6ab61451f5 Upstream (rewriting=0) 1526s git-debrebase WALK BUILD 5c95dd8effd34ae96b528da18ad695d34a56b6b0 Upstream (rewriting=0) 1526s git-debrebase WALK BUILD b9cff9c120d085330ed394d99fcc23a45714eeec Upstream (rewriting=0) 1526s git-debrebase WALK BUILD 773840a34b78968a5547ba99b314542fd263dfc0 Upstream (rewriting=0) 1526s git-debrebase WALK BUILD 60f576c6186efb32ddd3cce7c8d618e0838f3ebd Upstream (rewriting=0) 1526s git-debrebase WALK BUILD 81888cd1ecc5ca646e576d8a540db94208710647 Upstream (rewriting=0) 1526s git-debrebase WALK BUILD 23622c7321349049ab04c3e2f87531a494b246a1 Upstream (rewriting=0) 1526s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1526s git-debrebase get_differs 23622c7321349049ab04c3e2f87531a494b246a1 d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 = 0 1526s git-debrebase *** WALK RETURN 23622c7321349049ab04c3e2f87531a494b246a1 f77f5a3cf715442ff9af63f94215e720d5c7249e d50318b393ee163dd38aa93c9427a1ce6a993b3a 1526s git-debrebase mwrecknote left-input d61fb6d45ea3ff4eedf9ec866c6941c743205eb7 1526s git-debrebase mwrecknote left-laundered 23622c7321349049ab04c3e2f87531a494b246a1 1526s git-debrebase mwrecknote left-breakwater f77f5a3cf715442ff9af63f94215e720d5c7249e 1526s git-debrebase mwrecknote left-anchor d50318b393ee163dd38aa93c9427a1ce6a993b3a 1526s git-debrebase MERGE BA best=d50318b393ee163dd38aa93c9427a1ce6a993b3a p=d50318b393ee163dd38aa93c9427a1ce6a993b3a 1526s git-debrebase *** WALK 66770cce31f14cd16c7b57514e38b1f59a29a856 0 - 1526s git-debrebase get_differs 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca 11cb3d048b147c76ac8e15998d01b777a72434a7 = 0x20 1526s git-debrebase classify 66770cce31f14cd16c7b57514e38b1f59a29a856 $t=11cb3d048b147c76ac8e15998d01b777a72434a7 @p 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca/0x20 1526s git-debrebase = Packaging {"Msg" => "other-conflict\n","CommitId" => "66770cce31f14cd16c7b57514e38b1f59a29a856","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca","Differs" => 32}],"Tree" => "11cb3d048b147c76ac8e15998d01b777a72434a7","Hdr" => "tree 11cb3d048b147c76ac8e15998d01b777a72434a7\nparent 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000007 +0100\n"} 1526s git-debrebase get_differs c49d2b2a9ad96cef20289702368179fbf9451928 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x22 1526s git-debrebase classify 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p c49d2b2a9ad96cef20289702368179fbf9451928/0x22 1526s git-debrebase = Mixed {"Msg" => "MIXED add both(-other) (other)\n","CommitId" => "6ee89e4cce7c9d32e2d9e50645c5afde01d988ca","Parents" => [{"Differs" => 34,"CommitId" => "c49d2b2a9ad96cef20289702368179fbf9451928","Ix" => 0}],"Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent c49d2b2a9ad96cef20289702368179fbf9451928\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Type" => "Mixed"} 1526s git-debrebase get_differs 93fb9b858aa57847959deb395e6e7f54a29d8459 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 = 0x2 1526s git-debrebase classify c49d2b2a9ad96cef20289702368179fbf9451928 $t=6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 @p 93fb9b858aa57847959deb395e6e7f54a29d8459/0x2 1526s git-debrebase = Upstream {"Hdr" => "tree 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3\nparent 93fb9b858aa57847959deb395e6e7f54a29d8459\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Tree" => "6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3","Parents" => [{"Ix" => 0,"CommitId" => "93fb9b858aa57847959deb395e6e7f54a29d8459","Differs" => 2}],"Type" => "Upstream","CommitId" => "c49d2b2a9ad96cef20289702368179fbf9451928","Msg" => "UPSTREAM edit src-other.c (other)\n"} 1526s git-debrebase get_differs ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 0b23db5d4cdb928c7302154a99ab0e961fcb877a = 0x20 1526s git-debrebase classify 93fb9b858aa57847959deb395e6e7f54a29d8459 $t=0b23db5d4cdb928c7302154a99ab0e961fcb877a @p ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6/0x20 1526s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6"}],"Tree" => "0b23db5d4cdb928c7302154a99ab0e961fcb877a","Hdr" => "tree 0b23db5d4cdb928c7302154a99ab0e961fcb877a\nparent ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","CommitId" => "93fb9b858aa57847959deb395e6e7f54a29d8459"} 1526s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1526s git-debrebase get_differs b377a9960f3a99f617597d2203ab69805f4af3d1 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1526s git-debrebase classify ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5/0 b377a9960f3a99f617597d2203ab69805f4af3d1/0 1526s git-debrebase = Pseudomerge {"Contributor" => {"CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Differs" => 0,"Ix" => 0},"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5\nparent b377a9960f3a99f617597d2203ab69805f4af3d1\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","CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Parents" => [$VAR1->{"Contributor"},{"Differs" => 0,"CommitId" => "b377a9960f3a99f617597d2203ab69805f4af3d1","Ix" => 1}],"SubType" => "Ambiguous","Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge"} 1526s git-debrebase get_differs 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 1526s git-debrebase classify 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a/0x2 1526s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Differs" => 2,"Ix" => 0}],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1526s git-debrebase get_differs 61838f71874d7ddb712bb3c25e0a0c91734bab47 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 1526s git-debrebase classify 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 61838f71874d7ddb712bb3c25e0a0c91734bab47/0x2 1526s git-debrebase = Upstream {"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 61838f71874d7ddb712bb3c25e0a0c91734bab47\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47"}]} 1526s git-debrebase get_differs cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 1526s git-debrebase classify 61838f71874d7ddb712bb3c25e0a0c91734bab47 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p cfa06dbc0f977f48e1449a0f11ee4106d8bf1269/0x2 1526s git-debrebase = Upstream {"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Ix" => 0}],"Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent cfa06dbc0f977f48e1449a0f11ee4106d8bf1269\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1526s git-debrebase get_differs 31cc003deb18794414e5604fc32fdd9819189100 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 1526s git-debrebase classify cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p 31cc003deb18794414e5604fc32fdd9819189100/0x2 1526s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100"}],"Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent 31cc003deb18794414e5604fc32fdd9819189100\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n"} 1526s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 1526s git-debrebase classify 31cc003deb18794414e5604fc32fdd9819189100 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 1526s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0}],"Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n"} 1526s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1526s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1526s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Parents" => [{"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32,"Ix" => 0}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging"} 1526s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1526s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1526s git-debrebase = Packaging {"Parents" => [{"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Differs" => 32,"Ix" => 0}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Msg" => "DEBIAN add zorkmid (before)\n"} 1526s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1526s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1526s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16,"Ix" => 0}],"Type" => "Changelog"} 1526s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1526s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1526s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Parents" => [{"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog"} 1526s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1526s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1526s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1526s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Ix" => 1}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\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" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16"},$VAR1->{"OrigParents"}[0]]} 1526s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 7 upp 7 proc 16 pm 0 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1526s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 17 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1526s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1526s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1526s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1526s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1526s git-debrebase WALK BUILD 93fb9b858aa57847959deb395e6e7f54a29d8459 Debian (rewriting=0) 1526s git-debrebase WALK REWRITING NOW cl=HASH(0x929bcb60be8) procd=HASH(0x929bcb74528) 1526s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1526s git-debrebase WALK BUILD 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca Debian (rewriting=1) 1526s git-debrebase WALK BUILD 66770cce31f14cd16c7b57514e38b1f59a29a856 Debian (rewriting=1) 1526s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1526s git-debrebase WALK BUILD 31cc003deb18794414e5604fc32fdd9819189100 Upstream (rewriting=1) 1526s git-debrebase WALK BUILD cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 Upstream (rewriting=1) 1526s git-debrebase WALK BUILD 61838f71874d7ddb712bb3c25e0a0c91734bab47 Upstream (rewriting=1) 1526s git-debrebase WALK BUILD 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a Upstream (rewriting=1) 1526s git-debrebase WALK BUILD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 Upstream (rewriting=1) 1526s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1526s git-debrebase WALK BUILD c49d2b2a9ad96cef20289702368179fbf9451928 Upstream (rewriting=1) 1526s git-debrebase WALK BUILD 6ee89e4cce7c9d32e2d9e50645c5afde01d988ca Upstream (rewriting=1) 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1526s git-debrebase get_differs e06013e937c3284e3aa79eeb7df09028d7fbd61c 66770cce31f14cd16c7b57514e38b1f59a29a856 = 0 1526s git-debrebase *** WALK RETURN e06013e937c3284e3aa79eeb7df09028d7fbd61c 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 48c55fcd6aad3671faeeedd232289eea48db8cce 1526s git-debrebase mwrecknote right-input 66770cce31f14cd16c7b57514e38b1f59a29a856 1526s git-debrebase mwrecknote right-laundered e06013e937c3284e3aa79eeb7df09028d7fbd61c 1526s git-debrebase mwrecknote right-breakwater 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 1526s git-debrebase mwrecknote right-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1526s git-debrebase MERGE BA best=d50318b393ee163dd38aa93c9427a1ce6a993b3a p=48c55fcd6aad3671faeeedd232289eea48db8cce 1526s git-debrebase mwrecknote result-anchor d50318b393ee163dd38aa93c9427a1ce6a993b3a 1526s git-debrebase mwrecknote interchange-mbcand-ok-0 ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 1526s git-debrebase *** WALK ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 0 - 1526s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1526s git-debrebase get_differs b377a9960f3a99f617597d2203ab69805f4af3d1 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 1526s git-debrebase classify ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5/0 b377a9960f3a99f617597d2203ab69805f4af3d1/0 1526s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5"},"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5\nparent b377a9960f3a99f617597d2203ab69805f4af3d1\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","CommitId" => "ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6","Parents" => [$VAR1->{"Contributor"},{"Ix" => 1,"Differs" => 0,"CommitId" => "b377a9960f3a99f617597d2203ab69805f4af3d1"}],"Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge","SubType" => "Ambiguous"} 1526s git-debrebase get_differs 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 1526s git-debrebase classify 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a/0x2 1526s git-debrebase = Upstream {"Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a"}],"Type" => "Upstream","CommitId" => "3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1526s git-debrebase get_differs 61838f71874d7ddb712bb3c25e0a0c91734bab47 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 1526s git-debrebase classify 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 61838f71874d7ddb712bb3c25e0a0c91734bab47/0x2 1526s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n","CommitId" => "3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 61838f71874d7ddb712bb3c25e0a0c91734bab47\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Ix" => 0}],"Type" => "Upstream"} 1526s git-debrebase get_differs cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 1526s git-debrebase classify 61838f71874d7ddb712bb3c25e0a0c91734bab47 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p cfa06dbc0f977f48e1449a0f11ee4106d8bf1269/0x2 1526s git-debrebase = Upstream {"CommitId" => "61838f71874d7ddb712bb3c25e0a0c91734bab47","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent cfa06dbc0f977f48e1449a0f11ee4106d8bf1269\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Differs" => 2}],"Type" => "Upstream"} 1526s git-debrebase get_differs 31cc003deb18794414e5604fc32fdd9819189100 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 1526s git-debrebase classify cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p 31cc003deb18794414e5604fc32fdd9819189100/0x2 1526s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent 31cc003deb18794414e5604fc32fdd9819189100\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Differs" => 2}],"CommitId" => "cfa06dbc0f977f48e1449a0f11ee4106d8bf1269","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1526s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 1526s git-debrebase classify 31cc003deb18794414e5604fc32fdd9819189100 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x2 1526s git-debrebase = Upstream {"CommitId" => "31cc003deb18794414e5604fc32fdd9819189100","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Parents" => [{"Differs" => 2,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0}],"Type" => "Upstream"} 1526s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1526s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1526s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Ix" => 0}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1526s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1526s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1526s git-debrebase = Packaging {"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Msg" => "DEBIAN add zorkmid (before)\n","Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Parents" => [{"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0}]} 1526s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1526s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1526s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"} 1526s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1526s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1526s git-debrebase = Changelog {"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog"} 1526s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1526s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1526s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1526s git-debrebase = Anchor {"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0},{"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1526s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 3 upp 5 proc 11 pm 0 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1526s git-debrebase WALK REBUILD 48c55fcd6aad3671faeeedd232289eea48db8cce 12 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1526s git-debrebase WALK BUILD eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Debian (rewriting=0) 1526s git-debrebase WALK BUILD db129944b7f434b59509f6c007624fd8a89fe823 Debian (rewriting=0) 1526s git-debrebase WALK BUILD 6820a0900873c206f54cab6ac552afb016b49205 Debian (rewriting=0) 1526s git-debrebase WALK BUILD 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Debian (rewriting=0) 1526s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1526s git-debrebase WALK BUILD 31cc003deb18794414e5604fc32fdd9819189100 Upstream (rewriting=0) 1526s git-debrebase WALK BUILD cfa06dbc0f977f48e1449a0f11ee4106d8bf1269 Upstream (rewriting=0) 1526s git-debrebase WALK BUILD 61838f71874d7ddb712bb3c25e0a0c91734bab47 Upstream (rewriting=0) 1526s git-debrebase WALK BUILD 3ddfbd86c9d2fc70cf459eb7632fd394e181fc1a Upstream (rewriting=0) 1526s git-debrebase WALK BUILD 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 Upstream (rewriting=0) 1526s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1526s git-debrebase get_differs 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 ef5bcbe5d22ce25a93558291bd65fa8cba22a9d6 = 0 1526s git-debrebase *** WALK RETURN 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 48c55fcd6aad3671faeeedd232289eea48db8cce 1526s git-debrebase mwrecknote mergebase-laundered 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 1526s git-debrebase mwrecknote mergebase-breakwater 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1526s git-debrebase mwrecknote mergebase-anchor 48c55fcd6aad3671faeeedd232289eea48db8cce 1526s git-debrebase *** WALK prep done cur=43ca8e1f591491b1c5f8f4bc3b8018ee98970daf brw 3 upp 2 proc 4 pm -1 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1526s git-debrebase WALK REBUILD 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf 5 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1526s git-debrebase WALK BUILD 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf MergeCreateMergedBreakwaters (rewriting=0) 1526s Found a general merge, will try to tidy it up. 1526s git-debrebase WALK BUILD b3df710d5d583e5feffb7799c72f3b7d5303ab13 Debian (rewriting=1) 1526s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1526s git-debrebase WALK BUILD 4d0ed0e33f3480faf1e633cf8814660a041789f7 Debian (rewriting=1) 1526s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1526s git-debrebase WALK BUILD 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf MergeMergeSeries (rewriting=1) 1526s git-debrebase >(no reflog) 1526s Running merge resolution for 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf... 1526s git-debrebase mwrecknote new-base 59a5604430512eef9d28d780dc684f489e503e7b 1526s git-debrebase merge_series newbase=59a5604430512eef9d28d780dc684f489e503e7b 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1526s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1526s git-debrebase gbp_pq_export p-base 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 3b1947177d3d9c50f7a53fa4037d83eb43c6e6e5 1527s git-debrebase merge_series pec 214fbea72cc85011bfccecf30c66517de6cc0d2e pec' bfc4210c92f044619c5285b1c62604d584532ba1 1527s git-debrebase mwrecknote mergebase-patchqueue bfc4210c92f044619c5285b1c62604d584532ba1 1527s git-debrebase gbp_pq_export p-1 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 e06013e937c3284e3aa79eeb7df09028d7fbd61c 1527s git-debrebase merge_series pec 5d6791b81c434c3669e6bb05c53b4797edd6f168 pec' a7962172347295e123d4876cd297ee66c7971238 1527s git-debrebase mwrecknote right-patchqueue a7962172347295e123d4876cd297ee66c7971238 1527s git-debrebase gbp_pq_export p-0 f77f5a3cf715442ff9af63f94215e720d5c7249e 23622c7321349049ab04c3e2f87531a494b246a1 1527s git-debrebase merge_series pec a1d52904fb4bf34d80abea73a5f5e2a7099b6e64 pec' e33d3c113fe6fb694bf180c3be385a1d2bdac933 1527s git-debrebase mwrecknote left-patchqueue e33d3c113fe6fb694bf180c3be385a1d2bdac933 1527s git-debrebase merge_series merging... 1527s git-debrebase merge_series merge ok, series... 1527s git-debrebase merge_series patch 0001-Add-a-new-upstream-file.patch keep 1527s merge_series patch 0002-Edit-the-.c-file.patch keep 1527s merge_series prereq 0002-Edit-the-.c-file.patch -> 0001-Add-a-new-upstream-file.patch keep 1527s merge_series patch 0004-UPSTREAM-edit-src.c-before.patch keep 1527s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0001-Add-a-new-upstream-file.patch keep 1527s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0002-Edit-the-.c-file.patch keep 1527s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> subdir/addnewups keep 1527s merge_series patch 0005-MIXED-add-both-before.patch keep 1527s merge_series prereq 0005-MIXED-add-both-before.patch -> 0001-Add-a-new-upstream-file.patch keep 1527s merge_series prereq 0005-MIXED-add-both-before.patch -> 0002-Edit-the-.c-file.patch keep 1527s merge_series prereq 0005-MIXED-add-both-before.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1527s merge_series prereq 0005-MIXED-add-both-before.patch -> subdir/addnewups keep 1527s merge_series patch 0006-UPSTREAM-edit-src-other.c-other.patch keep 1527s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0001-Add-a-new-upstream-file.patch keep 1527s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0002-Edit-the-.c-file.patch keep 1527s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1527s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0005-MIXED-add-both-before.patch keep 1527s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> subdir/addnewups keep 1527s merge_series patch 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 1527s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0001-Add-a-new-upstream-file.patch keep 1527s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0002-Edit-the-.c-file.patch keep 1527s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1527s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0005-MIXED-add-both-before.patch keep 1527s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> subdir/addnewups keep 1527s merge_series patch 0007-MIXED-add-both-other-other.patch keep 1527s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0001-Add-a-new-upstream-file.patch keep 1527s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0002-Edit-the-.c-file.patch keep 1527s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1527s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0005-MIXED-add-both-before.patch keep 1527s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 1527s merge_series prereq 0007-MIXED-add-both-other-other.patch -> subdir/addnewups keep 1527s merge_series patch 0007-MIXED-add-both-us-us-1.patch keep 1527s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0001-Add-a-new-upstream-file.patch keep 1527s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0002-Edit-the-.c-file.patch keep 1527s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1527s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0005-MIXED-add-both-before.patch keep 1527s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 1527s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> subdir/addnewups keep 1527s merge_series patch 0008-UPSTREAM-edit-src-us.c-us-2.patch keep 1527s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0001-Add-a-new-upstream-file.patch keep 1527s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0002-Edit-the-.c-file.patch keep 1527s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1527s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0005-MIXED-add-both-before.patch keep 1527s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 1527s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0007-MIXED-add-both-us-us-1.patch keep 1527s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> subdir/addnewups keep 1527s merge_series patch 0009-MIXED-add-both-us-us-2.patch keep 1527s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0001-Add-a-new-upstream-file.patch keep 1527s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0002-Edit-the-.c-file.patch keep 1527s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 1527s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0005-MIXED-add-both-before.patch keep 1527s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 1527s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0007-MIXED-add-both-us-us-1.patch keep 1527s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0008-UPSTREAM-edit-src-us.c-us-2.patch keep 1527s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> subdir/addnewups keep 1527s merge_series patch subdir/addnewups keep 1527s merge_series prereq subdir/addnewups -> 0001-Add-a-new-upstream-file.patch keep 1527s merge_series prereq subdir/addnewups -> 0002-Edit-the-.c-file.patch keep 1527s merge_series series next 0001-Add-a-new-upstream-file.patch 1527s git-debrebase merge_series series next 0002-Edit-the-.c-file.patch 1527s git-debrebase merge_series series next subdir/addnewups 1527s git-debrebase merge_series series next 0004-UPSTREAM-edit-src.c-before.patch 1527s git-debrebase merge_series series next 0005-MIXED-add-both-before.patch 1527s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-other.c-other.patch 1527s git-debrebase merge_series series next 0007-MIXED-add-both-other-other.patch 1527s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-us.c-us-1.patch 1527s git-debrebase merge_series series next 0007-MIXED-add-both-us-us-1.patch 1527s git-debrebase merge_series series next 0008-UPSTREAM-edit-src-us.c-us-2.patch 1527s git-debrebase merge_series series next 0009-MIXED-add-both-us-us-2.patch 1527s git-debrebase mwrecknote merged-patchqueue 50cd72f836f01506b03c6210bcc4071534a1f14a 1527s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1527s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/merge 1527s git-debrebase merge_series series gbp pq import 1527s gbp:info: Trying to apply patches at '50cd72f836f01506b03c6210bcc4071534a1f14a' 1527s gbp:info: 11 patches listed in 'debian/patches/series' imported on 'patch-queue/mergec' 1527s git-debrebase merge_series series ok, building... 1527s git-debrebase merge_series series ok, building f26dbfc19147fafbfbca022983b4f4c988b3901b 1527s git-debrebase merge_series series ok, building 686e57fee42c72cd7aa9ce49eb89969ccc1f5978 1527s git-debrebase merge_series series ok, building d4392e6a0beb7eddc032b7c4d336c257ade330f7 1527s git-debrebase merge_series series ok, building 3e6317ccdbd6fcca9ad3624d1dc072edb33d38e3 1527s git-debrebase merge_series series ok, building 21e588714c9036dbc9387d18255d9335175f744b 1527s git-debrebase merge_series series ok, building 82d3a84d249e89c27ba7796ed4f4be0f7a9c3fe6 1527s git-debrebase merge_series series ok, building 3d0c9a9701f8503bad0cbea0c6bccfdecc7aac6a 1527s git-debrebase merge_series series ok, building 90b5072cc961a1291aff31cebcc4c3b82d511c5b 1527s git-debrebase merge_series series ok, building 0157e712641a6273c7a5f129b7ee24a3d89b3192 1527s git-debrebase merge_series series ok, building 72e916f22121915adfa5be9ddc6ea94755c41f08 1527s git-debrebase merge_series series ok, building 685bd80b4d99aae65a6c4e9ef4f838f38611eeae 1527s git-debrebase mwrecknote merged-result cbe362257debab46378f3bfd9cb6b4bc18f22184 1528s git-debrebase merge_series done debug=9e5de40a40913c08e7870d5f761b47468f5d2e6b 1528s git-debrebase mwrecknote merged-debug 9e5de40a40913c08e7870d5f761b47468f5d2e6b 1528s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1528s git-debrebase merge_series returns cbe362257debab46378f3bfd9cb6b4bc18f22184 1528s git-debrebase get_differs cbe362257debab46378f3bfd9cb6b4bc18f22184 4d0ed0e33f3480faf1e633cf8814660a041789f7 = 0x2 1528s git-debrebase get_differs cbe362257debab46378f3bfd9cb6b4bc18f22184 43ca8e1f591491b1c5f8f4bc3b8018ee98970daf = 0x20 1528s Merge resolution successful. 1528s git-debrebase WALK BUILD ebf09aee38effa3e52e848d0bbc0c6d655aad950 Upstream (rewriting=1) 1528s git-debrebase WALK BUILD 4d0ed0e33f3480faf1e633cf8814660a041789f7 Upstream (rewriting=1) 1528s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1528s git-debrebase get_differs c2748354923b4f8e082f565f79623c63aeff0bac 4d0ed0e33f3480faf1e633cf8814660a041789f7 = 0 1528s git-debrebase *** WALK RETURN c2748354923b4f8e082f565f79623c63aeff0bac 59a5604430512eef9d28d780dc684f489e503e7b d50318b393ee163dd38aa93c9427a1ce6a993b3a 1528s git-debrebase: laundered (head was 4d0ed0e33f3480faf1e633cf8814660a041789f7) 1528s git-debrebase >= update refs/ffq-prev/heads/master 4d0ed0e33f3480faf1e633cf8814660a041789f7 0000000000000000000000000000000000000000 1528s git-debrebase >= delete refs/debrebase-last/heads/master 1528s git-debrebase >= update HEAD c2748354923b4f8e082f565f79623c63aeff0bac 4d0ed0e33f3480faf1e633cf8814660a041789f7 1528s git-debrebase >$ 1528s Recorded previous head for preservation 1528s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1528s ' 1528s + t-gdr-good laundered 1528s + local state=laundered 1528s + local beforetag= 1528s + case $state in 1528s + git diff --quiet -- :. ':!debian/patches' 1528s + LC_MESSAGES=C 1528s + t-git-debrebase status 1528s + local gdr=git-debrebase 1528s + : ' 1528s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1528s + git-debrebase --dgit=dgit -D --experimental-merge-resolution status 1528s git-debrebase get_differs 025ab842c855ce872ed9de048c7fe6e08d16b765 08b4d440266f8a32c8baf2817a7ed53db9476b94 = 0x2 1528s git-debrebase classify c2748354923b4f8e082f565f79623c63aeff0bac $t=08b4d440266f8a32c8baf2817a7ed53db9476b94 @p 025ab842c855ce872ed9de048c7fe6e08d16b765/0x2 1528s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "025ab842c855ce872ed9de048c7fe6e08d16b765","Differs" => 2}],"Hdr" => "tree 08b4d440266f8a32c8baf2817a7ed53db9476b94\nparent 025ab842c855ce872ed9de048c7fe6e08d16b765\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "c2748354923b4f8e082f565f79623c63aeff0bac","Tree" => "08b4d440266f8a32c8baf2817a7ed53db9476b94"} 1528s git-debrebase get_differs cbe362257debab46378f3bfd9cb6b4bc18f22184 b3664fc8202269e2ddaf0a8afac7c3c69c89700e = 0x2 1528s git-debrebase classify 025ab842c855ce872ed9de048c7fe6e08d16b765 $t=b3664fc8202269e2ddaf0a8afac7c3c69c89700e @p cbe362257debab46378f3bfd9cb6b4bc18f22184/0x2 1528s git-debrebase = Upstream {"Tree" => "b3664fc8202269e2ddaf0a8afac7c3c69c89700e","CommitId" => "025ab842c855ce872ed9de048c7fe6e08d16b765","Msg" => "UPSTREAM edit src.c (after)\n","Hdr" => "tree b3664fc8202269e2ddaf0a8afac7c3c69c89700e\nparent cbe362257debab46378f3bfd9cb6b4bc18f22184\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"CommitId" => "cbe362257debab46378f3bfd9cb6b4bc18f22184","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1528s git-debrebase get_differs 0c9121a41f6d54e3d3c12a566c8b90487deddf46 dfc2b044477d951ef2d5a59908ca6641f0a738db = 0x2 1528s git-debrebase classify cbe362257debab46378f3bfd9cb6b4bc18f22184 $t=dfc2b044477d951ef2d5a59908ca6641f0a738db @p 0c9121a41f6d54e3d3c12a566c8b90487deddf46/0x2 1528s git-debrebase = Upstream {"Tree" => "dfc2b044477d951ef2d5a59908ca6641f0a738db","CommitId" => "cbe362257debab46378f3bfd9cb6b4bc18f22184","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 dfc2b044477d951ef2d5a59908ca6641f0a738db\nparent 0c9121a41f6d54e3d3c12a566c8b90487deddf46\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "0c9121a41f6d54e3d3c12a566c8b90487deddf46","Differs" => 2}]} 1528s git-debrebase get_differs 99a5d1aed55bb3506212426ecccaa52ead5f7d19 7ce18c5e10981609d50192088aa2c9ddab148e5f = 0x2 1528s git-debrebase classify 0c9121a41f6d54e3d3c12a566c8b90487deddf46 $t=7ce18c5e10981609d50192088aa2c9ddab148e5f @p 99a5d1aed55bb3506212426ecccaa52ead5f7d19/0x2 1528s git-debrebase = Upstream {"Tree" => "7ce18c5e10981609d50192088aa2c9ddab148e5f","CommitId" => "0c9121a41f6d54e3d3c12a566c8b90487deddf46","Type" => "Upstream","Msg" => "UPSTREAM edit src-us.c (us-2)\n\n\nGbp-Pq: Name 0008-UPSTREAM-edit-src-us.c-us-2.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "99a5d1aed55bb3506212426ecccaa52ead5f7d19"}],"Hdr" => "tree 7ce18c5e10981609d50192088aa2c9ddab148e5f\nparent 99a5d1aed55bb3506212426ecccaa52ead5f7d19\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 1528s git-debrebase get_differs e700e434ec3ea1861e41f5ca87620d4727c50bea 320f33774da63c1af34184340b30482ab2d0646f = 0x2 1528s git-debrebase classify 99a5d1aed55bb3506212426ecccaa52ead5f7d19 $t=320f33774da63c1af34184340b30482ab2d0646f @p e700e434ec3ea1861e41f5ca87620d4727c50bea/0x2 1528s git-debrebase = Upstream {"Tree" => "320f33774da63c1af34184340b30482ab2d0646f","CommitId" => "99a5d1aed55bb3506212426ecccaa52ead5f7d19","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 e700e434ec3ea1861e41f5ca87620d4727c50bea\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "e700e434ec3ea1861e41f5ca87620d4727c50bea","Differs" => 2}],"Type" => "Upstream"} 1528s git-debrebase get_differs 566c1a663cb7d97b1dae8312b239589ccbdbb951 4bcf95b33e0884588c97627a8a1d6565144b68db = 0x2 1528s git-debrebase classify e700e434ec3ea1861e41f5ca87620d4727c50bea $t=4bcf95b33e0884588c97627a8a1d6565144b68db @p 566c1a663cb7d97b1dae8312b239589ccbdbb951/0x2 1528s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "566c1a663cb7d97b1dae8312b239589ccbdbb951","Ix" => 0}],"Hdr" => "tree 4bcf95b33e0884588c97627a8a1d6565144b68db\nparent 566c1a663cb7d97b1dae8312b239589ccbdbb951\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" => "e700e434ec3ea1861e41f5ca87620d4727c50bea","Tree" => "4bcf95b33e0884588c97627a8a1d6565144b68db"} 1528s git-debrebase get_differs 7781a9139159682efb66cf35dcfa91d2fa496dae 4c4a6301aed0ae82707d492584b12ed493ad7340 = 0x2 1528s git-debrebase classify 566c1a663cb7d97b1dae8312b239589ccbdbb951 $t=4c4a6301aed0ae82707d492584b12ed493ad7340 @p 7781a9139159682efb66cf35dcfa91d2fa496dae/0x2 1528s git-debrebase = Upstream {"Hdr" => "tree 4c4a6301aed0ae82707d492584b12ed493ad7340\nparent 7781a9139159682efb66cf35dcfa91d2fa496dae\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "7781a9139159682efb66cf35dcfa91d2fa496dae","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","Type" => "Upstream","CommitId" => "566c1a663cb7d97b1dae8312b239589ccbdbb951","Tree" => "4c4a6301aed0ae82707d492584b12ed493ad7340"} 1528s git-debrebase get_differs fd01a87e8444da6267f6f14bda608f4a4e979b0b 48963840b2862a360dd004044de5a24b3c83d8c8 = 0x2 1528s git-debrebase classify 7781a9139159682efb66cf35dcfa91d2fa496dae $t=48963840b2862a360dd004044de5a24b3c83d8c8 @p fd01a87e8444da6267f6f14bda608f4a4e979b0b/0x2 1528s git-debrebase = Upstream {"Parents" => [{"CommitId" => "fd01a87e8444da6267f6f14bda608f4a4e979b0b","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 48963840b2862a360dd004044de5a24b3c83d8c8\nparent fd01a87e8444da6267f6f14bda608f4a4e979b0b\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","Type" => "Upstream","CommitId" => "7781a9139159682efb66cf35dcfa91d2fa496dae","Tree" => "48963840b2862a360dd004044de5a24b3c83d8c8"} 1528s git-debrebase get_differs 537e5e0be2be2b2d99adde43894b76860af03893 d528e23895b1ecfa8c8af7e67d226e9c73ff23df = 0x2 1528s git-debrebase classify fd01a87e8444da6267f6f14bda608f4a4e979b0b $t=d528e23895b1ecfa8c8af7e67d226e9c73ff23df @p 537e5e0be2be2b2d99adde43894b76860af03893/0x2 1528s git-debrebase = Upstream {"CommitId" => "fd01a87e8444da6267f6f14bda608f4a4e979b0b","Tree" => "d528e23895b1ecfa8c8af7e67d226e9c73ff23df","Hdr" => "tree d528e23895b1ecfa8c8af7e67d226e9c73ff23df\nparent 537e5e0be2be2b2d99adde43894b76860af03893\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "537e5e0be2be2b2d99adde43894b76860af03893","Ix" => 0}],"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"} 1528s git-debrebase get_differs 5b4e32e278c5445841a836077e59e2c2850d99be 170122084d775751a61793936186c10b4ca772fa = 0x2 1528s git-debrebase classify 537e5e0be2be2b2d99adde43894b76860af03893 $t=170122084d775751a61793936186c10b4ca772fa @p 5b4e32e278c5445841a836077e59e2c2850d99be/0x2 1528s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 170122084d775751a61793936186c10b4ca772fa\nparent 5b4e32e278c5445841a836077e59e2c2850d99be\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5b4e32e278c5445841a836077e59e2c2850d99be"}],"Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","CommitId" => "537e5e0be2be2b2d99adde43894b76860af03893","Tree" => "170122084d775751a61793936186c10b4ca772fa"} 1528s git-debrebase get_differs d4a9aef1d696e625ef6057292305df7215c1d86f 953d36410163f668869d1114fad41586b0005040 = 0x2 1528s git-debrebase classify 5b4e32e278c5445841a836077e59e2c2850d99be $t=953d36410163f668869d1114fad41586b0005040 @p d4a9aef1d696e625ef6057292305df7215c1d86f/0x2 1528s git-debrebase = Upstream {"CommitId" => "5b4e32e278c5445841a836077e59e2c2850d99be","Tree" => "953d36410163f668869d1114fad41586b0005040","Hdr" => "tree 953d36410163f668869d1114fad41586b0005040\nparent d4a9aef1d696e625ef6057292305df7215c1d86f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "d4a9aef1d696e625ef6057292305df7215c1d86f","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 1528s git-debrebase get_differs dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac 337538f5b7a945372f29120288088e8dfebbfc9a = 0x2 1528s git-debrebase classify d4a9aef1d696e625ef6057292305df7215c1d86f $t=337538f5b7a945372f29120288088e8dfebbfc9a @p dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac/0x2 1528s git-debrebase = Upstream {"Tree" => "337538f5b7a945372f29120288088e8dfebbfc9a","CommitId" => "d4a9aef1d696e625ef6057292305df7215c1d86f","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 337538f5b7a945372f29120288088e8dfebbfc9a\nparent dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac","Ix" => 0}],"Type" => "Upstream"} 1528s git-debrebase get_differs 59a5604430512eef9d28d780dc684f489e503e7b efe85a2cec64a871da32e67c06c01674bd56f143 = 0x2 1528s git-debrebase classify dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac $t=efe85a2cec64a871da32e67c06c01674bd56f143 @p 59a5604430512eef9d28d780dc684f489e503e7b/0x2 1528s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "59a5604430512eef9d28d780dc684f489e503e7b","Differs" => 2}],"Hdr" => "tree efe85a2cec64a871da32e67c06c01674bd56f143\nparent 59a5604430512eef9d28d780dc684f489e503e7b\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","CommitId" => "dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac","Tree" => "efe85a2cec64a871da32e67c06c01674bd56f143"} 1528s git-debrebase get_differs e225dffeb5537ec924863ae0bacf36858f2e3062 1bd039d4fd485427ff22f59123a3a27f729e9cd7 = 0x20 1528s git-debrebase classify 59a5604430512eef9d28d780dc684f489e503e7b $t=1bd039d4fd485427ff22f59123a3a27f729e9cd7 @p e225dffeb5537ec924863ae0bacf36858f2e3062/0x20 1528s git-debrebase = Packaging {"Tree" => "1bd039d4fd485427ff22f59123a3a27f729e9cd7","CommitId" => "59a5604430512eef9d28d780dc684f489e503e7b","Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 1bd039d4fd485427ff22f59123a3a27f729e9cd7\nparent e225dffeb5537ec924863ae0bacf36858f2e3062\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "e225dffeb5537ec924863ae0bacf36858f2e3062","Ix" => 0}],"Type" => "Packaging"} 1528s git-debrebase get_differs 436a0a77136d4a0967c7942041b8e4fe0d56f28f 571dff7c8d67a53ee1fa0f48175c01ed43949f6d = 0x20 1528s git-debrebase classify e225dffeb5537ec924863ae0bacf36858f2e3062 $t=571dff7c8d67a53ee1fa0f48175c01ed43949f6d @p 436a0a77136d4a0967c7942041b8e4fe0d56f28f/0x20 1528s git-debrebase = Packaging {"Tree" => "571dff7c8d67a53ee1fa0f48175c01ed43949f6d","CommitId" => "e225dffeb5537ec924863ae0bacf36858f2e3062","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (after)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "436a0a77136d4a0967c7942041b8e4fe0d56f28f"}],"Hdr" => "tree 571dff7c8d67a53ee1fa0f48175c01ed43949f6d\nparent 436a0a77136d4a0967c7942041b8e4fe0d56f28f\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 1528s git-debrebase get_differs f77f5a3cf715442ff9af63f94215e720d5c7249e c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 1528s git-debrebase get_differs 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 1528s git-debrebase classify 436a0a77136d4a0967c7942041b8e4fe0d56f28f $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p f77f5a3cf715442ff9af63f94215e720d5c7249e/0x20 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722/0x32 1528s git-debrebase = MergedBreakwaters {"Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6","CommitId" => "436a0a77136d4a0967c7942041b8e4fe0d56f28f","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","Parents" => [{"IsDgitImport" => undef,"Differs" => 32,"IsOrigin" => "","CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Ix" => 0},{"IsDgitImport" => undef,"Differs" => 50,"IsOrigin" => "","CommitId" => "1353d63d0ec4e50a8f1e1e1ce6f89c6203243722","Ix" => 1}],"Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent f77f5a3cf715442ff9af63f94215e720d5c7249e\nparent 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "MergedBreakwaters"} 1528s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1528s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1528s git-debrebase = Packaging {"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Type" => "Packaging","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Differs" => 32}],"Msg" => "us-conflict\n"} 1528s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1528s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1528s git-debrebase = Packaging {"Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265"}],"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103"} 1528s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1528s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1528s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Differs" => 32}],"Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265"} 1528s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1528s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1528s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298"} 1528s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1528s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1528s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1528s git-debrebase = Anchor {"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","OrigParents" => [{"Ix" => 1,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Differs" => 48}],"Type" => "Anchor","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70","Differs" => 2},$VAR1->{"OrigParents"}[0]],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n"} 1528s git-debrebase get_differs 668ecc18429ad51615759c319e10c97908e4cd1b 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 1528s git-debrebase classify 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 668ecc18429ad51615759c319e10c97908e4cd1b/0x20 1528s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "other-conflict\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "668ecc18429ad51615759c319e10c97908e4cd1b"}],"Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 668ecc18429ad51615759c319e10c97908e4cd1b\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","CommitId" => "1353d63d0ec4e50a8f1e1e1ce6f89c6203243722"} 1528s git-debrebase get_differs add117c3d765d5114f03f16b8a579cd6134a21da 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1528s git-debrebase classify 668ecc18429ad51615759c319e10c97908e4cd1b $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p add117c3d765d5114f03f16b8a579cd6134a21da/0x20 1528s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "add117c3d765d5114f03f16b8a579cd6134a21da"}],"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent add117c3d765d5114f03f16b8a579cd6134a21da\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","CommitId" => "668ecc18429ad51615759c319e10c97908e4cd1b"} 1528s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1528s git-debrebase classify add117c3d765d5114f03f16b8a579cd6134a21da $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1528s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-other (other)\n","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","CommitId" => "add117c3d765d5114f03f16b8a579cd6134a21da"} 1528s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1528s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1528s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Type" => "Packaging","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Ix" => 0}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1528s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1528s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1528s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"} 1528s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1528s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1528s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"} 1528s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1528s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1528s git-debrebase = Changelog {"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 1528s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1528s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1528s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1528s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","OrigParents" => [{"Ix" => 1,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48}],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0},$VAR1->{"OrigParents"}[0]]} 1528s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1528s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1528s ' 1528s + case $state in 1528s + egrep '^ *branch is laundered' ../status.check 1528s branch is laundered 1528s + t-gdr-good-analyse HEAD laundered 1528s + local head=HEAD 1528s + local state=laundered 1528s + local wsfx= 1528s + local etypes bwtip 1528s + case $state in 1528s + etypes=Upstream 1528s ++ t-git-debrebase breakwater 1528s ++ local gdr=git-debrebase 1528s ++ : ' 1528s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1528s ++ git-debrebase --dgit=dgit -D --experimental-merge-resolution breakwater 1528s git-debrebase get_differs 025ab842c855ce872ed9de048c7fe6e08d16b765 08b4d440266f8a32c8baf2817a7ed53db9476b94 = 0x2 1528s git-debrebase classify c2748354923b4f8e082f565f79623c63aeff0bac $t=08b4d440266f8a32c8baf2817a7ed53db9476b94 @p 025ab842c855ce872ed9de048c7fe6e08d16b765/0x2 1528s git-debrebase = Upstream {"Parents" => [{"CommitId" => "025ab842c855ce872ed9de048c7fe6e08d16b765","Differs" => 2,"Ix" => 0}],"Tree" => "08b4d440266f8a32c8baf2817a7ed53db9476b94","Type" => "Upstream","Hdr" => "tree 08b4d440266f8a32c8baf2817a7ed53db9476b94\nparent 025ab842c855ce872ed9de048c7fe6e08d16b765\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "c2748354923b4f8e082f565f79623c63aeff0bac"} 1528s git-debrebase get_differs cbe362257debab46378f3bfd9cb6b4bc18f22184 b3664fc8202269e2ddaf0a8afac7c3c69c89700e = 0x2 1528s git-debrebase classify 025ab842c855ce872ed9de048c7fe6e08d16b765 $t=b3664fc8202269e2ddaf0a8afac7c3c69c89700e @p cbe362257debab46378f3bfd9cb6b4bc18f22184/0x2 1528s git-debrebase = Upstream {"Hdr" => "tree b3664fc8202269e2ddaf0a8afac7c3c69c89700e\nparent cbe362257debab46378f3bfd9cb6b4bc18f22184\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src.c (after)\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cbe362257debab46378f3bfd9cb6b4bc18f22184"}],"Tree" => "b3664fc8202269e2ddaf0a8afac7c3c69c89700e","Type" => "Upstream","CommitId" => "025ab842c855ce872ed9de048c7fe6e08d16b765"} 1528s git-debrebase get_differs 0c9121a41f6d54e3d3c12a566c8b90487deddf46 dfc2b044477d951ef2d5a59908ca6641f0a738db = 0x2 1528s git-debrebase classify cbe362257debab46378f3bfd9cb6b4bc18f22184 $t=dfc2b044477d951ef2d5a59908ca6641f0a738db @p 0c9121a41f6d54e3d3c12a566c8b90487deddf46/0x2 1528s git-debrebase = Upstream {"CommitId" => "cbe362257debab46378f3bfd9cb6b4bc18f22184","Hdr" => "tree dfc2b044477d951ef2d5a59908ca6641f0a738db\nparent 0c9121a41f6d54e3d3c12a566c8b90487deddf46\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","Tree" => "dfc2b044477d951ef2d5a59908ca6641f0a738db","Parents" => [{"CommitId" => "0c9121a41f6d54e3d3c12a566c8b90487deddf46","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1528s git-debrebase get_differs 99a5d1aed55bb3506212426ecccaa52ead5f7d19 7ce18c5e10981609d50192088aa2c9ddab148e5f = 0x2 1528s git-debrebase classify 0c9121a41f6d54e3d3c12a566c8b90487deddf46 $t=7ce18c5e10981609d50192088aa2c9ddab148e5f @p 99a5d1aed55bb3506212426ecccaa52ead5f7d19/0x2 1528s git-debrebase = Upstream {"Hdr" => "tree 7ce18c5e10981609d50192088aa2c9ddab148e5f\nparent 99a5d1aed55bb3506212426ecccaa52ead5f7d19\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","Parents" => [{"CommitId" => "99a5d1aed55bb3506212426ecccaa52ead5f7d19","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "0c9121a41f6d54e3d3c12a566c8b90487deddf46"} 1528s git-debrebase get_differs e700e434ec3ea1861e41f5ca87620d4727c50bea 320f33774da63c1af34184340b30482ab2d0646f = 0x2 1528s git-debrebase classify 99a5d1aed55bb3506212426ecccaa52ead5f7d19 $t=320f33774da63c1af34184340b30482ab2d0646f @p e700e434ec3ea1861e41f5ca87620d4727c50bea/0x2 1528s git-debrebase = 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","Hdr" => "tree 320f33774da63c1af34184340b30482ab2d0646f\nparent e700e434ec3ea1861e41f5ca87620d4727c50bea\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e700e434ec3ea1861e41f5ca87620d4727c50bea"}],"Tree" => "320f33774da63c1af34184340b30482ab2d0646f","CommitId" => "99a5d1aed55bb3506212426ecccaa52ead5f7d19"} 1528s git-debrebase get_differs 566c1a663cb7d97b1dae8312b239589ccbdbb951 4bcf95b33e0884588c97627a8a1d6565144b68db = 0x2 1528s git-debrebase classify e700e434ec3ea1861e41f5ca87620d4727c50bea $t=4bcf95b33e0884588c97627a8a1d6565144b68db @p 566c1a663cb7d97b1dae8312b239589ccbdbb951/0x2 1528s 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 4bcf95b33e0884588c97627a8a1d6565144b68db\nparent 566c1a663cb7d97b1dae8312b239589ccbdbb951\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Upstream","Tree" => "4bcf95b33e0884588c97627a8a1d6565144b68db","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "566c1a663cb7d97b1dae8312b239589ccbdbb951"}],"CommitId" => "e700e434ec3ea1861e41f5ca87620d4727c50bea"} 1528s git-debrebase get_differs 7781a9139159682efb66cf35dcfa91d2fa496dae 4c4a6301aed0ae82707d492584b12ed493ad7340 = 0x2 1528s git-debrebase classify 566c1a663cb7d97b1dae8312b239589ccbdbb951 $t=4c4a6301aed0ae82707d492584b12ed493ad7340 @p 7781a9139159682efb66cf35dcfa91d2fa496dae/0x2 1528s git-debrebase = Upstream {"Hdr" => "tree 4c4a6301aed0ae82707d492584b12ed493ad7340\nparent 7781a9139159682efb66cf35dcfa91d2fa496dae\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","Tree" => "4c4a6301aed0ae82707d492584b12ed493ad7340","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "7781a9139159682efb66cf35dcfa91d2fa496dae"}],"Type" => "Upstream","CommitId" => "566c1a663cb7d97b1dae8312b239589ccbdbb951"} 1528s git-debrebase get_differs fd01a87e8444da6267f6f14bda608f4a4e979b0b 48963840b2862a360dd004044de5a24b3c83d8c8 = 0x2 1528s git-debrebase classify 7781a9139159682efb66cf35dcfa91d2fa496dae $t=48963840b2862a360dd004044de5a24b3c83d8c8 @p fd01a87e8444da6267f6f14bda608f4a4e979b0b/0x2 1528s git-debrebase = Upstream {"Hdr" => "tree 48963840b2862a360dd004044de5a24b3c83d8c8\nparent fd01a87e8444da6267f6f14bda608f4a4e979b0b\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","Parents" => [{"CommitId" => "fd01a87e8444da6267f6f14bda608f4a4e979b0b","Ix" => 0,"Differs" => 2}],"Tree" => "48963840b2862a360dd004044de5a24b3c83d8c8","Type" => "Upstream","CommitId" => "7781a9139159682efb66cf35dcfa91d2fa496dae"} 1528s git-debrebase get_differs 537e5e0be2be2b2d99adde43894b76860af03893 d528e23895b1ecfa8c8af7e67d226e9c73ff23df = 0x2 1528s git-debrebase classify fd01a87e8444da6267f6f14bda608f4a4e979b0b $t=d528e23895b1ecfa8c8af7e67d226e9c73ff23df @p 537e5e0be2be2b2d99adde43894b76860af03893/0x2 1528s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "537e5e0be2be2b2d99adde43894b76860af03893"}],"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 537e5e0be2be2b2d99adde43894b76860af03893\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "fd01a87e8444da6267f6f14bda608f4a4e979b0b"} 1528s git-debrebase get_differs 5b4e32e278c5445841a836077e59e2c2850d99be 170122084d775751a61793936186c10b4ca772fa = 0x2 1528s git-debrebase classify 537e5e0be2be2b2d99adde43894b76860af03893 $t=170122084d775751a61793936186c10b4ca772fa @p 5b4e32e278c5445841a836077e59e2c2850d99be/0x2 1528s git-debrebase = Upstream {"Hdr" => "tree 170122084d775751a61793936186c10b4ca772fa\nparent 5b4e32e278c5445841a836077e59e2c2850d99be\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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5b4e32e278c5445841a836077e59e2c2850d99be"}],"Tree" => "170122084d775751a61793936186c10b4ca772fa","Type" => "Upstream","CommitId" => "537e5e0be2be2b2d99adde43894b76860af03893"} 1528s git-debrebase get_differs d4a9aef1d696e625ef6057292305df7215c1d86f 953d36410163f668869d1114fad41586b0005040 = 0x2 1528s git-debrebase classify 5b4e32e278c5445841a836077e59e2c2850d99be $t=953d36410163f668869d1114fad41586b0005040 @p d4a9aef1d696e625ef6057292305df7215c1d86f/0x2 1528s git-debrebase = Upstream {"CommitId" => "5b4e32e278c5445841a836077e59e2c2850d99be","Type" => "Upstream","Parents" => [{"CommitId" => "d4a9aef1d696e625ef6057292305df7215c1d86f","Differs" => 2,"Ix" => 0}],"Tree" => "953d36410163f668869d1114fad41586b0005040","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 953d36410163f668869d1114fad41586b0005040\nparent d4a9aef1d696e625ef6057292305df7215c1d86f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 1528s git-debrebase get_differs dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac 337538f5b7a945372f29120288088e8dfebbfc9a = 0x2 1528s git-debrebase classify d4a9aef1d696e625ef6057292305df7215c1d86f $t=337538f5b7a945372f29120288088e8dfebbfc9a @p dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac/0x2 1528s git-debrebase = Upstream {"CommitId" => "d4a9aef1d696e625ef6057292305df7215c1d86f","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 337538f5b7a945372f29120288088e8dfebbfc9a\nparent dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac","Differs" => 2,"Ix" => 0}],"Tree" => "337538f5b7a945372f29120288088e8dfebbfc9a"} 1528s git-debrebase get_differs 59a5604430512eef9d28d780dc684f489e503e7b efe85a2cec64a871da32e67c06c01674bd56f143 = 0x2 1528s git-debrebase classify dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac $t=efe85a2cec64a871da32e67c06c01674bd56f143 @p 59a5604430512eef9d28d780dc684f489e503e7b/0x2 1528s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "59a5604430512eef9d28d780dc684f489e503e7b","Differs" => 2,"Ix" => 0}],"Tree" => "efe85a2cec64a871da32e67c06c01674bd56f143","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree efe85a2cec64a871da32e67c06c01674bd56f143\nparent 59a5604430512eef9d28d780dc684f489e503e7b\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac"} 1528s git-debrebase get_differs e225dffeb5537ec924863ae0bacf36858f2e3062 1bd039d4fd485427ff22f59123a3a27f729e9cd7 = 0x20 1528s git-debrebase classify 59a5604430512eef9d28d780dc684f489e503e7b $t=1bd039d4fd485427ff22f59123a3a27f729e9cd7 @p e225dffeb5537ec924863ae0bacf36858f2e3062/0x20 1528s git-debrebase = Packaging {"Hdr" => "tree 1bd039d4fd485427ff22f59123a3a27f729e9cd7\nparent e225dffeb5537ec924863ae0bacf36858f2e3062\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "1bd039d4fd485427ff22f59123a3a27f729e9cd7","Parents" => [{"CommitId" => "e225dffeb5537ec924863ae0bacf36858f2e3062","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "59a5604430512eef9d28d780dc684f489e503e7b"} 1528s git-debrebase get_differs 436a0a77136d4a0967c7942041b8e4fe0d56f28f 571dff7c8d67a53ee1fa0f48175c01ed43949f6d = 0x20 1528s git-debrebase classify e225dffeb5537ec924863ae0bacf36858f2e3062 $t=571dff7c8d67a53ee1fa0f48175c01ed43949f6d @p 436a0a77136d4a0967c7942041b8e4fe0d56f28f/0x20 1528s git-debrebase = Packaging {"Parents" => [{"CommitId" => "436a0a77136d4a0967c7942041b8e4fe0d56f28f","Differs" => 32,"Ix" => 0}],"Tree" => "571dff7c8d67a53ee1fa0f48175c01ed43949f6d","Type" => "Packaging","Hdr" => "tree 571dff7c8d67a53ee1fa0f48175c01ed43949f6d\nparent 436a0a77136d4a0967c7942041b8e4fe0d56f28f\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "DEBIAN add zorkmid (after)\n","CommitId" => "e225dffeb5537ec924863ae0bacf36858f2e3062"} 1528s git-debrebase get_differs f77f5a3cf715442ff9af63f94215e720d5c7249e c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 1528s git-debrebase get_differs 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 1528s git-debrebase classify 436a0a77136d4a0967c7942041b8e4fe0d56f28f $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p f77f5a3cf715442ff9af63f94215e720d5c7249e/0x20 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722/0x32 1528s git-debrebase = MergedBreakwaters {"CommitId" => "436a0a77136d4a0967c7942041b8e4fe0d56f28f","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","IsOrigin" => "","IsDgitImport" => undef},{"IsOrigin" => "","IsDgitImport" => undef,"CommitId" => "1353d63d0ec4e50a8f1e1e1ce6f89c6203243722","Ix" => 1,"Differs" => 50}],"Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6","Type" => "MergedBreakwaters","Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent f77f5a3cf715442ff9af63f94215e720d5c7249e\nparent 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722\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"} 1528s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1528s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1528s git-debrebase = Packaging {"Msg" => "us-conflict\n","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Parents" => [{"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Ix" => 0,"Differs" => 32}],"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e"} 1528s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1528s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1528s git-debrebase = Packaging {"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Parents" => [{"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Ix" => 0,"Differs" => 32}],"Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Type" => "Packaging","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\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"} 1528s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1528s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1528s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Parents" => [{"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Differs" => 32,"Ix" => 0}],"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265"} 1528s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1528s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1528s git-debrebase = Changelog {"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a"}],"Type" => "Changelog","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\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"} 1528s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1528s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1528s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1528s git-debrebase = Anchor {"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da"}],"Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\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","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Parents" => [{"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 1528s git-debrebase get_differs 668ecc18429ad51615759c319e10c97908e4cd1b 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 1528s git-debrebase classify 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 668ecc18429ad51615759c319e10c97908e4cd1b/0x20 1528s git-debrebase = Packaging {"CommitId" => "1353d63d0ec4e50a8f1e1e1ce6f89c6203243722","Parents" => [{"CommitId" => "668ecc18429ad51615759c319e10c97908e4cd1b","Differs" => 32,"Ix" => 0}],"Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Type" => "Packaging","Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 668ecc18429ad51615759c319e10c97908e4cd1b\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "other-conflict\n"} 1528s git-debrebase get_differs add117c3d765d5114f03f16b8a579cd6134a21da 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1528s git-debrebase classify 668ecc18429ad51615759c319e10c97908e4cd1b $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p add117c3d765d5114f03f16b8a579cd6134a21da/0x20 1528s git-debrebase = Packaging {"CommitId" => "668ecc18429ad51615759c319e10c97908e4cd1b","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "add117c3d765d5114f03f16b8a579cd6134a21da"}],"Type" => "Packaging","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent add117c3d765d5114f03f16b8a579cd6134a21da\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"} 1528s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1528s git-debrebase classify add117c3d765d5114f03f16b8a579cd6134a21da $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1528s git-debrebase = Packaging {"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","Parents" => [{"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 32,"Ix" => 0}],"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Type" => "Packaging","CommitId" => "add117c3d765d5114f03f16b8a579cd6134a21da"} 1528s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1528s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1528s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\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","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205"}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"} 1528s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1528s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1528s git-debrebase = Packaging {"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Parents" => [{"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Ix" => 0,"Differs" => 32}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 1528s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1528s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1528s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","Parents" => [{"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Ix" => 0,"Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"} 1528s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1528s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1528s git-debrebase = Changelog {"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\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"} 1528s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1528s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1528s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1528s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16"},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\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"} 1528s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1528s ' 1528s + bwtip=Y:59a5604430512eef9d28d780dc684f489e503e7b 1528s + anal=../anal 1528s + t-git-debrebase analyse HEAD 1528s + local gdr=git-debrebase 1528s + : ' 1528s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1528s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse HEAD 1528s git-debrebase *** WALK c2748354923b4f8e082f565f79623c63aeff0bac 1 *main::STDOUT 1528s git-debrebase get_differs 025ab842c855ce872ed9de048c7fe6e08d16b765 08b4d440266f8a32c8baf2817a7ed53db9476b94 = 0x2 1528s git-debrebase classify c2748354923b4f8e082f565f79623c63aeff0bac $t=08b4d440266f8a32c8baf2817a7ed53db9476b94 @p 025ab842c855ce872ed9de048c7fe6e08d16b765/0x2 1528s git-debrebase = Upstream {"Hdr" => "tree 08b4d440266f8a32c8baf2817a7ed53db9476b94\nparent 025ab842c855ce872ed9de048c7fe6e08d16b765\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "08b4d440266f8a32c8baf2817a7ed53db9476b94","Parents" => [{"Differs" => 2,"CommitId" => "025ab842c855ce872ed9de048c7fe6e08d16b765","Ix" => 0}],"Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "c2748354923b4f8e082f565f79623c63aeff0bac"} 1528s git-debrebase get_differs cbe362257debab46378f3bfd9cb6b4bc18f22184 b3664fc8202269e2ddaf0a8afac7c3c69c89700e = 0x2 1528s git-debrebase classify 025ab842c855ce872ed9de048c7fe6e08d16b765 $t=b3664fc8202269e2ddaf0a8afac7c3c69c89700e @p cbe362257debab46378f3bfd9cb6b4bc18f22184/0x2 1528s git-debrebase = Upstream {"Hdr" => "tree b3664fc8202269e2ddaf0a8afac7c3c69c89700e\nparent cbe362257debab46378f3bfd9cb6b4bc18f22184\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "cbe362257debab46378f3bfd9cb6b4bc18f22184","Differs" => 2}],"Tree" => "b3664fc8202269e2ddaf0a8afac7c3c69c89700e","Msg" => "UPSTREAM edit src.c (after)\n","Type" => "Upstream","CommitId" => "025ab842c855ce872ed9de048c7fe6e08d16b765"} 1528s git-debrebase get_differs 0c9121a41f6d54e3d3c12a566c8b90487deddf46 dfc2b044477d951ef2d5a59908ca6641f0a738db = 0x2 1528s git-debrebase classify cbe362257debab46378f3bfd9cb6b4bc18f22184 $t=dfc2b044477d951ef2d5a59908ca6641f0a738db @p 0c9121a41f6d54e3d3c12a566c8b90487deddf46/0x2 1528s git-debrebase = Upstream {"Hdr" => "tree dfc2b044477d951ef2d5a59908ca6641f0a738db\nparent 0c9121a41f6d54e3d3c12a566c8b90487deddf46\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "dfc2b044477d951ef2d5a59908ca6641f0a738db","Parents" => [{"Differs" => 2,"CommitId" => "0c9121a41f6d54e3d3c12a566c8b90487deddf46","Ix" => 0}],"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","CommitId" => "cbe362257debab46378f3bfd9cb6b4bc18f22184"} 1528s git-debrebase get_differs 99a5d1aed55bb3506212426ecccaa52ead5f7d19 7ce18c5e10981609d50192088aa2c9ddab148e5f = 0x2 1528s git-debrebase classify 0c9121a41f6d54e3d3c12a566c8b90487deddf46 $t=7ce18c5e10981609d50192088aa2c9ddab148e5f @p 99a5d1aed55bb3506212426ecccaa52ead5f7d19/0x2 1528s git-debrebase = Upstream {"Hdr" => "tree 7ce18c5e10981609d50192088aa2c9ddab148e5f\nparent 99a5d1aed55bb3506212426ecccaa52ead5f7d19\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "7ce18c5e10981609d50192088aa2c9ddab148e5f","Parents" => [{"Differs" => 2,"CommitId" => "99a5d1aed55bb3506212426ecccaa52ead5f7d19","Ix" => 0}],"Msg" => "UPSTREAM edit src-us.c (us-2)\n\n\nGbp-Pq: Name 0008-UPSTREAM-edit-src-us.c-us-2.patch","Type" => "Upstream","CommitId" => "0c9121a41f6d54e3d3c12a566c8b90487deddf46"} 1528s git-debrebase get_differs e700e434ec3ea1861e41f5ca87620d4727c50bea 320f33774da63c1af34184340b30482ab2d0646f = 0x2 1528s git-debrebase classify 99a5d1aed55bb3506212426ecccaa52ead5f7d19 $t=320f33774da63c1af34184340b30482ab2d0646f @p e700e434ec3ea1861e41f5ca87620d4727c50bea/0x2 1528s git-debrebase = 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","Hdr" => "tree 320f33774da63c1af34184340b30482ab2d0646f\nparent e700e434ec3ea1861e41f5ca87620d4727c50bea\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "320f33774da63c1af34184340b30482ab2d0646f","Parents" => [{"Differs" => 2,"CommitId" => "e700e434ec3ea1861e41f5ca87620d4727c50bea","Ix" => 0}],"Type" => "Upstream","CommitId" => "99a5d1aed55bb3506212426ecccaa52ead5f7d19"} 1528s git-debrebase get_differs 566c1a663cb7d97b1dae8312b239589ccbdbb951 4bcf95b33e0884588c97627a8a1d6565144b68db = 0x2 1528s git-debrebase classify e700e434ec3ea1861e41f5ca87620d4727c50bea $t=4bcf95b33e0884588c97627a8a1d6565144b68db @p 566c1a663cb7d97b1dae8312b239589ccbdbb951/0x2 1528s git-debrebase = Upstream {"Tree" => "4bcf95b33e0884588c97627a8a1d6565144b68db","Parents" => [{"Differs" => 2,"CommitId" => "566c1a663cb7d97b1dae8312b239589ccbdbb951","Ix" => 0}],"Hdr" => "tree 4bcf95b33e0884588c97627a8a1d6565144b68db\nparent 566c1a663cb7d97b1dae8312b239589ccbdbb951\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","Type" => "Upstream","CommitId" => "e700e434ec3ea1861e41f5ca87620d4727c50bea"} 1528s git-debrebase get_differs 7781a9139159682efb66cf35dcfa91d2fa496dae 4c4a6301aed0ae82707d492584b12ed493ad7340 = 0x2 1528s git-debrebase classify 566c1a663cb7d97b1dae8312b239589ccbdbb951 $t=4c4a6301aed0ae82707d492584b12ed493ad7340 @p 7781a9139159682efb66cf35dcfa91d2fa496dae/0x2 1528s 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 7781a9139159682efb66cf35dcfa91d2fa496dae\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "4c4a6301aed0ae82707d492584b12ed493ad7340","Parents" => [{"CommitId" => "7781a9139159682efb66cf35dcfa91d2fa496dae","Differs" => 2,"Ix" => 0}],"CommitId" => "566c1a663cb7d97b1dae8312b239589ccbdbb951","Type" => "Upstream"} 1528s git-debrebase get_differs fd01a87e8444da6267f6f14bda608f4a4e979b0b 48963840b2862a360dd004044de5a24b3c83d8c8 = 0x2 1528s git-debrebase classify 7781a9139159682efb66cf35dcfa91d2fa496dae $t=48963840b2862a360dd004044de5a24b3c83d8c8 @p fd01a87e8444da6267f6f14bda608f4a4e979b0b/0x2 1528s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "7781a9139159682efb66cf35dcfa91d2fa496dae","Tree" => "48963840b2862a360dd004044de5a24b3c83d8c8","Parents" => [{"Differs" => 2,"CommitId" => "fd01a87e8444da6267f6f14bda608f4a4e979b0b","Ix" => 0}],"Hdr" => "tree 48963840b2862a360dd004044de5a24b3c83d8c8\nparent fd01a87e8444da6267f6f14bda608f4a4e979b0b\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"} 1528s git-debrebase get_differs 537e5e0be2be2b2d99adde43894b76860af03893 d528e23895b1ecfa8c8af7e67d226e9c73ff23df = 0x2 1528s git-debrebase classify fd01a87e8444da6267f6f14bda608f4a4e979b0b $t=d528e23895b1ecfa8c8af7e67d226e9c73ff23df @p 537e5e0be2be2b2d99adde43894b76860af03893/0x2 1528s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "fd01a87e8444da6267f6f14bda608f4a4e979b0b","Hdr" => "tree d528e23895b1ecfa8c8af7e67d226e9c73ff23df\nparent 537e5e0be2be2b2d99adde43894b76860af03893\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "d528e23895b1ecfa8c8af7e67d226e9c73ff23df","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "537e5e0be2be2b2d99adde43894b76860af03893"}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch"} 1528s git-debrebase get_differs 5b4e32e278c5445841a836077e59e2c2850d99be 170122084d775751a61793936186c10b4ca772fa = 0x2 1528s git-debrebase classify 537e5e0be2be2b2d99adde43894b76860af03893 $t=170122084d775751a61793936186c10b4ca772fa @p 5b4e32e278c5445841a836077e59e2c2850d99be/0x2 1528s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "537e5e0be2be2b2d99adde43894b76860af03893","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Hdr" => "tree 170122084d775751a61793936186c10b4ca772fa\nparent 5b4e32e278c5445841a836077e59e2c2850d99be\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "170122084d775751a61793936186c10b4ca772fa","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5b4e32e278c5445841a836077e59e2c2850d99be"}]} 1528s git-debrebase get_differs d4a9aef1d696e625ef6057292305df7215c1d86f 953d36410163f668869d1114fad41586b0005040 = 0x2 1528s git-debrebase classify 5b4e32e278c5445841a836077e59e2c2850d99be $t=953d36410163f668869d1114fad41586b0005040 @p d4a9aef1d696e625ef6057292305df7215c1d86f/0x2 1528s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "5b4e32e278c5445841a836077e59e2c2850d99be","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"CommitId" => "d4a9aef1d696e625ef6057292305df7215c1d86f","Ix" => 0}],"Tree" => "953d36410163f668869d1114fad41586b0005040","Hdr" => "tree 953d36410163f668869d1114fad41586b0005040\nparent d4a9aef1d696e625ef6057292305df7215c1d86f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 1528s git-debrebase get_differs dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac 337538f5b7a945372f29120288088e8dfebbfc9a = 0x2 1528s git-debrebase classify d4a9aef1d696e625ef6057292305df7215c1d86f $t=337538f5b7a945372f29120288088e8dfebbfc9a @p dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac/0x2 1528s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 337538f5b7a945372f29120288088e8dfebbfc9a\nparent dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "337538f5b7a945372f29120288088e8dfebbfc9a","Parents" => [{"Differs" => 2,"CommitId" => "dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac","Ix" => 0}],"Type" => "Upstream","CommitId" => "d4a9aef1d696e625ef6057292305df7215c1d86f"} 1528s git-debrebase get_differs 59a5604430512eef9d28d780dc684f489e503e7b efe85a2cec64a871da32e67c06c01674bd56f143 = 0x2 1528s git-debrebase classify dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac $t=efe85a2cec64a871da32e67c06c01674bd56f143 @p 59a5604430512eef9d28d780dc684f489e503e7b/0x2 1528s git-debrebase = Upstream {"Tree" => "efe85a2cec64a871da32e67c06c01674bd56f143","Parents" => [{"CommitId" => "59a5604430512eef9d28d780dc684f489e503e7b","Differs" => 2,"Ix" => 0}],"Hdr" => "tree efe85a2cec64a871da32e67c06c01674bd56f143\nparent 59a5604430512eef9d28d780dc684f489e503e7b\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","CommitId" => "dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac"} 1528s git-debrebase get_differs e225dffeb5537ec924863ae0bacf36858f2e3062 1bd039d4fd485427ff22f59123a3a27f729e9cd7 = 0x20 1528s git-debrebase classify 59a5604430512eef9d28d780dc684f489e503e7b $t=1bd039d4fd485427ff22f59123a3a27f729e9cd7 @p e225dffeb5537ec924863ae0bacf36858f2e3062/0x20 1528s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "59a5604430512eef9d28d780dc684f489e503e7b","Tree" => "1bd039d4fd485427ff22f59123a3a27f729e9cd7","Parents" => [{"Ix" => 0,"CommitId" => "e225dffeb5537ec924863ae0bacf36858f2e3062","Differs" => 32}],"Hdr" => "tree 1bd039d4fd485427ff22f59123a3a27f729e9cd7\nparent e225dffeb5537ec924863ae0bacf36858f2e3062\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1528s git-debrebase get_differs 436a0a77136d4a0967c7942041b8e4fe0d56f28f 571dff7c8d67a53ee1fa0f48175c01ed43949f6d = 0x20 1528s git-debrebase classify e225dffeb5537ec924863ae0bacf36858f2e3062 $t=571dff7c8d67a53ee1fa0f48175c01ed43949f6d @p 436a0a77136d4a0967c7942041b8e4fe0d56f28f/0x20 1528s git-debrebase = Packaging {"Tree" => "571dff7c8d67a53ee1fa0f48175c01ed43949f6d","Parents" => [{"Differs" => 32,"CommitId" => "436a0a77136d4a0967c7942041b8e4fe0d56f28f","Ix" => 0}],"Hdr" => "tree 571dff7c8d67a53ee1fa0f48175c01ed43949f6d\nparent 436a0a77136d4a0967c7942041b8e4fe0d56f28f\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "DEBIAN add zorkmid (after)\n","Type" => "Packaging","CommitId" => "e225dffeb5537ec924863ae0bacf36858f2e3062"} 1528s git-debrebase get_differs f77f5a3cf715442ff9af63f94215e720d5c7249e c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 1528s git-debrebase get_differs 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 1528s git-debrebase classify 436a0a77136d4a0967c7942041b8e4fe0d56f28f $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p f77f5a3cf715442ff9af63f94215e720d5c7249e/0x20 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722/0x32 1528s git-debrebase = MergedBreakwaters {"CommitId" => "436a0a77136d4a0967c7942041b8e4fe0d56f28f","Type" => "MergedBreakwaters","Parents" => [{"Ix" => 0,"IsOrigin" => "","IsDgitImport" => undef,"CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Differs" => 32},{"Ix" => 1,"IsOrigin" => "","Differs" => 50,"IsDgitImport" => undef,"CommitId" => "1353d63d0ec4e50a8f1e1e1ce6f89c6203243722"}],"Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6","Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent f77f5a3cf715442ff9af63f94215e720d5c7249e\nparent 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722\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"} 1528s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1528s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1528s git-debrebase = Packaging {"Msg" => "us-conflict\n","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b"}],"Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging","CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e"} 1528s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1528s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1528s git-debrebase = Packaging {"Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Parents" => [{"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\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","CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b"} 1528s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1528s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1528s git-debrebase = Packaging {"CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Differs" => 32}],"Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "DEBIAN add zorkmid-us (us-2)\n"} 1528s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1528s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1528s git-debrebase = Changelog {"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Differs" => 16}],"Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4"} 1528s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1528s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1528s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1528s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Differs" => 48}],"Type" => "Anchor","CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70","Differs" => 2},$VAR1->{"OrigParents"}[0]],"Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c"} 1528s git-debrebase get_differs 668ecc18429ad51615759c319e10c97908e4cd1b 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 1528s git-debrebase classify 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 668ecc18429ad51615759c319e10c97908e4cd1b/0x20 1528s git-debrebase = Packaging {"Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 668ecc18429ad51615759c319e10c97908e4cd1b\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"CommitId" => "668ecc18429ad51615759c319e10c97908e4cd1b","Differs" => 32,"Ix" => 0}],"Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Msg" => "other-conflict\n","CommitId" => "1353d63d0ec4e50a8f1e1e1ce6f89c6203243722","Type" => "Packaging"} 1528s git-debrebase get_differs add117c3d765d5114f03f16b8a579cd6134a21da 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1528s git-debrebase classify 668ecc18429ad51615759c319e10c97908e4cd1b $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p add117c3d765d5114f03f16b8a579cd6134a21da/0x20 1528s git-debrebase = Packaging {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent add117c3d765d5114f03f16b8a579cd6134a21da\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Parents" => [{"Ix" => 0,"CommitId" => "add117c3d765d5114f03f16b8a579cd6134a21da","Differs" => 32}],"Type" => "Packaging","CommitId" => "668ecc18429ad51615759c319e10c97908e4cd1b"} 1528s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1528s git-debrebase classify add117c3d765d5114f03f16b8a579cd6134a21da $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1528s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "add117c3d765d5114f03f16b8a579cd6134a21da","Msg" => "DEBIAN add zorkmid-other (other)\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Parents" => [{"Ix" => 0,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Differs" => 32}],"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 1528s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1528s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1528s git-debrebase = Packaging {"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\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"} 1528s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1528s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1528s git-debrebase = Packaging {"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"}],"Msg" => "DEBIAN add zorkmid (before)\n"} 1528s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1528s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1528s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Type" => "Changelog"} 1528s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1528s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1528s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"} 1528s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1528s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1528s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1528s git-debrebase = Anchor {"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Type" => "Anchor","OrigParents" => [{"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e","Differs" => 48,"Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\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"} 1528s git-debrebase *** WALK prep done cur=436a0a77136d4a0967c7942041b8e4fe0d56f28f brw 1 upp 12 proc 15 pm -1 1528s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1528s ' 1528s ++ git rev-parse HEAD 1528s + expect=c2748354923b4f8e082f565f79623c63aeff0bac 1528s + exec 1528s + local cid ctype info nparents 1528s + read cid ctype info 1528s + : ===== c2748354923b4f8e082f565f79623c63aeff0bac Upstream ===== 1528s + test c2748354923b4f8e082f565f79623c63aeff0bac = c2748354923b4f8e082f565f79623c63aeff0bac 1528s + local cetype=Upstream 1528s + '[' xUpstream = xUpstream ']' 1528s + cetype=SAME 1528s ++ git log -n1 --pretty=format:%P c2748354923b4f8e082f565f79623c63aeff0bac 1528s + local parents=025ab842c855ce872ed9de048c7fe6e08d16b765 1528s + expect=025ab842c855ce872ed9de048c7fe6e08d16b765 1528s + enparents=1 1528s + : Upstream/SAME 025ab842c855ce872ed9de048c7fe6e08d16b765 1528s + case "$ctype/$cetype" in 1528s + case "$ctype/$etypes" in 1528s + case "$cetype" in 1528s + case "$ctype" in 1528s ++ printf %s 025ab842c855ce872ed9de048c7fe6e08d16b765 1528s ++ wc -w 1528s + local cnparents=1 1528s + test 1 = 1 1528s ++ for f in $parents 1528s ++ echo 025ab842c855ce872ed9de048c7fe6e08d16b765 1528s ++ t-sort -u 1528s ++ LC_COLLATE=C 1528s ++ sort -u 1528s ++ wc -w 1528s + local cndparents=1 1528s + test 1 = 1 1528s + case "$parents" in 1528s + case "$ctype" in 1528s + read cid ctype info 1528s + : ===== 025ab842c855ce872ed9de048c7fe6e08d16b765 Upstream ===== 1528s + test 025ab842c855ce872ed9de048c7fe6e08d16b765 = 025ab842c855ce872ed9de048c7fe6e08d16b765 1528s + local cetype=Upstream 1528s + '[' xUpstream = xUpstream ']' 1528s + cetype=SAME 1528s ++ git log -n1 --pretty=format:%P 025ab842c855ce872ed9de048c7fe6e08d16b765 1528s + local parents=cbe362257debab46378f3bfd9cb6b4bc18f22184 1528s + expect=cbe362257debab46378f3bfd9cb6b4bc18f22184 1528s + enparents=1 1528s + : Upstream/SAME cbe362257debab46378f3bfd9cb6b4bc18f22184 1528s + case "$ctype/$cetype" in 1528s + case "$ctype/$etypes" in 1528s + case "$cetype" in 1528s + case "$ctype" in 1528s ++ printf %s cbe362257debab46378f3bfd9cb6b4bc18f22184 1528s ++ wc -w 1528s + local cnparents=1 1528s + test 1 = 1 1528s ++ for f in $parents 1528s ++ echo cbe362257debab46378f3bfd9cb6b4bc18f22184 1528s ++ wc -w 1528s ++ t-sort -u 1528s ++ LC_COLLATE=C 1528s ++ sort -u 1528s + local cndparents=1 1528s + test 1 = 1 1528s + case "$parents" in 1528s + case "$ctype" in 1528s + read cid ctype info 1528s + : ===== cbe362257debab46378f3bfd9cb6b4bc18f22184 Upstream ===== 1528s + test cbe362257debab46378f3bfd9cb6b4bc18f22184 = cbe362257debab46378f3bfd9cb6b4bc18f22184 1528s + local cetype=Upstream 1528s + '[' xUpstream = xUpstream ']' 1528s + cetype=SAME 1528s ++ git log -n1 --pretty=format:%P cbe362257debab46378f3bfd9cb6b4bc18f22184 1528s + local parents=0c9121a41f6d54e3d3c12a566c8b90487deddf46 1528s + expect=0c9121a41f6d54e3d3c12a566c8b90487deddf46 1528s + enparents=1 1528s + : Upstream/SAME 0c9121a41f6d54e3d3c12a566c8b90487deddf46 1528s + case "$ctype/$cetype" in 1528s + case "$ctype/$etypes" in 1528s + case "$cetype" in 1528s + case "$ctype" in 1528s ++ printf %s 0c9121a41f6d54e3d3c12a566c8b90487deddf46 1528s ++ wc -w 1528s + local cnparents=1 1528s + test 1 = 1 1528s ++ for f in $parents 1528s ++ echo 0c9121a41f6d54e3d3c12a566c8b90487deddf46 1528s ++ wc -w 1528s ++ t-sort -u 1528s ++ LC_COLLATE=C 1528s ++ sort -u 1528s + local cndparents=1 1528s + test 1 = 1 1528s + case "$parents" in 1528s + case "$ctype" in 1528s + read cid ctype info 1528s + : ===== 0c9121a41f6d54e3d3c12a566c8b90487deddf46 Upstream ===== 1528s + test 0c9121a41f6d54e3d3c12a566c8b90487deddf46 = 0c9121a41f6d54e3d3c12a566c8b90487deddf46 1528s + local cetype=Upstream 1528s + '[' xUpstream = xUpstream ']' 1528s + cetype=SAME 1528s ++ git log -n1 --pretty=format:%P 0c9121a41f6d54e3d3c12a566c8b90487deddf46 1528s + local parents=99a5d1aed55bb3506212426ecccaa52ead5f7d19 1528s + expect=99a5d1aed55bb3506212426ecccaa52ead5f7d19 1528s + enparents=1 1528s + : Upstream/SAME 99a5d1aed55bb3506212426ecccaa52ead5f7d19 1528s + case "$ctype/$cetype" in 1528s + case "$ctype/$etypes" in 1528s + case "$cetype" in 1528s + case "$ctype" in 1528s ++ printf %s 99a5d1aed55bb3506212426ecccaa52ead5f7d19 1528s ++ wc -w 1528s + local cnparents=1 1528s + test 1 = 1 1528s ++ for f in $parents 1528s ++ echo 99a5d1aed55bb3506212426ecccaa52ead5f7d19 1528s ++ wc -w 1528s ++ t-sort -u 1528s ++ LC_COLLATE=C 1528s ++ sort -u 1528s + local cndparents=1 1528s + test 1 = 1 1528s + case "$parents" in 1528s + case "$ctype" in 1528s + read cid ctype info 1528s + : ===== 99a5d1aed55bb3506212426ecccaa52ead5f7d19 Upstream ===== 1528s + test 99a5d1aed55bb3506212426ecccaa52ead5f7d19 = 99a5d1aed55bb3506212426ecccaa52ead5f7d19 1528s + local cetype=Upstream 1528s + '[' xUpstream = xUpstream ']' 1528s + cetype=SAME 1528s ++ git log -n1 --pretty=format:%P 99a5d1aed55bb3506212426ecccaa52ead5f7d19 1528s + local parents=e700e434ec3ea1861e41f5ca87620d4727c50bea 1528s + expect=e700e434ec3ea1861e41f5ca87620d4727c50bea 1528s + enparents=1 1528s + : Upstream/SAME e700e434ec3ea1861e41f5ca87620d4727c50bea 1528s + case "$ctype/$cetype" in 1528s + case "$ctype/$etypes" in 1528s + case "$cetype" in 1528s + case "$ctype" in 1528s ++ printf %s e700e434ec3ea1861e41f5ca87620d4727c50bea 1528s ++ wc -w 1528s + local cnparents=1 1528s + test 1 = 1 1528s ++ t-sort -u 1528s ++ LC_COLLATE=C 1528s ++ sort -u 1528s ++ for f in $parents 1528s ++ echo e700e434ec3ea1861e41f5ca87620d4727c50bea 1528s ++ wc -w 1528s + local cndparents=1 1528s + test 1 = 1 1528s + case "$parents" in 1528s + case "$ctype" in 1528s + read cid ctype info 1528s + : ===== e700e434ec3ea1861e41f5ca87620d4727c50bea Upstream ===== 1528s + test e700e434ec3ea1861e41f5ca87620d4727c50bea = e700e434ec3ea1861e41f5ca87620d4727c50bea 1528s + local cetype=Upstream 1528s + '[' xUpstream = xUpstream ']' 1528s + cetype=SAME 1528s ++ git log -n1 --pretty=format:%P e700e434ec3ea1861e41f5ca87620d4727c50bea 1528s + local parents=566c1a663cb7d97b1dae8312b239589ccbdbb951 1528s + expect=566c1a663cb7d97b1dae8312b239589ccbdbb951 1528s + enparents=1 1528s + : Upstream/SAME 566c1a663cb7d97b1dae8312b239589ccbdbb951 1528s + case "$ctype/$cetype" in 1528s + case "$ctype/$etypes" in 1528s + case "$cetype" in 1528s + case "$ctype" in 1528s ++ printf %s 566c1a663cb7d97b1dae8312b239589ccbdbb951 1528s ++ wc -w 1528s + local cnparents=1 1528s + test 1 = 1 1528s ++ for f in $parents 1528s ++ echo 566c1a663cb7d97b1dae8312b239589ccbdbb951 1528s ++ t-sort -u 1528s ++ wc -w 1528s ++ LC_COLLATE=C 1528s ++ sort -u 1528s + local cndparents=1 1528s + test 1 = 1 1528s + case "$parents" in 1528s + case "$ctype" in 1528s + read cid ctype info 1528s + : ===== 566c1a663cb7d97b1dae8312b239589ccbdbb951 Upstream ===== 1528s + test 566c1a663cb7d97b1dae8312b239589ccbdbb951 = 566c1a663cb7d97b1dae8312b239589ccbdbb951 1528s + local cetype=Upstream 1528s + '[' xUpstream = xUpstream ']' 1528s + cetype=SAME 1528s ++ git log -n1 --pretty=format:%P 566c1a663cb7d97b1dae8312b239589ccbdbb951 1528s + local parents=7781a9139159682efb66cf35dcfa91d2fa496dae 1528s + expect=7781a9139159682efb66cf35dcfa91d2fa496dae 1528s + enparents=1 1528s + : Upstream/SAME 7781a9139159682efb66cf35dcfa91d2fa496dae 1528s + case "$ctype/$cetype" in 1528s + case "$ctype/$etypes" in 1528s + case "$cetype" in 1528s + case "$ctype" in 1528s ++ printf %s 7781a9139159682efb66cf35dcfa91d2fa496dae 1528s ++ wc -w 1528s + local cnparents=1 1528s + test 1 = 1 1528s ++ for f in $parents 1528s ++ echo 7781a9139159682efb66cf35dcfa91d2fa496dae 1528s ++ t-sort -u 1528s ++ wc -w 1528s ++ LC_COLLATE=C 1528s ++ sort -u 1528s + local cndparents=1 1528s + test 1 = 1 1528s + case "$parents" in 1528s + case "$ctype" in 1528s + read cid ctype info 1528s + : ===== 7781a9139159682efb66cf35dcfa91d2fa496dae Upstream ===== 1528s + test 7781a9139159682efb66cf35dcfa91d2fa496dae = 7781a9139159682efb66cf35dcfa91d2fa496dae 1528s + local cetype=Upstream 1528s + '[' xUpstream = xUpstream ']' 1528s + cetype=SAME 1528s ++ git log -n1 --pretty=format:%P 7781a9139159682efb66cf35dcfa91d2fa496dae 1528s + local parents=fd01a87e8444da6267f6f14bda608f4a4e979b0b 1528s + expect=fd01a87e8444da6267f6f14bda608f4a4e979b0b 1528s + enparents=1 1528s + : Upstream/SAME fd01a87e8444da6267f6f14bda608f4a4e979b0b 1528s + case "$ctype/$cetype" in 1528s + case "$ctype/$etypes" in 1528s + case "$cetype" in 1528s + case "$ctype" in 1528s ++ printf %s fd01a87e8444da6267f6f14bda608f4a4e979b0b 1528s ++ wc -w 1528s + local cnparents=1 1528s + test 1 = 1 1528s ++ for f in $parents 1528s ++ echo fd01a87e8444da6267f6f14bda608f4a4e979b0b 1528s ++ t-sort -u 1528s ++ LC_COLLATE=C 1528s ++ sort -u 1528s ++ wc -w 1528s + local cndparents=1 1528s + test 1 = 1 1528s + case "$parents" in 1528s + case "$ctype" in 1528s + read cid ctype info 1528s + : ===== fd01a87e8444da6267f6f14bda608f4a4e979b0b Upstream ===== 1528s + test fd01a87e8444da6267f6f14bda608f4a4e979b0b = fd01a87e8444da6267f6f14bda608f4a4e979b0b 1528s + local cetype=Upstream 1528s + '[' xUpstream = xUpstream ']' 1528s + cetype=SAME 1528s ++ git log -n1 --pretty=format:%P fd01a87e8444da6267f6f14bda608f4a4e979b0b 1528s + local parents=537e5e0be2be2b2d99adde43894b76860af03893 1528s + expect=537e5e0be2be2b2d99adde43894b76860af03893 1528s + enparents=1 1529s + : Upstream/SAME 537e5e0be2be2b2d99adde43894b76860af03893 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s ++ wc -w 1529s ++ printf %s 537e5e0be2be2b2d99adde43894b76860af03893 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s ++ for f in $parents 1529s ++ echo 537e5e0be2be2b2d99adde43894b76860af03893 1529s ++ wc -w 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== 537e5e0be2be2b2d99adde43894b76860af03893 Upstream ===== 1529s + test 537e5e0be2be2b2d99adde43894b76860af03893 = 537e5e0be2be2b2d99adde43894b76860af03893 1529s + local cetype=Upstream 1529s + '[' xUpstream = xUpstream ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P 537e5e0be2be2b2d99adde43894b76860af03893 1529s + local parents=5b4e32e278c5445841a836077e59e2c2850d99be 1529s + expect=5b4e32e278c5445841a836077e59e2c2850d99be 1529s + enparents=1 1529s + : Upstream/SAME 5b4e32e278c5445841a836077e59e2c2850d99be 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s ++ printf %s 5b4e32e278c5445841a836077e59e2c2850d99be 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo 5b4e32e278c5445841a836077e59e2c2850d99be 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== 5b4e32e278c5445841a836077e59e2c2850d99be Upstream ===== 1529s + test 5b4e32e278c5445841a836077e59e2c2850d99be = 5b4e32e278c5445841a836077e59e2c2850d99be 1529s + local cetype=Upstream 1529s + '[' xUpstream = xUpstream ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P 5b4e32e278c5445841a836077e59e2c2850d99be 1529s + local parents=d4a9aef1d696e625ef6057292305df7215c1d86f 1529s + expect=d4a9aef1d696e625ef6057292305df7215c1d86f 1529s + enparents=1 1529s + : Upstream/SAME d4a9aef1d696e625ef6057292305df7215c1d86f 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s ++ printf %s d4a9aef1d696e625ef6057292305df7215c1d86f 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo d4a9aef1d696e625ef6057292305df7215c1d86f 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== d4a9aef1d696e625ef6057292305df7215c1d86f Upstream ===== 1529s + test d4a9aef1d696e625ef6057292305df7215c1d86f = d4a9aef1d696e625ef6057292305df7215c1d86f 1529s + local cetype=Upstream 1529s + '[' xUpstream = xUpstream ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P d4a9aef1d696e625ef6057292305df7215c1d86f 1529s + local parents=dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac 1529s + expect=dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac 1529s + enparents=1 1529s + : Upstream/SAME dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s ++ printf %s dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac 1529s ++ t-sort -u 1529s ++ wc -w 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac Upstream ===== 1529s + test dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac = dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac 1529s + local cetype=Upstream 1529s + '[' xUpstream = xUpstream ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P dfa6bd02e4b3ae5d4f38d91076064d6259ab22ac 1529s + local parents=59a5604430512eef9d28d780dc684f489e503e7b 1529s + expect=59a5604430512eef9d28d780dc684f489e503e7b 1529s + enparents=1 1529s + : Upstream/SAME 59a5604430512eef9d28d780dc684f489e503e7b 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s ++ printf %s 59a5604430512eef9d28d780dc684f489e503e7b 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo 59a5604430512eef9d28d780dc684f489e503e7b 1529s ++ t-sort -u 1529s ++ wc -w 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== 59a5604430512eef9d28d780dc684f489e503e7b Packaging ===== 1529s + test 59a5604430512eef9d28d780dc684f489e503e7b = 59a5604430512eef9d28d780dc684f489e503e7b 1529s + local cetype=Upstream 1529s + '[' xPackaging = xUpstream ']' 1529s ++ git log -n1 --pretty=format:%P 59a5604430512eef9d28d780dc684f489e503e7b 1529s + local parents=e225dffeb5537ec924863ae0bacf36858f2e3062 1529s + expect=e225dffeb5537ec924863ae0bacf36858f2e3062 1529s + enparents=1 1529s + : Packaging/Upstream e225dffeb5537ec924863ae0bacf36858f2e3062 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + '[' xY:59a5604430512eef9d28d780dc684f489e503e7b '!=' x ']' 1529s + test Y:59a5604430512eef9d28d780dc684f489e503e7b = Y:59a5604430512eef9d28d780dc684f489e503e7b 1529s + bwtip= 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet e225dffeb5537ec924863ae0bacf36858f2e3062..59a5604430512eef9d28d780dc684f489e503e7b -- :. ':!debian' 1529s + git diff --quiet e225dffeb5537ec924863ae0bacf36858f2e3062..59a5604430512eef9d28d780dc684f489e503e7b -- :debian/patches 1529s + etypes=Packaging 1529s ++ printf %s e225dffeb5537ec924863ae0bacf36858f2e3062 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo e225dffeb5537ec924863ae0bacf36858f2e3062 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== e225dffeb5537ec924863ae0bacf36858f2e3062 Packaging ===== 1529s + test e225dffeb5537ec924863ae0bacf36858f2e3062 = e225dffeb5537ec924863ae0bacf36858f2e3062 1529s + local cetype=Packaging 1529s + '[' xPackaging = xPackaging ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P e225dffeb5537ec924863ae0bacf36858f2e3062 1529s + local parents=436a0a77136d4a0967c7942041b8e4fe0d56f28f 1529s + expect=436a0a77136d4a0967c7942041b8e4fe0d56f28f 1529s + enparents=1 1529s + : Packaging/SAME 436a0a77136d4a0967c7942041b8e4fe0d56f28f 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet 436a0a77136d4a0967c7942041b8e4fe0d56f28f..e225dffeb5537ec924863ae0bacf36858f2e3062 -- :. ':!debian' 1529s + git diff --quiet 436a0a77136d4a0967c7942041b8e4fe0d56f28f..e225dffeb5537ec924863ae0bacf36858f2e3062 -- :debian/patches 1529s + etypes=Packaging 1529s ++ printf %s 436a0a77136d4a0967c7942041b8e4fe0d56f28f 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo 436a0a77136d4a0967c7942041b8e4fe0d56f28f 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== 436a0a77136d4a0967c7942041b8e4fe0d56f28f MergedBreakwaters ===== 1529s + test 436a0a77136d4a0967c7942041b8e4fe0d56f28f = 436a0a77136d4a0967c7942041b8e4fe0d56f28f 1529s + local cetype=Packaging 1529s + '[' xMergedBreakwaters = xPackaging ']' 1529s ++ git log -n1 --pretty=format:%P 436a0a77136d4a0967c7942041b8e4fe0d56f28f 1529s + local 'parents=f77f5a3cf715442ff9af63f94215e720d5c7249e 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722' 1529s + expect='f77f5a3cf715442ff9af63f94215e720d5c7249e 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722' 1529s + enparents=1 1529s + : MergedBreakwaters/Packaging 'f77f5a3cf715442ff9af63f94215e720d5c7249e 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722' 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + enparents=2 1529s ++ printf %s 'f77f5a3cf715442ff9af63f94215e720d5c7249e 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722' 1529s ++ wc -w 1529s + local cnparents=2 1529s + test 2 = 2 1529s ++ for f in $parents 1529s ++ echo f77f5a3cf715442ff9af63f94215e720d5c7249e 1529s ++ for f in $parents 1529s ++ echo 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 1529s ++ t-sort -u 1529s ++ wc -w 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=2 1529s + test 2 = 2 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + local f 1529s + local parent_ix=0 1529s + for f in $parents 1529s + t-gdr-good-analyse f77f5a3cf715442ff9af63f94215e720d5c7249e breakwater -mp0 1529s + local head=f77f5a3cf715442ff9af63f94215e720d5c7249e 1529s + local state=breakwater 1529s + local wsfx=-mp0 1529s + local etypes bwtip 1529s + case $state in 1529s + etypes=Packaging 1529s + anal=../anal-mp0 1529s + t-git-debrebase analyse f77f5a3cf715442ff9af63f94215e720d5c7249e 1529s + local gdr=git-debrebase 1529s + : ' 1529s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1529s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse f77f5a3cf715442ff9af63f94215e720d5c7249e 1529s git-debrebase *** WALK f77f5a3cf715442ff9af63f94215e720d5c7249e 1 *main::STDOUT 1529s git-debrebase get_differs 679a57a2fb7abcea83d6a6401e6ed325b289669b 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 1529s git-debrebase classify f77f5a3cf715442ff9af63f94215e720d5c7249e $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 679a57a2fb7abcea83d6a6401e6ed325b289669b/0x20 1529s git-debrebase = Packaging {"Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Parents" => [{"CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Differs" => 32,"Ix" => 0}],"Msg" => "us-conflict\n","CommitId" => "f77f5a3cf715442ff9af63f94215e720d5c7249e","Type" => "Packaging","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 679a57a2fb7abcea83d6a6401e6ed325b289669b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1529s git-debrebase get_differs 16f86dfb60387585ebd2714c26703a02aa3d2265 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 1529s git-debrebase classify 679a57a2fb7abcea83d6a6401e6ed325b289669b $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 16f86dfb60387585ebd2714c26703a02aa3d2265/0x20 1529s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "679a57a2fb7abcea83d6a6401e6ed325b289669b","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 16f86dfb60387585ebd2714c26703a02aa3d2265\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" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Differs" => 32,"Ix" => 0}],"Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103"} 1529s git-debrebase get_differs bbe1078ab4e02c973ffae4ecc124fccd0ebee298 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 1529s git-debrebase classify 16f86dfb60387585ebd2714c26703a02aa3d2265 $t=64f581ce808513cd3414d0822ed31d95b79a82af @p bbe1078ab4e02c973ffae4ecc124fccd0ebee298/0x20 1529s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-us (us-2)\n","Parents" => [{"CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent bbe1078ab4e02c973ffae4ecc124fccd0ebee298\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging","CommitId" => "16f86dfb60387585ebd2714c26703a02aa3d2265","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af"} 1529s git-debrebase get_differs d50318b393ee163dd38aa93c9427a1ce6a993b3a 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 1529s git-debrebase classify bbe1078ab4e02c973ffae4ecc124fccd0ebee298 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p d50318b393ee163dd38aa93c9427a1ce6a993b3a/0x10 1529s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "bbe1078ab4e02c973ffae4ecc124fccd0ebee298","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent d50318b393ee163dd38aa93c9427a1ce6a993b3a\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" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a"}],"Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4"} 1529s git-debrebase get_differs 1fcdf5538d01a16ab5223fb916f79abf4efd6b70 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 1529s git-debrebase get_differs 38ee93726fb48a60962f8d01d367986becb682da 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 1529s git-debrebase classify d50318b393ee163dd38aa93c9427a1ce6a993b3a $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p 1fcdf5538d01a16ab5223fb916f79abf4efd6b70/0x2 38ee93726fb48a60962f8d01d367986becb682da/0x30 1529s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1fcdf5538d01a16ab5223fb916f79abf4efd6b70"},{"CommitId" => "38ee93726fb48a60962f8d01d367986becb682da","Differs" => 48,"Ix" => 1}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "d50318b393ee163dd38aa93c9427a1ce6a993b3a","Type" => "Anchor","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent 1fcdf5538d01a16ab5223fb916f79abf4efd6b70\nparent 38ee93726fb48a60962f8d01d367986becb682da\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c"} 1529s git-debrebase *** WALK prep done cur=d50318b393ee163dd38aa93c9427a1ce6a993b3a brw 3 upp -1 proc 4 pm -1 1529s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1529s ' 1529s ++ git rev-parse f77f5a3cf715442ff9af63f94215e720d5c7249e 1529s + expect=f77f5a3cf715442ff9af63f94215e720d5c7249e 1529s + exec 1529s + local cid ctype info nparents 1529s + read cid ctype info 1529s + : ===== f77f5a3cf715442ff9af63f94215e720d5c7249e Packaging ===== 1529s + test f77f5a3cf715442ff9af63f94215e720d5c7249e = f77f5a3cf715442ff9af63f94215e720d5c7249e 1529s + local cetype=Packaging 1529s + '[' xPackaging = xPackaging ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P f77f5a3cf715442ff9af63f94215e720d5c7249e 1529s + local parents=679a57a2fb7abcea83d6a6401e6ed325b289669b 1529s + expect=679a57a2fb7abcea83d6a6401e6ed325b289669b 1529s + enparents=1 1529s + : Packaging/SAME 679a57a2fb7abcea83d6a6401e6ed325b289669b 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet 679a57a2fb7abcea83d6a6401e6ed325b289669b..f77f5a3cf715442ff9af63f94215e720d5c7249e -- :. ':!debian' 1529s + git diff --quiet 679a57a2fb7abcea83d6a6401e6ed325b289669b..f77f5a3cf715442ff9af63f94215e720d5c7249e -- :debian/patches 1529s + etypes=Packaging 1529s ++ printf %s 679a57a2fb7abcea83d6a6401e6ed325b289669b 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo 679a57a2fb7abcea83d6a6401e6ed325b289669b 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== 679a57a2fb7abcea83d6a6401e6ed325b289669b Packaging ===== 1529s + test 679a57a2fb7abcea83d6a6401e6ed325b289669b = 679a57a2fb7abcea83d6a6401e6ed325b289669b 1529s + local cetype=Packaging 1529s + '[' xPackaging = xPackaging ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P 679a57a2fb7abcea83d6a6401e6ed325b289669b 1529s + local parents=16f86dfb60387585ebd2714c26703a02aa3d2265 1529s + expect=16f86dfb60387585ebd2714c26703a02aa3d2265 1529s + enparents=1 1529s + : Packaging/SAME 16f86dfb60387585ebd2714c26703a02aa3d2265 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet 16f86dfb60387585ebd2714c26703a02aa3d2265..679a57a2fb7abcea83d6a6401e6ed325b289669b -- :. ':!debian' 1529s + git diff --quiet 16f86dfb60387585ebd2714c26703a02aa3d2265..679a57a2fb7abcea83d6a6401e6ed325b289669b -- :debian/patches 1529s + etypes=Packaging 1529s ++ printf %s 16f86dfb60387585ebd2714c26703a02aa3d2265 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo 16f86dfb60387585ebd2714c26703a02aa3d2265 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== 16f86dfb60387585ebd2714c26703a02aa3d2265 Packaging ===== 1529s + test 16f86dfb60387585ebd2714c26703a02aa3d2265 = 16f86dfb60387585ebd2714c26703a02aa3d2265 1529s + local cetype=Packaging 1529s + '[' xPackaging = xPackaging ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P 16f86dfb60387585ebd2714c26703a02aa3d2265 1529s + local parents=bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1529s + expect=bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1529s + enparents=1 1529s + : Packaging/SAME bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet bbe1078ab4e02c973ffae4ecc124fccd0ebee298..16f86dfb60387585ebd2714c26703a02aa3d2265 -- :. ':!debian' 1529s + git diff --quiet bbe1078ab4e02c973ffae4ecc124fccd0ebee298..16f86dfb60387585ebd2714c26703a02aa3d2265 -- :debian/patches 1529s + etypes=Packaging 1529s ++ printf %s bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== bbe1078ab4e02c973ffae4ecc124fccd0ebee298 Changelog ===== 1529s + test bbe1078ab4e02c973ffae4ecc124fccd0ebee298 = bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1529s + local cetype=Packaging 1529s + '[' xChangelog = xPackaging ']' 1529s ++ git log -n1 --pretty=format:%P bbe1078ab4e02c973ffae4ecc124fccd0ebee298 1529s + local parents=d50318b393ee163dd38aa93c9427a1ce6a993b3a 1529s + expect=d50318b393ee163dd38aa93c9427a1ce6a993b3a 1529s + enparents=1 1529s + : Changelog/Packaging d50318b393ee163dd38aa93c9427a1ce6a993b3a 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet d50318b393ee163dd38aa93c9427a1ce6a993b3a..bbe1078ab4e02c973ffae4ecc124fccd0ebee298 -- :. ':!debian/changelog' 1529s + etypes=Packaging 1529s ++ printf %s d50318b393ee163dd38aa93c9427a1ce6a993b3a 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo d50318b393ee163dd38aa93c9427a1ce6a993b3a 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== d50318b393ee163dd38aa93c9427a1ce6a993b3a Anchor ===== 1529s + test d50318b393ee163dd38aa93c9427a1ce6a993b3a = d50318b393ee163dd38aa93c9427a1ce6a993b3a 1529s + local cetype=Packaging 1529s + '[' xAnchor = xPackaging ']' 1529s ++ git log -n1 --pretty=format:%P d50318b393ee163dd38aa93c9427a1ce6a993b3a 1529s + local 'parents=1fcdf5538d01a16ab5223fb916f79abf4efd6b70 38ee93726fb48a60962f8d01d367986becb682da' 1529s + expect='1fcdf5538d01a16ab5223fb916f79abf4efd6b70 38ee93726fb48a60962f8d01d367986becb682da' 1529s + enparents=1 1529s + : Anchor/Packaging '1fcdf5538d01a16ab5223fb916f79abf4efd6b70 38ee93726fb48a60962f8d01d367986becb682da' 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + break 1529s + parent_ix=1 1529s + for f in $parents 1529s + t-gdr-good-analyse 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 breakwater -mp1 1529s + local head=1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 1529s + local state=breakwater 1529s + local wsfx=-mp1 1529s + local etypes bwtip 1529s + case $state in 1529s + etypes=Packaging 1529s + anal=../anal-mp1 1529s + t-git-debrebase analyse 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 1529s + local gdr=git-debrebase 1529s + : ' 1529s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1529s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 1529s git-debrebase *** WALK 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 1 *main::STDOUT 1529s git-debrebase get_differs 668ecc18429ad51615759c319e10c97908e4cd1b 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 1529s git-debrebase classify 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 668ecc18429ad51615759c319e10c97908e4cd1b/0x20 1529s git-debrebase = Packaging {"Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","CommitId" => "1353d63d0ec4e50a8f1e1e1ce6f89c6203243722","Parents" => [{"CommitId" => "668ecc18429ad51615759c319e10c97908e4cd1b","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 668ecc18429ad51615759c319e10c97908e4cd1b\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "other-conflict\n","Type" => "Packaging"} 1529s git-debrebase get_differs add117c3d765d5114f03f16b8a579cd6134a21da 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 1529s git-debrebase classify 668ecc18429ad51615759c319e10c97908e4cd1b $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p add117c3d765d5114f03f16b8a579cd6134a21da/0x20 1529s git-debrebase = Packaging {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent add117c3d765d5114f03f16b8a579cd6134a21da\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Packaging","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","CommitId" => "668ecc18429ad51615759c319e10c97908e4cd1b","Parents" => [{"CommitId" => "add117c3d765d5114f03f16b8a579cd6134a21da","Differs" => 32,"Ix" => 0}]} 1529s git-debrebase get_differs 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 1529s git-debrebase classify add117c3d765d5114f03f16b8a579cd6134a21da $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 4fac284b9a57ca57ecdeffa6278dea2759cd00e9/0x20 1529s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9"}],"CommitId" => "add117c3d765d5114f03f16b8a579cd6134a21da","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Type" => "Packaging","Msg" => "DEBIAN add zorkmid-other (other)\n","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 4fac284b9a57ca57ecdeffa6278dea2759cd00e9\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 1529s git-debrebase get_differs 6820a0900873c206f54cab6ac552afb016b49205 cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 1529s git-debrebase classify 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p 6820a0900873c206f54cab6ac552afb016b49205/0x20 1529s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "4fac284b9a57ca57ecdeffa6278dea2759cd00e9","Parents" => [{"Ix" => 0,"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Differs" => 32}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent 6820a0900873c206f54cab6ac552afb016b49205\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","Type" => "Packaging"} 1529s git-debrebase get_differs db129944b7f434b59509f6c007624fd8a89fe823 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 1529s git-debrebase classify 6820a0900873c206f54cab6ac552afb016b49205 $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p db129944b7f434b59509f6c007624fd8a89fe823/0x20 1529s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent db129944b7f434b59509f6c007624fd8a89fe823\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823"}],"CommitId" => "6820a0900873c206f54cab6ac552afb016b49205","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 1529s git-debrebase get_differs eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1529s git-debrebase classify db129944b7f434b59509f6c007624fd8a89fe823 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2/0x10 1529s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","CommitId" => "db129944b7f434b59509f6c007624fd8a89fe823","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2"}]} 1529s git-debrebase get_differs 48c55fcd6aad3671faeeedd232289eea48db8cce 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1529s git-debrebase classify eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48c55fcd6aad3671faeeedd232289eea48db8cce/0x10 1529s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48c55fcd6aad3671faeeedd232289eea48db8cce\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 1529s git-debrebase get_differs 23886cf8bbaefa175a2403d6556564175e096c16 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1529s git-debrebase get_differs c503a3d8e91a8fe38919c1795f29cacc3a671c3e 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1529s git-debrebase classify 48c55fcd6aad3671faeeedd232289eea48db8cce $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 23886cf8bbaefa175a2403d6556564175e096c16/0 c503a3d8e91a8fe38919c1795f29cacc3a671c3e/0x30 1529s git-debrebase = Anchor {"CommitId" => "48c55fcd6aad3671faeeedd232289eea48db8cce","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "c503a3d8e91a8fe38919c1795f29cacc3a671c3e"}],"Parents" => [{"CommitId" => "23886cf8bbaefa175a2403d6556564175e096c16","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","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 23886cf8bbaefa175a2403d6556564175e096c16\nparent c503a3d8e91a8fe38919c1795f29cacc3a671c3e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor"} 1529s git-debrebase *** WALK prep done cur=48c55fcd6aad3671faeeedd232289eea48db8cce brw 6 upp -1 proc 7 pm -1 1529s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1529s ' 1529s ++ git rev-parse 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 1529s + expect=1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 1529s + exec 1529s + local cid ctype info nparents 1529s + read cid ctype info 1529s + : ===== 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 Packaging ===== 1529s + test 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 = 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 1529s + local cetype=Packaging 1529s + '[' xPackaging = xPackaging ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P 1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 1529s + local parents=668ecc18429ad51615759c319e10c97908e4cd1b 1529s + expect=668ecc18429ad51615759c319e10c97908e4cd1b 1529s + enparents=1 1529s + : Packaging/SAME 668ecc18429ad51615759c319e10c97908e4cd1b 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet 668ecc18429ad51615759c319e10c97908e4cd1b..1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 -- :. ':!debian' 1529s + git diff --quiet 668ecc18429ad51615759c319e10c97908e4cd1b..1353d63d0ec4e50a8f1e1e1ce6f89c6203243722 -- :debian/patches 1529s + etypes=Packaging 1529s ++ printf %s 668ecc18429ad51615759c319e10c97908e4cd1b 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo 668ecc18429ad51615759c319e10c97908e4cd1b 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== 668ecc18429ad51615759c319e10c97908e4cd1b Packaging ===== 1529s + test 668ecc18429ad51615759c319e10c97908e4cd1b = 668ecc18429ad51615759c319e10c97908e4cd1b 1529s + local cetype=Packaging 1529s + '[' xPackaging = xPackaging ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P 668ecc18429ad51615759c319e10c97908e4cd1b 1529s + local parents=add117c3d765d5114f03f16b8a579cd6134a21da 1529s + expect=add117c3d765d5114f03f16b8a579cd6134a21da 1529s + enparents=1 1529s + : Packaging/SAME add117c3d765d5114f03f16b8a579cd6134a21da 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet add117c3d765d5114f03f16b8a579cd6134a21da..668ecc18429ad51615759c319e10c97908e4cd1b -- :. ':!debian' 1529s + git diff --quiet add117c3d765d5114f03f16b8a579cd6134a21da..668ecc18429ad51615759c319e10c97908e4cd1b -- :debian/patches 1529s + etypes=Packaging 1529s ++ printf %s add117c3d765d5114f03f16b8a579cd6134a21da 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo add117c3d765d5114f03f16b8a579cd6134a21da 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== add117c3d765d5114f03f16b8a579cd6134a21da Packaging ===== 1529s + test add117c3d765d5114f03f16b8a579cd6134a21da = add117c3d765d5114f03f16b8a579cd6134a21da 1529s + local cetype=Packaging 1529s + '[' xPackaging = xPackaging ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P add117c3d765d5114f03f16b8a579cd6134a21da 1529s + local parents=4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1529s + expect=4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1529s + enparents=1 1529s + : Packaging/SAME 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet 4fac284b9a57ca57ecdeffa6278dea2759cd00e9..add117c3d765d5114f03f16b8a579cd6134a21da -- :. ':!debian' 1529s + git diff --quiet 4fac284b9a57ca57ecdeffa6278dea2759cd00e9..add117c3d765d5114f03f16b8a579cd6134a21da -- :debian/patches 1529s + etypes=Packaging 1529s ++ printf %s 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 Packaging ===== 1529s + test 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 = 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1529s + local cetype=Packaging 1529s + '[' xPackaging = xPackaging ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P 4fac284b9a57ca57ecdeffa6278dea2759cd00e9 1529s + local parents=6820a0900873c206f54cab6ac552afb016b49205 1529s + expect=6820a0900873c206f54cab6ac552afb016b49205 1529s + enparents=1 1529s + : Packaging/SAME 6820a0900873c206f54cab6ac552afb016b49205 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet 6820a0900873c206f54cab6ac552afb016b49205..4fac284b9a57ca57ecdeffa6278dea2759cd00e9 -- :. ':!debian' 1529s + git diff --quiet 6820a0900873c206f54cab6ac552afb016b49205..4fac284b9a57ca57ecdeffa6278dea2759cd00e9 -- :debian/patches 1529s + etypes=Packaging 1529s ++ printf %s 6820a0900873c206f54cab6ac552afb016b49205 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo 6820a0900873c206f54cab6ac552afb016b49205 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== 6820a0900873c206f54cab6ac552afb016b49205 Packaging ===== 1529s + test 6820a0900873c206f54cab6ac552afb016b49205 = 6820a0900873c206f54cab6ac552afb016b49205 1529s + local cetype=Packaging 1529s + '[' xPackaging = xPackaging ']' 1529s + cetype=SAME 1529s ++ git log -n1 --pretty=format:%P 6820a0900873c206f54cab6ac552afb016b49205 1529s + local parents=db129944b7f434b59509f6c007624fd8a89fe823 1529s + expect=db129944b7f434b59509f6c007624fd8a89fe823 1529s + enparents=1 1529s + : Packaging/SAME db129944b7f434b59509f6c007624fd8a89fe823 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet db129944b7f434b59509f6c007624fd8a89fe823..6820a0900873c206f54cab6ac552afb016b49205 -- :. ':!debian' 1529s + git diff --quiet db129944b7f434b59509f6c007624fd8a89fe823..6820a0900873c206f54cab6ac552afb016b49205 -- :debian/patches 1529s + etypes=Packaging 1529s ++ printf %s db129944b7f434b59509f6c007624fd8a89fe823 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo db129944b7f434b59509f6c007624fd8a89fe823 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== db129944b7f434b59509f6c007624fd8a89fe823 Changelog ===== 1529s + test db129944b7f434b59509f6c007624fd8a89fe823 = db129944b7f434b59509f6c007624fd8a89fe823 1529s + local cetype=Packaging 1529s + '[' xChangelog = xPackaging ']' 1529s ++ git log -n1 --pretty=format:%P db129944b7f434b59509f6c007624fd8a89fe823 1529s + local parents=eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1529s + expect=eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1529s + enparents=1 1529s + : Changelog/Packaging eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2..db129944b7f434b59509f6c007624fd8a89fe823 -- :. ':!debian/changelog' 1529s + etypes=Packaging 1529s ++ printf %s eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 Changelog ===== 1529s + test eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 = eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1529s + local cetype=Packaging 1529s + '[' xChangelog = xPackaging ']' 1529s ++ git log -n1 --pretty=format:%P eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 1529s + local parents=48c55fcd6aad3671faeeedd232289eea48db8cce 1529s + expect=48c55fcd6aad3671faeeedd232289eea48db8cce 1529s + enparents=1 1529s + : Changelog/Packaging 48c55fcd6aad3671faeeedd232289eea48db8cce 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + git diff --quiet 48c55fcd6aad3671faeeedd232289eea48db8cce..eb31c70729dddc9aa0b04ec8f2c36319da6ff9f2 -- :. ':!debian/changelog' 1529s + etypes=Packaging 1529s ++ printf %s 48c55fcd6aad3671faeeedd232289eea48db8cce 1529s ++ wc -w 1529s + local cnparents=1 1529s + test 1 = 1 1529s ++ for f in $parents 1529s ++ echo 48c55fcd6aad3671faeeedd232289eea48db8cce 1529s ++ wc -w 1529s ++ t-sort -u 1529s ++ LC_COLLATE=C 1529s ++ sort -u 1529s + local cndparents=1 1529s + test 1 = 1 1529s + case "$parents" in 1529s + case "$ctype" in 1529s + read cid ctype info 1529s + : ===== 48c55fcd6aad3671faeeedd232289eea48db8cce Anchor ===== 1529s + test 48c55fcd6aad3671faeeedd232289eea48db8cce = 48c55fcd6aad3671faeeedd232289eea48db8cce 1529s + local cetype=Packaging 1529s + '[' xAnchor = xPackaging ']' 1529s ++ git log -n1 --pretty=format:%P 48c55fcd6aad3671faeeedd232289eea48db8cce 1529s + local 'parents=23886cf8bbaefa175a2403d6556564175e096c16 c503a3d8e91a8fe38919c1795f29cacc3a671c3e' 1529s + expect='23886cf8bbaefa175a2403d6556564175e096c16 c503a3d8e91a8fe38919c1795f29cacc3a671c3e' 1529s + enparents=1 1529s + : Anchor/Packaging '23886cf8bbaefa175a2403d6556564175e096c16 c503a3d8e91a8fe38919c1795f29cacc3a671c3e' 1529s + case "$ctype/$cetype" in 1529s + case "$ctype/$etypes" in 1529s + case "$cetype" in 1529s + case "$ctype" in 1529s + break 1529s + parent_ix=2 1529s + return 1529s + t-dgit quilt-fixup 1529s + local dgit=dgit 1529s + pwd 1529s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1529s + : ' 1529s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1529s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A quilt-fixup 1529s | git rev-parse --show-toplevel 1529s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1529s | git config -z --get-regexp --local '.*' 1529s | git config -z --get-regexp --local '.*' 1529s | git config -z --get-regexp --global '.*' 1529s | git config -z --get-regexp --system '.*' 1529s format 3.0 (quilt), quilt mode linear 1529s Format `3.0 (quilt)', need to check/update patch stack 1529s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1529s => `' 1529s + git diff --quiet HEAD 1529s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 1529s dpkg-buildpackage: info: source package example 1529s dpkg-buildpackage: info: source version 2.1-1 1529s dpkg-buildpackage: info: source distribution UNRELEASED 1529s dpkg-buildpackage: info: source changed by dgit test git user 1529s fakeroot debian/rules clean 1529s EXAMPLE RULES TARGET clean 1529s dh_clean 1529s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 1529s | git clean -dn 1529s => `' 1529s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1529s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1529s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1529s | git rev-parse 'HEAD~0' 1529s => `c2748354923b4f8e082f565f79623c63aeff0bac' 1529s | git symbolic-ref -q HEAD 1529s => `refs/heads/master' 1529s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1529s CD work 1529s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1529s + git reset -q --hard c2748354923b4f8e082f565f79623c63aeff0bac 1529s examining quilt state (multiple patches, linear mode) 1529s branch_is_gdr c2748354923b4f8e082f565f79623c63aeff0bac... 1530s branch_is_gdr 436a0a77136d4a0967c7942041b8e4fe0d56f28f gdr merged-breakwater YES 1530s + git reset -q --hard c2748354923b4f8e082f565f79623c63aeff0bac 1530s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1530s HEAD is now at db27877 Commit patch queue (exported by git-debrebase) 1530s | git rev-parse 'HEAD~0' 1530s => `db27877612f0d26c299274ddc50c1319f495918e' 1530s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 1530s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1530s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 1530s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1530s CD fake 1530s | find -name .git -prune -print0 1530s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1531s + git checkout -f db27877612f0d26c299274ddc50c1319f495918e -- debian 1531s + git add -Af . 1531s | git write-tree 1531s => `b65fbda202442ce5fb2d9fcbb9a17fa7952408dc' 1531s fake orig tree object b65fbda202442ce5fb2d9fcbb9a17fa7952408dc 1531s CD .. 1531s + git reset -q --hard db27877612f0d26c299274ddc50c1319f495918e 1531s CD ../fake 1531s + git add -Af . 1531s | git write-tree 1531s => `1e473a8c2afe132a4fac6a676020f90f82e07240' 1531s fake o+d/p tree object b65fbda202442ce5fb2d9fcbb9a17fa7952408dc 1531s CD ../work 1531s | git ls-tree --name-only -z db27877612f0d26c299274ddc50c1319f495918e 1531s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src-other.c\x00src-us.c\x00src.c\x00' 1531s | git diff-tree -z --no-renames -r b65fbda202442ce5fb2d9fcbb9a17fa7952408dc db27877612f0d26c299274ddc50c1319f495918e 1531s => `: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' 1531s quiltify_trees_differ b65fbda202442ce5fb2d9fcbb9a17fa7952408dc db27877612f0d26c299274ddc50c1319f495918e => 1 1531s | git diff-tree -z --no-renames --name-only -r db27877612f0d26c299274ddc50c1319f495918e 1e473a8c2afe132a4fac6a676020f90f82e07240 1531s => `' 1531s quiltify_trees_differ db27877612f0d26c299274ddc50c1319f495918e 1e473a8c2afe132a4fac6a676020f90f82e07240 => 0 1531s | git diff-tree -z --no-renames --name-only -r b65fbda202442ce5fb2d9fcbb9a17fa7952408dc 1e473a8c2afe132a4fac6a676020f90f82e07240 1531s => `lib.c\x00new-upstream-file\x00src-other.c\x00src-us.c\x00src.c\x00' 1531s quiltify_trees_differ b65fbda202442ce5fb2d9fcbb9a17fa7952408dc 1e473a8c2afe132a4fac6a676020f90f82e07240 => 1 1531s differences @dl ## ## == == == ==. 1531s dgit: base trees orig=b65fbda202442ce5fb2d o+d/p=1e473a8c2afe132a4fac 1531s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1531s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1531s starting quiltify (multiple patches, linear mode) 1531s | git ls-tree --name-only db27877612f0d26c299274ddc50c1319f495918e -- debian/rules debian/control 1531s => `debian/control'... 1531s quiltify investigate db27877612f0d26c299274ddc50c1319f495918e 1531s | git diff-tree -z --no-renames --name-only db27877612f0d26c299274ddc50c1319f495918e 1e473a8c2afe132a4fac6a676020f90f82e07240 1531s => `' 1531s quiltify_trees_differ db27877612f0d26c299274ddc50c1319f495918e 1e473a8c2afe132a4fac6a676020f90f82e07240 => 0 1531s search finished hooray! 1531s quiltify linearisation planning successful, executing... 1531s + git checkout -q master 1531s | git status --ignored --porcelain 1531s => `?? .pc/' 1531s nothing quilty to commit, ok. 1531s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1531s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1531s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1531s ' 1531s + t-gdr-made-patches 1531s + egrep '^\[git-debrebase' 1531s + git log -n1 --pretty=format:%B 1531s [git-debrebase make-patches: export and commit patches] 1531s + t-ok 1531s + : ======================================== 1531s + t-check-only-bpd 1531s + '[' .. = .. ']' 1531s + return 1531s + t-fscks 1531s + shopt -s nullglob 1531s + for d in $tmp/*/.git $tmp/git/*.git 1531s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1531s + t-git-fsck 1531s ++ git rev-parse --git-dir 1531s + local fsckerrs=.git/dgit-test-fsck.errs 1531s + set +e 1531s + tee .git/dgit-test-fsck.errs 1531s + LC_MESSAGES=C 1531s + git fsck --no-dangling --strict 1531s + ps='0 0' 1531s + set -e 1531s + local pats 1531s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1531s + test '0 0' = '0 0' 1531s + pats+=(-e 'notice: HEAD points to an unborn branch') 1531s + pats+=(-e 'notice: No default references') 1531s + set +e 1531s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1531s + rc=1 1531s + set -e 1531s + case $rc in 1531s + t-save-artifacts 1531s + artifacts=/tmp/autopkgtest.XK8uun/gdr-merge-artifacts 1531s + '[' x/tmp/autopkgtest.XK8uun/gdr-merge-artifacts = x ']' 1531s + '[' xtmp = x ']' 1531s + GZIP=-1v 1531s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-merge-artifacts/gdr-merge.tar.gz '--exclude=*.tar' . 1531s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1531s 81.8% 1531s + echo ok. 1531s ok. 1531s + rc=0 1531s + set +x 1531s + set +e 1531s + pwd 1531s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1531s + '[' x '!=' x ']' 1531s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1531s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1531s + set -e 1531s + test 0 = 0 1531s autopkgtest [23:12:41]: test gdr-merge: -----------------------] 1532s autopkgtest [23:12:42]: test gdr-merge: - - - - - - - - - - results - - - - - - - - - - 1532s gdr-merge PASS 1532s autopkgtest [23:12:42]: test gdr-subcommands: preparing testbed 1533s Reading package lists... 1533s Building dependency tree... 1533s Reading state information... 1533s Starting pkgProblemResolver with broken count: 0 1533s Starting 2 pkgProblemResolver with broken count: 0 1533s Done 1533s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1534s autopkgtest [23:12:44]: test gdr-subcommands: [----------------------- 1535s ++ set -o pipefail 1535s ++ . tests/lib-core 1535s ++ . tests/lib-restricts 1535s ++ trap ' 1535s rc=$? 1535s set +x 1535s test $rc = 0 || echo " 1535s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1535s 1535s Most relevant logs are just before assignment rc=$rc 1535s Will now do cleanup etc. 1535s " 1535s set -x 1535s set +e 1535s pwd 1535s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1535s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1535s set -e 1535s test $rc = 0 || t-report-failure 1535s ' EXIT 1535s ++ t-filter-out-git-hyphen-dir 1535s ++ local pathent 1535s +++ type -p git-rev-parse 1535s +++ : 1535s ++ pathent= 1535s ++ case "$pathent" in 1535s ++ return 1535s ++ t-set-intree 1535s ++ '[' x = x ']' 1535s ++ return 1535s ++ : -D 1535s ++ export DGIT_TEST_DEBUG 1535s ++ : x 1535s ++ export DGIT_TEST_DEBPUSH_DEBUG 1535s ++ : 1535s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1535s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1535s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1535s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1535s ++ export LC_CTYPE=C.UTF-8 1535s ++ LC_CTYPE=C.UTF-8 1535s ++ unset CDPATH 1535s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1535s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1535s +++ pwd 1535s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1535s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1535s ++ testname=gdr-subcommands 1535s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1535s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1535s ++ bpd=.. 1535s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1535s ++ '[' x '!=' x ']' 1535s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s +++ pwd 1535s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ t-set-using-tmp 1535s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1535s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1535s ++ export 'DEBFULLNAME=dgit test git user' 1535s ++ DEBFULLNAME='dgit test git user' 1535s ++ git config --global user.email dgit-test@debian.example.net 1535s ++ git config --global user.name 'dgit test git user' 1535s ++ git config --global protocol.ext.allow always 1535s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1535s ++ env -0 1535s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1535s ++ export DEBCHANGE_VENDOR=dpkg 1535s ++ DEBCHANGE_VENDOR=dpkg 1535s ++ unset VISUAL 1535s ++ unset GIT_EDITOR 1535s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1535s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1535s ++ cat 1535s ++ schroot=build 1535s ++ : aq 1535s ++ : archive/test-dummy 1535s ++ : sid:unstable 1535s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1535s ++ git config --global dgit.default.old-dsc-distro test-dummy 1535s ++ for import in ${autoimport-gnupg} 1535s ++ case "$0" in 1535s ++ t-setup-import gnupg 1535s ++ local setupname=gnupg 1535s ++ local setupsrc 1535s ++ local lock 1535s ++ '[' x = x ']' 1535s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1535s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1535s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1535s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1535s cd "$1"; shift 1535s setupname="$1"; shift 1535s simport="$1"; shift 1535s if [ -e "$simport" ]; then exit 0; fi 1535s env - "$@" \ 1535s "tests/setup/$setupname" 1535s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1535s + cd /tmp/autopkgtest.XK8uun/build.980/src 1535s + shift 1535s + setupname=gnupg 1535s + shift 1535s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1535s + shift 1535s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1535s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-subcommands-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-subcommands-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-subcommands-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-subcommands -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-subcommands' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-subcommands-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1535s ++ set -o pipefail 1535s ++ . tests/lib-core 1535s ++ . tests/lib-restricts 1535s ++ trap ' 1535s rc=$? 1535s set +x 1535s test $rc = 0 || echo " 1535s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1535s 1535s Most relevant logs are just before assignment rc=$rc 1535s Will now do cleanup etc. 1535s " 1535s set -x 1535s set +e 1535s pwd 1535s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1535s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1535s set -e 1535s test $rc = 0 || t-report-failure 1535s ' EXIT 1535s ++ t-filter-out-git-hyphen-dir 1535s ++ local pathent 1535s +++ type -p git-rev-parse 1535s +++ : 1535s ++ pathent= 1535s ++ case "$pathent" in 1535s ++ return 1535s ++ t-set-intree 1535s ++ '[' x = x ']' 1535s ++ return 1535s ++ : -D 1535s ++ export DGIT_TEST_DEBUG 1535s ++ : x 1535s ++ export DGIT_TEST_DEBPUSH_DEBUG 1535s ++ : 1535s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1535s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1535s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1535s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1535s ++ export LC_CTYPE=C.UTF-8 1535s ++ LC_CTYPE=C.UTF-8 1535s ++ unset CDPATH 1535s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1535s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1535s +++ pwd 1535s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1535s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1535s ++ testname=gnupg 1535s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1535s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1535s ++ bpd=.. 1535s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1535s ++ '[' x '!=' x ']' 1535s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s +++ pwd 1535s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ t-set-using-tmp 1535s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1535s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1535s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1535s ++ export 'DEBFULLNAME=dgit test git user' 1535s ++ DEBFULLNAME='dgit test git user' 1535s ++ git config --global user.email dgit-test@debian.example.net 1535s ++ git config --global user.name 'dgit test git user' 1535s ++ git config --global protocol.ext.allow always 1535s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1535s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1535s ++ export DEBCHANGE_VENDOR=dpkg 1535s ++ DEBCHANGE_VENDOR=dpkg 1535s ++ unset VISUAL 1535s ++ unset GIT_EDITOR 1535s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1535s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1535s ++ cat 1535s ++ schroot=build 1535s ++ : aq 1535s ++ : archive/test-dummy 1535s ++ : sid:unstable 1535s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1535s ++ git config --global dgit.default.old-dsc-distro test-dummy 1535s ++ for import in ${autoimport-gnupg} 1535s ++ case "$0" in 1535s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1535s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1535s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1535s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1535s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1535s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1535s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1535s + setup=' 1535s export GNUPGHOME=$tmp/gnupg 1535s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1535s 1535s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1535s ssb rsa2048 2013-11-17 [E] 1535s 1535s sec rsa2048 2014-01-26 [SC] 1535s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1535s uid [ultimate] Populus Romanus (test key) 1535s ssb rsa2048 2014-01-26 [E] 1535s 1535s sec rsa2048 2014-01-26 [SC] 1535s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1535s uid [ unknown] Hannibal (test key) 1535s ssb rsa2048 2014-01-26 [E] 1535s 1535s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1535s export GNUPGHOME=$tmp/gnupg 1535s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1535s 1535s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 1535s delete mode 100644 debian/source/format 1535s + git tag v1.0 1535s + : 'fake up that our quilt-tip was descended from upstream' 1535s + git checkout quilt-tip 1535s Switched to branch 'quilt-tip' 1535s + git merge --no-edit -s ours upstream 1535s Merge made by the 'ours' strategy. 1535s + : 'fake up that our quilt-tip had the patch queue in it' 1535s + git checkout patch-queue/quilt-tip 1535s Switched to branch 'patch-queue/quilt-tip' 1535s + gbp pq export 1535s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1535s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1535s + git add debian/patches 1535s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 1535s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 1535s 4 files changed, 50 insertions(+) 1535s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1535s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1535s create mode 100644 debian/patches/series 1535s create mode 100644 debian/patches/subdir/addnewups 1535s + : 'make branch names more conventional' 1535s + git branch -D master 1535s Deleted branch master (was 17d67db). 1535s + git branch -m quilt-tip master 1535s + not-gdr-processable origin 1535s + git branch gdr-unprocessable/origin 1535s + t-git-debrebase analyse 1535s + local gdr=git-debrebase 1535s + : ' 1535s + grep 'Unknown Unprocessable' 1535s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1535s + git-debrebase --dgit=dgit -D analyse 1535s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 1535s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1535s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1535s git-debrebase = AddPatches {"Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Parents" => [{"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0}],"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1535s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1535s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1535s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1535s git-debrebase = Pseudomerge {"Contributor" => {"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0},"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Msg" => "Merge branch 'upstream' into quilt-tip\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Overwritten" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"Type" => "Pseudomerge","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1535s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1535s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1535s git-debrebase = Upstream {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"Type" => "Upstream","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n"} 1536s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1536s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1536s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Parents" => [{"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Ix" => 0}],"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Type" => "Mixed"} 1536s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1536s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1536s git-debrebase = Packaging {"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0}],"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Msg" => "echo EXAMPLE RULES TARGET\n","Type" => "Packaging"} 1536s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1536s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1536s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Msg" => "WIP\n","Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Type" => "Packaging"} 1536s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1536s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1536s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "WIP\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}],"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n"} 1536s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1536s git-debrebase ** Unknown 1536s git-debrebase *** WALK BOMB unrecognised 1536s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1536s ' 1536s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1536s + : 'fake up an upstream 2.0' 1536s + git branch make-upstream upstream 1536s + t-make-new-upstream-tarball 2.0 1536s + local uv=2.0 1536s + git checkout make-upstream 1536s Switched to branch 'make-upstream' 1536s + echo 'upstream 2.0' 1536s + git commit -a -m 'upstream 2.0 tarball' 1536s [make-upstream 4db56a8] upstream 2.0 tarball 1536s 1 file changed, 1 insertion(+) 1536s + t-make-orig example 2.0 make-upstream 1536s + local p=example 1536s + local v=2.0 1536s + local tag=make-upstream 1536s + ust=example_2.0.orig.tar.gz 1536s + GZIP=-1 1536s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1536s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1536s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1536s + git branch -D quilt-tip-2 1536s Deleted branch quilt-tip-2 (was 99fcab4). 1536s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1536s + git branch -D gitish-only 1536s Deleted branch gitish-only (was 2b2ddc8). 1536s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1536s + git branch -D quilt-tip-1.1 1536s Deleted branch quilt-tip-1.1 (was 7fc34be). 1536s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1536s + git branch -D patch-queue/quilt-tip 1536s Deleted branch patch-queue/quilt-tip (was d843a68). 1536s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1536s + git branch -D indep-arch 1536s Deleted branch indep-arch (was e215729). 1536s + : 'see what gbp import-orig does' 1536s + git checkout master 1536s Switched to branch 'master' 1536s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1536s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1536s gbp:info: Source package is example 1536s gbp:info: Upstream version is 2.0 1536s gbp:info: Replacing upstream source on 'master' 1536s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1536s + not-gdr-processable merge 1536s + git branch gdr-unprocessable/merge 1536s + t-git-debrebase analyse 1536s + local gdr=git-debrebase 1536s + grep 'Unknown Unprocessable' 1536s + : ' 1536s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1536s + git-debrebase --dgit=dgit -D analyse 1536s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 1536s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1536s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1536s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1536s git-debrebase ** Unknown 1536s git-debrebase *** WALK BOMB unrecognised 1536s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1536s ' 1536s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 1536s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1536s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1536s + DEBEMAIL=dgit-tests@example.org 1536s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1536s + 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) 1536s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1536s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1536s 1 file changed, 6 insertions(+) 1536s + t-dch-commit-r 1536s + t-dch-r-rune t-dch-commit 1536s + local cmd=t-dch-commit 1536s + shift 1536s + local suite=unstable 1536s + t-dch-commit -r -D unstable '' 1536s + t-debchange -r -D unstable '' 1536s + DEBEMAIL=dgit-tests@example.org 1536s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1536s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1536s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1536s libdistro-info-perl is not installed, Debian release names are not known. 1536s libdistro-info-perl is not installed, Ubuntu release names are not known. 1536s + git commit -m 'dch -r -D unstable ' debian/changelog 1536s [master f31021f] dch -r -D unstable 1536s 1 file changed, 3 insertions(+), 2 deletions(-) 1536s + echo garbage 1536s + git add debian/patches/garbage 1536s + git commit -m 'add garbage' debian/patches/garbage 1536s [master eb10718] add garbage 1536s 1 file changed, 1 insertion(+) 1536s create mode 100644 debian/patches/garbage 1536s + t-archive-none example 1536s + t-select-package example 1536s + p=example 1536s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1536s + t-archive-none-aq 1536s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 1536s + : 1536s + local 'jsondelim=[' 1536s + local suitespec 1536s + for suitespec in $suitespecs 1536s + local suite=sid 1536s + local sname=unstable 1536s + t-aq-archive-updated sid example 1536s + local suite=sid 1536s + local p=example 1536s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1536s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1536s + perl -wne ' 1536s use JSON; 1536s use strict; 1536s our @v; 1536s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1536s push @v, { 1536s "version" => "$1", 1536s "sha256sum" => "$2", 1536s "component" => "$3", 1536s "filename" => "$4", 1536s }; 1536s END { 1536s my $json = JSON->new->canonical(); 1536s print $json->encode(\@v) or die $!; 1536s } 1536s ' 1536s + t-aq-archive-updated new example 1536s + local suite=new 1536s + local p=example 1536s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1536s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1536s + perl -wne ' 1536s use JSON; 1536s use strict; 1536s our @v; 1536s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1536s push @v, { 1536s "version" => "$1", 1536s "sha256sum" => "$2", 1536s "component" => "$3", 1536s "filename" => "$4", 1536s }; 1536s END { 1536s my $json = JSON->new->canonical(); 1536s print $json->encode(\@v) or die $!; 1536s } 1536s ' 1536s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1536s + cat 1536s + jsondelim=' },' 1536s + cat 1536s + t-git-none 1536s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1536s + set -e 1536s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1536s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1536s + t-dgit -wgf --gbp push-source --new 1536s + local dgit=dgit 1536s + pwd 1536s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1536s + : ' 1536s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1536s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 1536s | git rev-parse --show-toplevel 1536s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1536s | git config -z --get-regexp --local '.*' 1536s | git config -z --get-regexp --local '.*' 1536s | git config -z --get-regexp --global '.*' 1536s | git config -z --get-regexp --system '.*' 1536s format 3.0 (quilt), quilt mode gbp 1536s Format `3.0 (quilt)', need to check/update patch stack 1536s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1536s => `' 1536s + git diff --quiet HEAD 1536s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1536s canonical suite name for unstable is sid 1536s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1536s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1536s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1536s | git rev-parse 'HEAD~0' 1536s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1536s | git symbolic-ref -q HEAD 1536s => `refs/heads/master' 1536s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1536s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1536s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1536s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1536s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1536s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 20f40917e11967ad25e5ed4571c6ab071fd28cf79c899de1d29ae407cec97db8 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1536s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1536s >(no reflog) 1536s splitbrain cache miss 1536s CD work 1536s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1536s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1536s + git checkout -q -b dgit-view 1536s examining quilt state (multiple patches, gbp mode) 1536s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1537s CD fake 1537s | find -name .git -prune -print0 1537s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1537s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 1537s + git add -Af . 1537s | git write-tree 1537s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 1537s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1537s CD .. 1537s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1537s CD ../fake 1537s + git add -Af . 1537s | git write-tree 1537s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1537s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1537s CD ../work 1537s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 1537s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 1537s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 1537s => `' 1537s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 1537s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 1537s => `lib.c\x00new-upstream-file\x00src.c\x00' 1537s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1537s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 1537s => `lib.c\x00new-upstream-file\x00src.c\x00' 1537s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1537s differences @dl == ## ## == == ==. 1537s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 1537s dgit: quilt differences: src: == orig ## gitignores: == orig == 1537s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1537s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1537s => `1530000000 +0000' 1537s dgit view: creating patches-applied version using gbp pq 1537s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 1537s + git update-ref refs/heads/dgit-view HEAD 1537s + git checkout -q dgit-view 1537s | git rev-parse 'HEAD~0' 1537s => `45ea71a69fa522ce760afdab8a420200443753e9' 1537s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1537s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 1537s => `' 1537s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 20f40917e11967ad25e5ed4571c6ab071fd28cf79c899de1d29ae407cec97db8 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 1537s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 1537s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1537s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1537s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1537s | git rev-parse 'HEAD~0' 1537s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1537s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1537s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1537s dpkg-source: info: using source format '3.0 (quilt)' 1537s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1537s dpkg-source: info: using patch list from debian/patches/series 1537s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 1537s dpkg-source: info: building example in example_2.0-1.dsc 1537s CD work 1537s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1537s package seems new, not specifying -v 1537s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 1537s dpkg-genchanges: info: not including original source code in upload 1537s CD .. 1537s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1537s renaming (Files) example_2.0.orig.tar.gz 1537s renaming (Files) example_2.0-1.debian.tar.xz 1537s renaming (dsc) example_2.0-1.dsc 1537s renaming (changes) example_2.0-1_source.changes 1537s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1537s actually entering push 1537s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1537s => `0' 1537s + git config remote.dgit.skipdefaultupdate true 1537s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1537s get_archive_dsc: nothing in archive, returning undef 1537s no version available from the archive 1537s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1537s => `' 1537s previous reference hash= 1537s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1537s => `' 1537s fetch_from_archive: lastfetch= 1537s nothing found! 1537s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1537s + git check-ref-format archive/test-dummy/2.0-1 1537s | git symbolic-ref -q HEAD 1537s => `refs/heads/master' 1537s | git rev-parse 'HEAD~0' 1537s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1537s ffq_prev_branchinfo branch current refs/heads/master 1537s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1537s => `' 1537s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1537s => `' 1537s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1537s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1537s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1537s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1537s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1537s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 20f40917e11967ad25e5ed4571c6ab071fd28cf79c899de1d29ae407cec97db8 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1537s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1537s CD work 1537s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1537s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1537s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1537s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 1537s splitbrain_pseudomerge... 1537s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1537s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1537s => `' 1537s + git diff --quiet HEAD 1537s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 1537s => `' 1537s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1537s checking that example_2.0-1.dsc corresponds to HEAD 1537s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc 1537s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc) 1537s dpkg-source: info: extracting example in example-2.0 1537s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1537s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 1537s dpkg-source: info: using patch list from debian/patches/series 1537s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1537s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1537s dpkg-source: info: applying subdir/addnewups 1537s CD example-2.0 1537s | find -name .git -prune -print0 1537s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1538s + git add -Af . 1538s | git write-tree 1538s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1538s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1538s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1538s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1538s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1538s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 1538s files_compare_inputs example_2.0-1.dsc 1538s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 1538s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1538s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 1538s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 1538s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1538s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 1538s files_compare_inputs example_2.0-1.dsc Files 1538s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 1538s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 1538s files_compare_inputs example_2.0-1_source.changes 1538s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 1538s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 1538s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 1538s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 1538s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 1538s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 1538s files_compare_inputs example_2.0-1_source.changes Files 1538s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 1538s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 1538s checking origs needed (2.0)... 1538s checking origs needed placement 'devel extra'... 1538s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1538s origs example_2.0.orig.tar.gz is_orig 1538s -| sh -ec 'cd "$1"; shift 1538s 1538s find -name "$1" -print0 | 1538s xargs -0r sha256sum 1538s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1538s origs example_2.0.orig.tar.gz $#$have=-1 1538s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1538s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 1538s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1538s push_tagwants: $VAR1 = [ 1538s '2.0-1', 1538s '45ea71a69fa522ce760afdab8a420200443753e9', 1538s 'eb10718ab213ccfa83613ebbddefbffda941a548', 1538s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1538s ]; 1538s $VAR2 = [ 1538s { 1538s 'View' => 'dgit', 1538s 'TagFn' => sub { "DUMMY" }, 1538s 'Tfn' => sub { "DUMMY" }, 1538s 'Tag' => 'archive/test-dummy/2.0-1', 1538s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1538s 'TfSuffix' => '' 1538s }, 1538s { 1538s 'TagFn' => sub { "DUMMY" }, 1538s 'View' => 'maint', 1538s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 1538s 'TfSuffix' => '-maintview', 1538s 'Tag' => 'test-dummy/2.0-1', 1538s 'Tfn' => sub { "DUMMY" } 1538s } 1538s ]; 1538s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1538s => `1530000000 +0000' 1538s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1538s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1538s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1538s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 1538s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1538s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 1538s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1538s => `2ac4b0d013b82664602ee9889a0a530356bb26ed' 1538s + git verify-tag 2ac4b0d013b82664602ee9889a0a530356bb26ed 1538s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1538s gpg: Signature made Mon Mar 31 23:12:48 2025 UTC 1538s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1538s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1538s gpg: WARNING: This key is not certified with a trusted signature! 1538s gpg: There is no indication that the signature belongs to the owner. 1538s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1538s + git update-ref refs/tags/archive/test-dummy/2.0-1 2ac4b0d013b82664602ee9889a0a530356bb26ed 1538s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 1538s => `12582ce674f91ab851247353b572f25513b178b1' 1538s + git verify-tag 12582ce674f91ab851247353b572f25513b178b1 1538s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1538s gpg: Signature made Mon Mar 31 23:12:48 2025 UTC 1538s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1538s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1538s gpg: WARNING: This key is not certified with a trusted signature! 1538s gpg: There is no indication that the signature belongs to the owner. 1538s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1538s + git update-ref refs/tags/test-dummy/2.0-1 12582ce674f91ab851247353b572f25513b178b1 1538s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1538s => `0' 1538s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 1538s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 1538s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1538s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 1538s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 1538s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 1538s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 1538s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 1538s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1538s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1538s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1538s 1538s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 1538s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1538s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1538s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1538s 1539s Successfully signed dsc, changes files 1539s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 1539s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1539s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1539s D: Setting host argument. 1539s Checking signature on .changes 1539s Checking signature on .dsc 1539s Uploading to test-dummy (via local to localhost): 1539s Successfully uploaded packages. 1539s dgit ok: pushed and uploaded 2.0-1 1539s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1539s del_lrfetchrefs... 1539s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1539s ' 1539s + t-salsa-add-remote 1539s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1539s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1539s + set -e 1539s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1539s + git init --bare 1539s hint: Using 'master' as the name for the initial branch. This default branch name 1539s hint: is subject to change. To configure the initial branch name to use in all 1539s hint: of your new repositories, which will suppress this warning, call: 1539s hint: 1539s hint: git config --global init.defaultBranch 1539s hint: 1539s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1539s hint: 'development'. The just-created branch can be renamed via this command: 1539s hint: 1539s hint: git branch -m 1539s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example/ 1539s + git remote add origin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1539s + git push --set-upstream origin master 1539s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1539s * [new branch] master -> master 1539s Branch 'master' set up to track remote branch 'master' from 'origin'. 1539s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1539s + local 'mpat=E:identical in upstream files' 1539s + shift 1539s + set +o pipefail 1539s + LC_MESSAGES=C 1539s + LANGUAGE=C 1539s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1539s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1539s + local gdr=git-debrebase 1539s + : ' 1539s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1539s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1539s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1539s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 1539s docs/README | 1 + 1539s 1 file changed, 1 insertion(+) 1539s 1539s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1539s git-debrebase: identical in upstream files. See diffstat above, or run 1539s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 1539s + local 'ps=255 0' 1539s + set -o pipefail 1539s + case $ps in 1539s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1539s + local 'mpat=E:identical in upstream files' 1539s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1539s + local grepper=fgrep 1539s + case "$mpat" in 1539s + case "$mpat" in 1539s + grepper=egrep 1539s + mpat='identical in upstream files' 1539s + egrep -e 'identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1539s git-debrebase: identical in upstream files. See diffstat above, or run 1539s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1539s + local 'mpat=E:Unused patch file garbage will be discarded' 1539s + shift 1539s + set +o pipefail 1539s + LC_MESSAGES=C 1539s + LANGUAGE=C 1539s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1539s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1539s + local gdr=git-debrebase 1539s + : ' 1539s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1539s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1539s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1539s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1539s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1539s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1539s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1539s $VAR2 = bless( do{\(my $o = { 1539s 'fields' => { 1539s 'Source' => 'example', 1539s 'Version' => '2.0-1', 1539s 'Distribution' => 'unstable', 1539s 'Urgency' => 'medium', 1539s 'Maintainer' => 'dgit test git user ', 1539s 'Timestamp' => '1530000000', 1539s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1539s 'Changes' => ' 1539s example (2.0-1) unstable; urgency=medium 1539s 1539s [ Ian Jackson ] 1539s * new upstream (did gbp import-orig)' 1539s }, 1539s 'out_order' => [], 1539s 'allow_duplicate' => 0, 1539s 'in_order' => [ 1539s 'Source', 1539s 'Version', 1539s 'Distribution', 1539s 'Urgency', 1539s 'Maintainer', 1539s 'Timestamp', 1539s 'Date', 1539s 'Changes' 1539s ], 1539s 'keep_duplicate' => 0, 1539s 'name' => 'debian/changelog, entry no.1', 1539s 'drop_empty' => 0, 1539s 'is_pgp_signed' => 0, 1539s 'allow_pgp' => 1 1539s })}, 'Dpkg::Control::Hash' ); 1539s last finished-looking changelog entry: (2.0-1) unstable 1539s will stitch in dgit view, archive/test-dummy/2.0-1 1539s git-debrebase: snags: 1 overriden by individual -f options 1539s 1539s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1539s + local 'ps=255 0' 1539s + set -o pipefail 1539s + case $ps in 1539s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1539s + local 'mpat=E:Unused patch file garbage will be discarded' 1539s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1539s + local grepper=fgrep 1539s + case "$mpat" in 1539s + case "$mpat" in 1539s + grepper=egrep 1539s + mpat='Unused patch file garbage will be discarded' 1539s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1539s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1539s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1539s + local gdr=git-debrebase 1539s + : ' 1539s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1539s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1539s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1539s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1539s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1539s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1539s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1539s $VAR2 = bless( do{\(my $o = { 1539s 'allow_duplicate' => 0, 1539s 'is_pgp_signed' => 0, 1539s 'in_order' => [ 1539s 'Source', 1539s 'Version', 1539s 'Distribution', 1539s 'Urgency', 1539s 'Maintainer', 1539s 'Timestamp', 1539s 'Date', 1539s 'Changes' 1539s ], 1539s 'keep_duplicate' => 0, 1539s 'out_order' => [], 1539s 'drop_empty' => 0, 1539s 'fields' => { 1539s 'Source' => 'example', 1539s 'Version' => '2.0-1', 1539s 'Distribution' => 'unstable', 1539s 'Urgency' => 'medium', 1539s 'Maintainer' => 'dgit test git user ', 1539s 'Timestamp' => '1530000000', 1539s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1539s 'Changes' => ' 1539s example (2.0-1) unstable; urgency=medium 1539s 1539s [ Ian Jackson ] 1539s * new upstream (did gbp import-orig)' 1539s }, 1539s 'allow_pgp' => 1, 1539s 'name' => 'debian/changelog, entry no.1' 1539s })}, 'Dpkg::Control::Hash' ); 1539s last finished-looking changelog entry: (2.0-1) unstable 1539s will stitch in dgit view, archive/test-dummy/2.0-1 1539s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1539s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1539s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1539s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 1540s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1540s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1540s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1540s git-debrebase ffq check_specs * 1540s git-debrebase ffq merge master 1540s git-debrebase ffq check_remote origin remote fetch/merge branch 1540s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1540s OK, you are ahead of refs/remotes/origin/master 1540s git-debrebase ffq check_remote undef remote push branch 1540s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1540s OK, you are ahead of refs/remotes/dgit/dgit/sid 1540s git-debrebase: snags: 2 overriden by individual -f options 1540s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 1540s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 1540s git-debrebase >$ 1540s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 1540s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1540s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1540s ' 1540s + git branch converted-from-gbp 1540s + v=2.0-2 1540s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1540s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1540s + DEBEMAIL=dgit-tests@example.org 1540s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1540s + 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 1540s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1540s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1540s 1 file changed, 6 insertions(+) 1540s + t-dch-commit-r 1540s + t-dch-r-rune t-dch-commit 1540s + local cmd=t-dch-commit 1540s + shift 1540s + local suite=unstable 1540s + t-dch-commit -r -D unstable '' 1540s + t-debchange -r -D unstable '' 1540s + DEBEMAIL=dgit-tests@example.org 1540s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1540s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1540s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1540s libdistro-info-perl is not installed, Debian release names are not known. 1540s libdistro-info-perl is not installed, Ubuntu release names are not known. 1540s + git commit -m 'dch -r -D unstable ' debian/changelog 1540s [master 4af0243] dch -r -D unstable 1540s 1 file changed, 1 insertion(+), 1 deletion(-) 1540s + t-dgit -wgf push-source --new 1540s + local dgit=dgit 1540s + pwd 1540s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1540s + : ' 1540s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1540s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 1540s | git rev-parse --show-toplevel 1540s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1540s | git config -z --get-regexp --local '.*' 1540s | git config -z --get-regexp --local '.*' 1540s | git config -z --get-regexp --global '.*' 1540s | git config -z --get-regexp --system '.*' 1540s format 3.0 (quilt), quilt mode linear 1540s Format `3.0 (quilt)', need to check/update patch stack 1540s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1540s => `' 1540s + git diff --quiet HEAD 1540s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1540s canonical suite name for unstable is sid 1540s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1540s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1540s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1540s | git rev-parse 'HEAD~0' 1540s => `4af0243f9227b0d695fbff38df345aca23969e2e' 1540s | git symbolic-ref -q HEAD 1540s => `refs/heads/master' 1540s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1540s CD work 1540s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1540s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1540s examining quilt state (multiple patches, linear mode) 1540s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 1540s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 1540s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1540s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1541s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 1541s | git rev-parse 'HEAD~0' 1541s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1541s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1541s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1541s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1541s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1541s CD fake 1541s | find -name .git -prune -print0 1541s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1541s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 1541s + git add -Af . 1541s | git write-tree 1541s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 1541s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1541s CD .. 1541s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1541s CD ../fake 1541s + git add -Af . 1541s | git write-tree 1541s => `607612c46d7ea5b66697b830f1a50f069061d460' 1541s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1541s CD ../work 1541s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1541s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1541s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1541s => `: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' 1541s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 1541s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1541s => `' 1541s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1541s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 1541s => `lib.c\x00new-upstream-file\x00src.c\x00' 1541s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 1541s differences @dl ## ## == == == ==. 1541s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 1541s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1541s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1541s starting quiltify (multiple patches, linear mode) 1541s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 1541s => `debian/control'... 1541s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1541s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1541s => `' 1541s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1541s search finished hooray! 1541s quiltify linearisation planning successful, executing... 1541s + git checkout -q master 1541s | git status --ignored --porcelain 1541s => `?? .pc/' 1541s nothing quilty to commit, ok. 1541s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1541s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1541s | git rev-parse 'HEAD~0' 1541s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1541s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1541s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1541s CD work 1541s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1541s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1541s CD .. 1541s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1541s dpkg-source: info: using source format '3.0 (quilt)' 1541s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1541s dpkg-source: info: using patch list from debian/patches/series 1541s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 1541s dpkg-source: info: building example in example_2.0-2.dsc 1541s CD work 1541s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1541s package seems new, not specifying -v 1541s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 1541s dpkg-genchanges: info: not including original source code in upload 1541s CD .. 1541s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1541s renaming (Files) example_2.0.orig.tar.gz 1541s renaming (Files) example_2.0-2.debian.tar.xz 1541s renaming (dsc) example_2.0-2.dsc 1541s renaming (changes) example_2.0-2_source.changes 1541s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1541s actually entering push 1541s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1541s => `1' 1541s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1541s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1541s git_lrfetch_sane iteration 0 1541s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1541s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 1541s => 2ac4b0d013b82664602ee9889a0a530356bb26ed refs/tags/archive/test-dummy/2.0-1 1541s => 12582ce674f91ab851247353b572f25513b178b1 refs/tags/test-dummy/2.0-1 1541s 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 1541s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1541s | git for-each-ref refs/dgit-fetch/test-dummy 1541s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 1541s |> 2ac4b0d013b82664602ee9889a0a530356bb26ed tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1541s |> 12582ce674f91ab851247353b572f25513b178b1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1541s git_lrfetch_sane: tidying any old suite lrfetchrefs 1541s | git for-each-ref refs/dgit-fetch/sid 1541s git_lrfetch_sane: git fetch --no-insane emulation complete 1541s $VAR1 = { 1541s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '12582ce674f91ab851247353b572f25513b178b1', 1541s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1541s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '2ac4b0d013b82664602ee9889a0a530356bb26ed' 1541s }; 1541s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1541s |> 2ac4b0d013b82664602ee9889a0a530356bb26ed tag refs/tags/archive/test-dummy/2.0-1 1541s currently refs/tags/archive/test-dummy/2.0-1=2ac4b0d013b82664602ee9889a0a530356bb26ed 1541s |> 12582ce674f91ab851247353b572f25513b178b1 tag refs/tags/test-dummy/2.0-1 1541s currently refs/tags/test-dummy/2.0-1=12582ce674f91ab851247353b572f25513b178b1 1541s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1541s |> 2ac4b0d013b82664602ee9889a0a530356bb26ed tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1541s offered refs/tags/archive/test-dummy/2.0-1=2ac4b0d013b82664602ee9889a0a530356bb26ed 1541s |> 12582ce674f91ab851247353b572f25513b178b1 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1541s offered refs/tags/test-dummy/2.0-1=12582ce674f91ab851247353b572f25513b178b1 1541s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1541s get_archive_dsc: nothing in archive, returning undef 1541s no version available from the archive 1541s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 1541s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 1541s 1541s Package not found in the archive, but has allegedly been pushed using dgit. 1541s Perhaps the upload is stuck in incoming. Using the version from git. 1541s 1541s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s fetch mergeinfos: 1541s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 1541s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 1541s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 1541s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 1541s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 1541s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 1541s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1541s + git check-ref-format archive/test-dummy/2.0-2 1541s | git symbolic-ref -q HEAD 1541s => `refs/heads/master' 1541s | git rev-parse 'HEAD~0' 1541s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1541s ffq_prev_branchinfo branch current refs/heads/master 1541s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1541s => `' 1541s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1541s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1541s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1541s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1541s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1541s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1541s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1541s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1541s | git status --ignored --porcelain 1541s => `' 1541s nothing quilty to commit, ok. 1541s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1541s => `' 1541s + git diff --quiet HEAD 1541s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1541s => `45ea71a69fa522ce760afdab8a420200443753e9' 1541s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 1541s => `' 1541s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1541s checking that example_2.0-2.dsc corresponds to HEAD 1541s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc 1541s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc) 1541s dpkg-source: info: extracting example in example-2.0 1541s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1542s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 1542s dpkg-source: info: using patch list from debian/patches/series 1542s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1542s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1542s dpkg-source: info: applying subdir/addnewups 1542s CD example-2.0 1542s | find -name .git -prune -print0 1542s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1542s + git add -Af . 1542s | git write-tree 1542s => `607612c46d7ea5b66697b830f1a50f069061d460' 1542s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1542s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1542s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1542s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1542s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1542s files_compare_inputs example_2.0-2.dsc 1542s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 1542s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1542s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 1542s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 1542s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1542s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 1542s files_compare_inputs example_2.0-2.dsc Files 1542s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 1542s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 1542s files_compare_inputs example_2.0-2_source.changes 1542s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 1542s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 1542s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 1542s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 1542s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 1542s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 1542s files_compare_inputs example_2.0-2_source.changes Files 1542s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 1542s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 1542s checking origs needed (2.0)... 1542s checking origs needed placement 'devel extra'... 1542s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1542s origs example_2.0.orig.tar.gz is_orig 1542s -| sh -ec 'cd "$1"; shift 1542s 1542s find -name "$1" -print0 | 1542s xargs -0r sha256sum 1542s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1542s origs example_2.0.orig.tar.gz $#$have=-1 1542s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1542s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 1542s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1542s push_tagwants: $VAR1 = [ 1542s '2.0-2', 1542s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1542s undef, 1542s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1542s ]; 1542s $VAR2 = [ 1542s { 1542s 'TagFn' => sub { "DUMMY" }, 1542s 'TfSuffix' => '', 1542s 'View' => 'dgit', 1542s 'Tag' => 'archive/test-dummy/2.0-2', 1542s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1542s 'Tfn' => sub { "DUMMY" } 1542s }, 1542s { 1542s 'TfSuffix' => '-dgit', 1542s 'View' => 'dgit', 1542s 'TagFn' => sub { "DUMMY" }, 1542s 'Tag' => 'test-dummy/2.0-2', 1542s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1542s 'Tfn' => sub { "DUMMY" } 1542s } 1542s ]; 1542s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1542s => `1530000000 +0000' 1542s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1542s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1542s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1542s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1542s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1542s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1542s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1542s => `e92210c34f1a1e1c8671211bf38e790ae6a45d8b' 1542s + git verify-tag e92210c34f1a1e1c8671211bf38e790ae6a45d8b 1542s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1542s gpg: Signature made Mon Mar 31 23:12:52 2025 UTC 1542s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1542s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1542s gpg: WARNING: This key is not certified with a trusted signature! 1542s gpg: There is no indication that the signature belongs to the owner. 1542s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1542s + git update-ref refs/tags/archive/test-dummy/2.0-2 e92210c34f1a1e1c8671211bf38e790ae6a45d8b 1542s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1542s => `d62b9605c24f15de3c77af4c0df157fa49290c99' 1542s + git verify-tag d62b9605c24f15de3c77af4c0df157fa49290c99 1542s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1542s gpg: Signature made Mon Mar 31 23:12:52 2025 UTC 1542s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1542s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1542s gpg: WARNING: This key is not certified with a trusted signature! 1542s gpg: There is no indication that the signature belongs to the owner. 1542s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1542s + git update-ref refs/tags/test-dummy/2.0-2 d62b9605c24f15de3c77af4c0df157fa49290c99 1542s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1542s => `1' 1542s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 1542s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1542s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 1542s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 1542s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 1542s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1542s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 1542s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1542s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1542s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1542s 1542s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 1542s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1542s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1542s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1543s 1543s Successfully signed dsc, changes files 1543s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 1543s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1543s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1543s D: Setting host argument. 1543s Checking signature on .changes 1543s Checking signature on .dsc 1543s Package includes an .orig.tar.gz file although the debian revision suggests 1543s that it might not be required. Multiple uploads of the .orig.tar.gz may be 1543s rejected by the upload queue management software. 1543s Uploading to test-dummy (via local to localhost): 1543s Successfully uploaded packages. 1543s dgit ok: pushed and uploaded 2.0-2 1543s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1543s del_lrfetchrefs... 1543s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 1543s del_lrfetchrefs: 2ac4b0d013b82664602ee9889a0a530356bb26ed refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1543s del_lrfetchrefs: 12582ce674f91ab851247353b572f25513b178b1 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1543s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1543s ' 1543s + git push 1543s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1543s eb10718..6b22dd5 master -> master 1543s + cd .. 1543s + t-archive-process-incoming sid 1543s + local suite=sid 1543s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1543s + t-archive-query sid 1543s + local suite=sid 1543s + local dscf=main/example_2.0-2.dsc 1543s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 1543s + local suite=sid 1543s + local p=example 1543s + local v=2.0-2 1543s + local dscf=main/example_2.0-2.dsc 1543s + local sha 1543s ++ sha256sum 1543s + sha='f9b7873b16d5d2c864ca09c707846f9098a3b19558b668716e51d5309ff3011f -' 1543s + echo '2.0-2 f9b7873b16d5d2c864ca09c707846f9098a3b19558b668716e51d5309ff3011f main/example_2.0-2.dsc' 1543s + t-aq-archive-updated sid example 1543s + local suite=sid 1543s + local p=example 1543s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1543s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1543s + perl -wne ' 1543s use JSON; 1543s use strict; 1543s our @v; 1543s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1543s push @v, { 1543s "version" => "$1", 1543s "sha256sum" => "$2", 1543s "component" => "$3", 1543s "filename" => "$4", 1543s }; 1543s END { 1543s my $json = JSON->new->canonical(); 1543s print $json->encode(\@v) or die $!; 1543s } 1543s ' 1543s ++ 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 1543s ++ echo git mirror aq 1543s + 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' ' 1543s . $troot/lib-gdr 1543s t-tstunt-parsechangelog 1543s p=example 1543s t-git-next-date 1543s ' 1543s + local savevars= 1543s + 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' 1543s + local 'importeval= 1543s . $troot/lib-gdr 1543s t-tstunt-parsechangelog 1543s p=example 1543s t-git-next-date 1543s ' 1543s + local import=IMPORT.gdr-convert-gbp 1543s + exec 1543s + local vn 1543s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1543s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1543s print STDERR "saving-exporting $vn\n"; 1543s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1543s or die $!; 1543s } 1543s ' 1543s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1543s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1543s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1543s saving-exporting DGIT_TEST_REAL_GPG 1543s + set -e 1543s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1543s + 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 1543s + printf '\n%s\n' ' 1543s . $troot/lib-gdr 1543s t-tstunt-parsechangelog 1543s p=example 1543s t-git-next-date 1543s ' 1543s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1543s + rc=0 1543s + set +x 1543s + set +e 1543s + pwd 1543s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1543s + '[' x '!=' x ']' 1543s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1543s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1543s + set -e 1543s + test 0 = 0 1543s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1543s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1543s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1543s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1543s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1543s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1543s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1543s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1543s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1543s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1543s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1543s ++ . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1543s +++ : -D 1543s +++ export GDR_TEST_DEBUG 1543s +++ t-tstunt debchange 1543s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1543s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1543s +++ local var=PATH 1543s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1543s +++ eval ' 1543s case "$PATH" in 1543s "$tstunt:"*) ;; 1543s *":$tstunt:"*) ;; 1543s "") PATH="$tstunt" ;; 1543s *) PATH="$tstunt:$PATH" ;; 1543s esac 1543s export PATH 1543s ' 1543s ++++ case "$PATH" in 1543s ++++ export PATH 1543s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1543s +++ local var=PERLLIB 1543s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1543s +++ eval ' 1543s case "$PERLLIB" in 1543s "$tstunt:"*) ;; 1543s *":$tstunt:"*) ;; 1543s "") PERLLIB="$tstunt" ;; 1543s *) PERLLIB="$tstunt:$PERLLIB" ;; 1543s esac 1543s export PERLLIB 1543s ' 1543s ++++ case "$PERLLIB" in 1543s ++++ export PERLLIB 1543s +++ local f 1543s +++ for f in "$@" 1543s +++ t-tstunt--save-real debchange 1543s +++ local f=debchange 1543s +++ case "$f" in 1543s +++ local rc 1543s +++ local real 1543s +++ set +e 1543s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1543s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1543s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1543s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1543s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1543s ++++ type -p debchange 1543s +++ real=/usr/bin/debchange 1543s +++ rc=0 1543s +++ set -e 1543s +++ case $rc in 1543s +++ local varname=debchange 1543s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1543s +++ eval ' 1543s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1543s export DGIT_TEST_REAL_DEBCHANGE 1543s ' 1543s ++++ : /usr/bin/debchange 1543s ++++ export DGIT_TEST_REAL_DEBCHANGE 1543s +++ f=./debchange 1543s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1543s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1543s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1543s ++ t-tstunt-parsechangelog 1543s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1543s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1543s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1543s ++ local var=PATH 1543s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1543s ++ eval ' 1543s case "$PATH" in 1543s "$tstunt:"*) ;; 1543s *":$tstunt:"*) ;; 1543s "") PATH="$tstunt" ;; 1543s *) PATH="$tstunt:$PATH" ;; 1543s esac 1543s export PATH 1543s ' 1543s +++ case "$PATH" in 1543s +++ export PATH 1543s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1543s ++ local var=PERLLIB 1543s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1543s ++ eval ' 1543s case "$PERLLIB" in 1543s "$tstunt:"*) ;; 1543s *":$tstunt:"*) ;; 1543s "") PERLLIB="$tstunt" ;; 1543s *) PERLLIB="$tstunt:$PERLLIB" ;; 1543s esac 1543s export PERLLIB 1543s ' 1543s +++ case "$PERLLIB" in 1543s +++ export PERLLIB 1543s ++ local f 1543s ++ for f in "$@" 1543s ++ t-tstunt--save-real dpkg-parsechangelog 1543s ++ local f=dpkg-parsechangelog 1543s ++ case "$f" in 1543s ++ local rc 1543s ++ local real 1543s ++ set +e 1543s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1543s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1543s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1543s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1543s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1543s +++ type -p dpkg-parsechangelog 1543s ++ real=/usr/bin/dpkg-parsechangelog 1543s ++ rc=0 1543s ++ set -e 1543s ++ case $rc in 1543s ++ local varname=dpkg_parsechangelog 1543s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1543s ++ eval ' 1543s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1543s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1543s ' 1543s +++ : /usr/bin/dpkg-parsechangelog 1543s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1543s ++ f=./dpkg-parsechangelog 1543s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1543s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1543s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1543s ++ for f in "$@" 1543s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1543s ++ local f=Dpkg/Changelog/Parse.pm 1543s ++ case "$f" in 1543s ++ return 1543s ++ f=./Dpkg/Changelog/Parse.pm 1543s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1543s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1543s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1543s ++ p=example 1543s ++ t-git-next-date 1543s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1543s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1543s + cd example 1543s + t-dgit setup-mergechangelogs 1543s + local dgit=dgit 1543s + pwd 1543s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1543s + : ' 1543s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1543s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-mergechangelogs 1543s | git rev-parse --show-toplevel 1543s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1543s | git config -z --get-regexp --local '.*' 1543s | git config -z --get-regexp --local '.*' 1543s | git config -z --get-regexp --global '.*' 1543s | git config -z --get-regexp --system '.*' 1543s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 1543s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 1543s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1543s ' 1543s + git checkout -b raw-converted-from-gbp converted-from-gbp 1543s Switched to a new branch 'raw-converted-from-gbp' 1543s ++ git diff --stat 'HEAD^2' 1543s + test ' debian/patches/0001-Add-a-new-upstream-file.patch | 16 ---------------- 1543s debian/patches/0002-Edit-the-.c-file.patch | 15 --------------- 1543s debian/patches/garbage | 1 - 1543s debian/patches/series | 3 --- 1543s debian/patches/subdir/addnewups | 16 ---------------- 1543s 5 files changed, 51 deletions(-)' 1543s + git diff --exit-code --stat 'HEAD^1' 1543s + git reset --hard 'HEAD^1' 1543s HEAD is now at 178896a Add another new upstream file 1543s + git checkout -b stitched-laundered master 1543s Switched to a new branch 'stitched-laundered' 1543s + mix-it 1543s + t-git-next-date 1543s + GIT_COMMITTER_DATE='1530000002 +0100' 1543s + GIT_AUTHOR_DATE='1530000002 +0100' 1543s ++ git symbolic-ref HEAD 1543s + local m=refs/heads/stitched-laundered 1543s + t-some-changes 'subcommands refs/heads/stitched-laundered 1' 1543s + local 'token=subcommands refs/heads/stitched-laundered 1' 1543s + local which=dum 1543s + local fsuffix= 1543s + t-git-next-date 1543s + GIT_COMMITTER_DATE='1530000003 +0100' 1543s + GIT_AUTHOR_DATE='1530000003 +0100' 1543s + case "$which" in 1543s + echo '// debian subcommands refs/heads/stitched-laundered 1' 1543s + git add debian/zorkmid 1543s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)' 1543s [stitched-laundered 5a67018] DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1) 1543s 1 file changed, 1 insertion(+) 1543s create mode 100644 debian/zorkmid 1543s + case "$which" in 1543s + echo '// upstream subcommands refs/heads/stitched-laundered 1' 1543s + git add src.c 1543s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)' 1543s [stitched-laundered 088ca27] UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1) 1543s 1 file changed, 1 insertion(+) 1543s + case "$which" in 1543s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1543s + echo '// both! subcommands refs/heads/stitched-laundered 1' 1543s + git add debian/zorkmid 1543s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1543s + echo '// both! subcommands refs/heads/stitched-laundered 1' 1543s + git add src.c 1543s + git commit -m 'MIXED add both() (subcommands refs/heads/stitched-laundered 1)' 1543s [stitched-laundered 723bf8d] MIXED add both() (subcommands refs/heads/stitched-laundered 1) 1543s 2 files changed, 2 insertions(+) 1543s + t-git-next-date 1543s + GIT_COMMITTER_DATE='1530000004 +0100' 1543s + GIT_AUTHOR_DATE='1530000004 +0100' 1543s + t-dgit --git-debrebase=true -wgf quilt-fixup 1543s + local dgit=dgit 1543s + pwd 1543s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1543s + : ' 1543s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1543s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --git-debrebase=true -wgf quilt-fixup 1543s | git rev-parse --show-toplevel 1543s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1543s | git config -z --get-regexp --local '.*' 1543s | git config -z --get-regexp --local '.*' 1543s | git config -z --get-regexp --global '.*' 1543s | git config -z --get-regexp --system '.*' 1543s format 3.0 (quilt), quilt mode linear 1543s Format `3.0 (quilt)', need to check/update patch stack 1543s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1543s => `' 1543s + git diff --quiet HEAD 1543s + git clean -xdff 1543s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1543s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1543s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1543s | git rev-parse 'HEAD~0' 1543s => `723bf8d3d175bfc9797521c3fa5d144421659ec9' 1543s | git symbolic-ref -q HEAD 1543s => `refs/heads/stitched-laundered' 1543s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1543s CD work 1543s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1543s + git reset -q --hard 723bf8d3d175bfc9797521c3fa5d144421659ec9 1543s examining quilt state (multiple patches, linear mode) 1543s branch_is_gdr 723bf8d3d175bfc9797521c3fa5d144421659ec9... 1543s branch_is_gdr 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf gdr make-patches YES 1543s + git reset -q --hard 723bf8d3d175bfc9797521c3fa5d144421659ec9 1543s + true --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1543s | git rev-parse 'HEAD~0' 1543s => `723bf8d3d175bfc9797521c3fa5d144421659ec9' 1543s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1543s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1543s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1543s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1544s CD fake 1544s | find -name .git -prune -print0 1544s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1544s + git checkout -f 723bf8d3d175bfc9797521c3fa5d144421659ec9 -- debian 1544s + git add -Af . 1544s | git write-tree 1544s => `7cb057ef40ab83ab9ca6e93a95412d81c47fa615' 1544s fake orig tree object 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 1544s CD .. 1544s + git reset -q --hard 723bf8d3d175bfc9797521c3fa5d144421659ec9 1544s CD ../fake 1544s + git add -Af . 1544s | git write-tree 1544s => `988c74fadb9b5ae01c47c4c49cdbf578ce47a61a' 1544s fake o+d/p tree object 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 1544s CD ../work 1544s | git ls-tree --name-only -z 723bf8d3d175bfc9797521c3fa5d144421659ec9 1544s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1544s | git diff-tree -z --no-renames -r 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 723bf8d3d175bfc9797521c3fa5d144421659ec9 1544s => `: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' 1544s quiltify_trees_differ 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 723bf8d3d175bfc9797521c3fa5d144421659ec9 => 1 1544s | git diff-tree -z --no-renames --name-only -r 723bf8d3d175bfc9797521c3fa5d144421659ec9 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a 1544s => `src.c\x00' 1544s quiltify_trees_differ 723bf8d3d175bfc9797521c3fa5d144421659ec9 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a => 1 1544s | git diff-tree -z --no-renames --name-only -r 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a 1544s => `lib.c\x00new-upstream-file\x00src.c\x00' 1544s quiltify_trees_differ 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a => 1 1544s differences @dl ## ## ## == == ==. 1544s dgit: base trees orig=7cb057ef40ab83ab9ca6 o+d/p=988c74fadb9b5ae01c47 1544s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1544s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1544s starting quiltify (multiple patches, linear mode) 1544s | git ls-tree --name-only 723bf8d3d175bfc9797521c3fa5d144421659ec9 -- debian/rules debian/control 1544s => `debian/control'... 1544s quiltify investigate 723bf8d3d175bfc9797521c3fa5d144421659ec9 1544s | git diff-tree -z --no-renames --name-only 723bf8d3d175bfc9797521c3fa5d144421659ec9 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a 1544s => `src.c\x00' 1544s quiltify_trees_differ 723bf8d3d175bfc9797521c3fa5d144421659ec9 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a => 1 1544s | git ls-tree --name-only 723bf8d3d175bfc9797521c3fa5d144421659ec9 -- debian/rules debian/control 1544s => `debian/control'... 1544s | git cat-file commit 723bf8d3d175bfc9797521c3fa5d144421659ec9 1544s => `tree d8756ce5963485dffef0f9a43abc1ec0129d6c1e'... 1544s | git diff-tree -z --no-renames --name-only 088ca2748c333245f8f3dc6482c25427680a4f37 723bf8d3d175bfc9797521c3fa5d144421659ec9 1544s => `debian\x00src.c\x00' 1544s quiltify_trees_differ 088ca2748c333245f8f3dc6482c25427680a4f37 723bf8d3d175bfc9797521c3fa5d144421659ec9 => 1 1544s considering C=723bf8d3d175bfc9797521c3fa5d144421659ec9 P=088ca2748c333245f8f3dc6482c25427680a4f37 1544s | git diff-tree -r --name-only 088ca2748c333245f8f3dc6482c25427680a4f37 723bf8d3d175bfc9797521c3fa5d144421659ec9 -- debian/patches .pc debian/source/format 1544s => `' 1544s search queue P=088ca2748c333245f8f3dc6482c25427680a4f37 NT 1544s quiltify investigate 088ca2748c333245f8f3dc6482c25427680a4f37 1544s | git diff-tree -z --no-renames --name-only 088ca2748c333245f8f3dc6482c25427680a4f37 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a 1544s => `debian\x00src.c\x00' 1544s quiltify_trees_differ 088ca2748c333245f8f3dc6482c25427680a4f37 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a => 1 1544s | git ls-tree --name-only 088ca2748c333245f8f3dc6482c25427680a4f37 -- debian/rules debian/control 1544s => `debian/control'... 1544s | git cat-file commit 088ca2748c333245f8f3dc6482c25427680a4f37 1544s => `tree a448632c39f18e3867a3c19a5cf796f2c50ae2f6'... 1544s | git diff-tree -z --no-renames --name-only 5a670186618804169c6ac55f3c296ebd370af060 088ca2748c333245f8f3dc6482c25427680a4f37 1544s => `src.c\x00' 1544s quiltify_trees_differ 5a670186618804169c6ac55f3c296ebd370af060 088ca2748c333245f8f3dc6482c25427680a4f37 => 1 1544s considering C=088ca2748c333245f8f3dc6482c25427680a4f37 P=5a670186618804169c6ac55f3c296ebd370af060 1544s | git diff-tree -r --name-only 5a670186618804169c6ac55f3c296ebd370af060 088ca2748c333245f8f3dc6482c25427680a4f37 -- debian/patches .pc debian/source/format 1544s => `' 1544s search queue P=5a670186618804169c6ac55f3c296ebd370af060 NT 1544s quiltify investigate 5a670186618804169c6ac55f3c296ebd370af060 1544s | git diff-tree -z --no-renames --name-only 5a670186618804169c6ac55f3c296ebd370af060 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a 1544s => `debian\x00' 1544s quiltify_trees_differ 5a670186618804169c6ac55f3c296ebd370af060 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a => 0 1544s search finished hooray! 1544s quiltify linearisation planning successful, executing... 1544s quiltify traverse 5a670186618804169c6ac55f3c296ebd370af060..088ca2748c333245f8f3dc6482c25427680a4f37 1544s | git cat-file commit 088ca2748c333245f8f3dc6482c25427680a4f37 1544s => `tree a448632c39f18e3867a3c19a5cf796f2c50ae2f6'... 1544s | git log -n1 '--pretty=format:%aD' 088ca2748c333245f8f3dc6482c25427680a4f37 1544s => `Tue, 26 Jun 2018 09:00:03 +0100' 1544s + git checkout -q 088ca2748c333245f8f3dc6482c25427680a4f37 1544s + git checkout -q 723bf8d3d175bfc9797521c3fa5d144421659ec9 debian/changelog 1544s | realpath -- /usr/bin/dgit 1544s => `/usr/bin/dgit' 1544s | realpath -- .git/dgit/quilt-description.tmp 1544s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1544s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-subcommands-refshead.patch 1544s dpkg-source: info: using patch list from debian/patches/series 1544s dpkg-source: info: local changes detected, the modified files are: 1544s work/src.c 1544s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-subcommands-refshead.patch 1544s + git checkout -q 088ca2748c333245f8f3dc6482c25427680a4f37 debian/changelog 1544s quiltify traverse 088ca2748c333245f8f3dc6482c25427680a4f37..723bf8d3d175bfc9797521c3fa5d144421659ec9 1544s | git cat-file commit 723bf8d3d175bfc9797521c3fa5d144421659ec9 1544s => `tree d8756ce5963485dffef0f9a43abc1ec0129d6c1e'... 1544s | git log -n1 '--pretty=format:%aD' 723bf8d3d175bfc9797521c3fa5d144421659ec9 1544s => `Tue, 26 Jun 2018 09:00:03 +0100' 1544s + git checkout -q 723bf8d3d175bfc9797521c3fa5d144421659ec9 1544s + git checkout -q 723bf8d3d175bfc9797521c3fa5d144421659ec9 debian/changelog 1544s | realpath -- /usr/bin/dgit 1544s => `/usr/bin/dgit' 1544s | realpath -- .git/dgit/quilt-description.tmp 1544s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1544s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-subcommands-refsheadsstit.patch 1544s dpkg-source: info: using patch list from debian/patches/series 1544s dpkg-source: info: local changes detected, the modified files are: 1544s work/src.c 1545s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-subcommands-refsheadsstit.patch 1545s + git checkout -q 723bf8d3d175bfc9797521c3fa5d144421659ec9 debian/changelog 1545s + git checkout -q master 1545s | git status --ignored --porcelain 1545s => ` M debian/patches/series'... 1545s + git add -f debian/patches 1545s Commit Debian 3.0 (quilt) metadata 1545s 1545s [dgit (9.15) quilt-fixup] 1545s 1545s + git commit -m 'Commit Debian 3.0 (quilt) metadata 1545s 1545s [dgit (9.15) quilt-fixup] 1545s ' 1545s [master 746c74f] Commit Debian 3.0 (quilt) metadata 1545s 3 files changed, 29 insertions(+) 1545s create mode 100644 debian/patches/mixed-add-both-subcommands-refsheadsstit.patch 1545s create mode 100644 debian/patches/upstream-edit-src.c-subcommands-refshead.patch 1545s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1545s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1545s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1545s ' 1545s + t-git-next-date 1545s + GIT_COMMITTER_DATE='1530000005 +0100' 1545s + GIT_AUTHOR_DATE='1530000005 +0100' 1545s + t-some-changes 'subcommands refs/heads/stitched-laundered 2' 1545s + local 'token=subcommands refs/heads/stitched-laundered 2' 1545s + local which=dum 1545s + local fsuffix= 1545s + t-git-next-date 1545s + GIT_COMMITTER_DATE='1530000006 +0100' 1545s + GIT_AUTHOR_DATE='1530000006 +0100' 1545s + case "$which" in 1545s + echo '// debian subcommands refs/heads/stitched-laundered 2' 1545s + git add debian/zorkmid 1545s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)' 1545s [stitched-laundered 883a23a] DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2) 1545s 1 file changed, 1 insertion(+) 1545s + case "$which" in 1545s + echo '// upstream subcommands refs/heads/stitched-laundered 2' 1545s + git add src.c 1545s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)' 1545s [stitched-laundered 18d7ec4] UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2) 1545s 1 file changed, 1 insertion(+) 1545s + case "$which" in 1545s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1545s + echo '// both! subcommands refs/heads/stitched-laundered 2' 1545s + git add debian/zorkmid 1545s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1545s + echo '// both! subcommands refs/heads/stitched-laundered 2' 1545s + git add src.c 1545s + git commit -m 'MIXED add both() (subcommands refs/heads/stitched-laundered 2)' 1545s [stitched-laundered 9d6d227] MIXED add both() (subcommands refs/heads/stitched-laundered 2) 1545s 2 files changed, 2 insertions(+) 1545s + t-git-next-date 1545s + GIT_COMMITTER_DATE='1530000007 +0100' 1545s + GIT_AUTHOR_DATE='1530000007 +0100' 1545s + t-git-next-date 1545s + GIT_COMMITTER_DATE='1530000008 +0100' 1545s + GIT_AUTHOR_DATE='1530000008 +0100' 1545s + t-git-debrebase quick 1545s + local gdr=git-debrebase 1545s + : ' 1545s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1545s + git-debrebase --dgit=dgit -D quick 1545s git-debrebase ffq_prev_branchinfo branch current refs/heads/stitched-laundered 1545s git-debrebase ffq check_specs * 1545s git-debrebase *** WALK 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 0 - 1545s git-debrebase get_differs 18d7ec4a5706a591911fe795625a08874b135559 7fd71e34f90a1fbc62937d605009df6c8192ba92 = 0x22 1545s git-debrebase classify 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 $t=7fd71e34f90a1fbc62937d605009df6c8192ba92 @p 18d7ec4a5706a591911fe795625a08874b135559/0x22 1545s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"Differs" => 34,"CommitId" => "18d7ec4a5706a591911fe795625a08874b135559","Ix" => 0}],"Hdr" => "tree 7fd71e34f90a1fbc62937d605009df6c8192ba92\nparent 18d7ec4a5706a591911fe795625a08874b135559\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Type" => "Mixed","CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Tree" => "7fd71e34f90a1fbc62937d605009df6c8192ba92"} 1545s git-debrebase get_differs 883a23a0f780f81e548aa5a710758628d9635e4c a33aa1dcb8b303bef3362e948b79ba4086ff1ed7 = 0x2 1545s git-debrebase classify 18d7ec4a5706a591911fe795625a08874b135559 $t=a33aa1dcb8b303bef3362e948b79ba4086ff1ed7 @p 883a23a0f780f81e548aa5a710758628d9635e4c/0x2 1545s git-debrebase = Upstream {"Parents" => [{"CommitId" => "883a23a0f780f81e548aa5a710758628d9635e4c","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Upstream","Hdr" => "tree a33aa1dcb8b303bef3362e948b79ba4086ff1ed7\nparent 883a23a0f780f81e548aa5a710758628d9635e4c\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","CommitId" => "18d7ec4a5706a591911fe795625a08874b135559","Tree" => "a33aa1dcb8b303bef3362e948b79ba4086ff1ed7"} 1545s git-debrebase get_differs 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8 55acecd5e355512d4905bedf0f53a6eb06feb860 = 0x20 1545s git-debrebase classify 883a23a0f780f81e548aa5a710758628d9635e4c $t=55acecd5e355512d4905bedf0f53a6eb06feb860 @p 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8/0x20 1545s git-debrebase = Packaging {"CommitId" => "883a23a0f780f81e548aa5a710758628d9635e4c","Tree" => "55acecd5e355512d4905bedf0f53a6eb06feb860","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "746c74f56cca2e6f50c892fb87a9ec15ecf2bde8"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Packaging","Hdr" => "tree 55acecd5e355512d4905bedf0f53a6eb06feb860\nparent 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n"} 1545s git-debrebase get_differs 723bf8d3d175bfc9797521c3fa5d144421659ec9 270decbd8d0524e44c0e8a7e159283a5e00a92d3 = 0x4 1545s git-debrebase classify 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8 $t=270decbd8d0524e44c0e8a7e159283a5e00a92d3 @p 723bf8d3d175bfc9797521c3fa5d144421659ec9/0x4 1545s git-debrebase = AddPatches {"CommitId" => "746c74f56cca2e6f50c892fb87a9ec15ecf2bde8","Tree" => "270decbd8d0524e44c0e8a7e159283a5e00a92d3","Parents" => [{"CommitId" => "723bf8d3d175bfc9797521c3fa5d144421659ec9","Differs" => 4,"Ix" => 0}],"Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Type" => "AddPatches","Hdr" => "tree 270decbd8d0524e44c0e8a7e159283a5e00a92d3\nparent 723bf8d3d175bfc9797521c3fa5d144421659ec9\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n"} 1545s git-debrebase get_differs 088ca2748c333245f8f3dc6482c25427680a4f37 d8756ce5963485dffef0f9a43abc1ec0129d6c1e = 0x22 1545s git-debrebase classify 723bf8d3d175bfc9797521c3fa5d144421659ec9 $t=d8756ce5963485dffef0f9a43abc1ec0129d6c1e @p 088ca2748c333245f8f3dc6482c25427680a4f37/0x22 1545s git-debrebase = Mixed {"Hdr" => "tree d8756ce5963485dffef0f9a43abc1ec0129d6c1e\nparent 088ca2748c333245f8f3dc6482c25427680a4f37\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Mixed","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "088ca2748c333245f8f3dc6482c25427680a4f37"}],"CommitId" => "723bf8d3d175bfc9797521c3fa5d144421659ec9","Tree" => "d8756ce5963485dffef0f9a43abc1ec0129d6c1e"} 1545s git-debrebase get_differs 5a670186618804169c6ac55f3c296ebd370af060 a448632c39f18e3867a3c19a5cf796f2c50ae2f6 = 0x2 1545s git-debrebase classify 088ca2748c333245f8f3dc6482c25427680a4f37 $t=a448632c39f18e3867a3c19a5cf796f2c50ae2f6 @p 5a670186618804169c6ac55f3c296ebd370af060/0x2 1545s git-debrebase = Upstream {"Tree" => "a448632c39f18e3867a3c19a5cf796f2c50ae2f6","CommitId" => "088ca2748c333245f8f3dc6482c25427680a4f37","Hdr" => "tree a448632c39f18e3867a3c19a5cf796f2c50ae2f6\nparent 5a670186618804169c6ac55f3c296ebd370af060\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"CommitId" => "5a670186618804169c6ac55f3c296ebd370af060","Differs" => 2,"Ix" => 0}]} 1545s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f = 0x20 1545s git-debrebase classify 5a670186618804169c6ac55f3c296ebd370af060 $t=7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 1545s git-debrebase = Packaging {"Tree" => "7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f","CommitId" => "5a670186618804169c6ac55f3c296ebd370af060","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging"} 1545s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1545s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1545s git-debrebase = AddPatches {"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","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"} 1545s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1545s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1545s git-debrebase = Changelog {"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "dch -r -D unstable\n","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","Type" => "Changelog"} 1545s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1545s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1545s git-debrebase = Changelog {"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Parents" => [{"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1545s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1545s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1545s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1545s git-debrebase = Pseudomerge {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"},"Overwritten" => [{"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8,"Ix" => 1}],"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]],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Pseudomerge"} 1545s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1545s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1545s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2,"Ix" => 0}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 1545s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1545s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1545s 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","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0}]} 1545s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1545s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1545s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream"} 1545s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1545s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1545s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1545s 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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1545s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 1545s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1545s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1545s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 20 1545s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1545s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1545s git-debrebase WALK REWRITING NOW cl=HASH(0x74aa6aa2e88) procd=HASH(0x74aa6aac580) 1545s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1545s git-debrebase WALK BUILD 5a670186618804169c6ac55f3c296ebd370af060 Debian (rewriting=1) 1545s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1545s git-debrebase WALK BUILD 723bf8d3d175bfc9797521c3fa5d144421659ec9 Debian (rewriting=1) 1545s git-debrebase WALK BUILD 883a23a0f780f81e548aa5a710758628d9635e4c Debian (rewriting=1) 1545s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1545s git-debrebase WALK BUILD 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 Debian (rewriting=1) 1545s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1545s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1545s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1545s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1545s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1545s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1545s git-debrebase WALK BUILD 088ca2748c333245f8f3dc6482c25427680a4f37 Upstream (rewriting=1) 1545s git-debrebase WALK BUILD 723bf8d3d175bfc9797521c3fa5d144421659ec9 Upstream (rewriting=1) 1545s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1545s git-debrebase WALK BUILD 18d7ec4a5706a591911fe795625a08874b135559 Upstream (rewriting=1) 1545s git-debrebase WALK BUILD 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 Upstream (rewriting=1) 1545s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1545s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 = 0x4 1545s git-debrebase *** WALK RETURN dab3cc0fcfead932f6714305cfb670067c157804 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1545s git-debrebase: laundered (head was 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9) 1545s git-debrebase >= update refs/ffq-prev/heads/stitched-laundered 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 0000000000000000000000000000000000000000 1545s git-debrebase >= delete refs/debrebase-last/heads/stitched-laundered 1545s git-debrebase >= update HEAD dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 1545s git-debrebase >$ 1545s Recorded previous head for preservation 1545s git-debrebase ffq_prev_branchinfo branch current refs/heads/stitched-laundered 1545s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1545s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1545s git-debrebase = Upstream {"Type" => "Upstream","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}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804"} 1545s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1545s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1545s git-debrebase = Upstream {"Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Type" => "Upstream","Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n"} 1545s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1545s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1545s git-debrebase = Upstream {"Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"}]} 1545s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1545s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1545s git-debrebase = Upstream {"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Parents" => [{"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Upstream","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1545s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1545s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1545s git-debrebase = Upstream {"Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Parents" => [{"Ix" => 0,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1545s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1545s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1545s git-debrebase = Upstream {"Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Parents" => [{"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Differs" => 2,"Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n"} 1545s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1545s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1545s git-debrebase = Upstream {"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","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"}],"Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream"} 1545s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1545s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1545s git-debrebase = Packaging {"Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Type" => "Packaging","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Differs" => 32,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1545s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1545s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1545s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"}],"Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c"} 1545s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1545s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1545s git-debrebase = Packaging {"Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Ix" => 0}],"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472"} 1545s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1545s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1545s git-debrebase = Packaging {"Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"Ix" => 0,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Differs" => 32}],"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e"} 1545s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1545s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1545s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Ix" => 0}],"Msg" => "dch -r -D unstable\n"} 1545s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1545s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1545s git-debrebase = Changelog {"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","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}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1545s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1545s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1545s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1545s 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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 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"} 1545s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1545s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1545s git-debrebase >= delete refs/ffq-prev/heads/stitched-laundered 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 1545s git-debrebase >= update refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 0000000000000000000000000000000000000000 1545s git-debrebase >= update HEAD 64d2fdf7628f675981360f0dce3aaaa227b0676a dab3cc0fcfead932f6714305cfb670067c157804 1545s git-debrebase >$ 1545s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1545s ' 1545s + t-gdr-good stitched HEAD 1545s + local state=stitched 1545s + local beforetag=HEAD 1545s + case $state in 1545s + git diff --quiet HEAD -- :. ':!debian/patches' 1545s + LC_MESSAGES=C 1545s + t-git-debrebase status 1545s + local gdr=git-debrebase 1545s + : ' 1545s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1545s + git-debrebase --dgit=dgit -D status 1545s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 1545s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 1545s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 1545s git-debrebase = Pseudomerge {"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Contributor" => {"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Ix" => 0,"Differs" => 0},"Type" => "Pseudomerge","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent dab3cc0fcfead932f6714305cfb670067c157804\nparent 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a","Parents" => [$VAR1->{"Contributor"},{"Ix" => 1,"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Differs" => 8}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n"} 1545s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1545s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1545s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Ix" => 0}],"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Type" => "Upstream","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1545s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1545s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1545s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Ix" => 0,"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","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf"} 1545s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1545s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1545s git-debrebase = Upstream {"Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Ix" => 0}]} 1545s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1545s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1545s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Differs" => 2}],"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745"} 1545s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1545s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1545s git-debrebase = Upstream {"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Ix" => 0}]} 1545s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1545s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1545s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","Type" => "Upstream","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"} 1545s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1545s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1545s 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" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}],"Type" => "Upstream","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656"} 1545s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1545s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1545s git-debrebase = Packaging {"Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Differs" => 32}]} 1545s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1545s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1545s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"}],"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","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c"} 1545s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1545s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1545s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Ix" => 0}],"Type" => "Packaging","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472"} 1545s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1545s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1545s 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","Type" => "Packaging","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Parents" => [{"Ix" => 0,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Differs" => 32}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n"} 1545s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1545s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1545s git-debrebase = Changelog {"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" => [{"Ix" => 0,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Differs" => 16}],"Msg" => "dch -r -D unstable\n"} 1545s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1545s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1545s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1545s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1545s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1545s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1545s 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","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1545s git-debrebase ffq_prev_branchinfo branch current refs/heads/stitched-laundered 1545s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1545s ' 1545s + case $state in 1545s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 1546s branch contains furniture (not laundered) 1546s + egrep '^ stitched$' ../status.check 1546s stitched 1546s + t-gdr-good-analyse HEAD stitched 1546s + local head=HEAD 1546s + local state=stitched 1546s + local wsfx= 1546s + local etypes bwtip 1546s + case $state in 1546s + etypes=Pseudomerge-Upstream 1546s + anal=../anal 1546s + t-git-debrebase analyse HEAD 1546s + local gdr=git-debrebase 1546s + : ' 1546s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1546s + git-debrebase --dgit=dgit -D analyse HEAD 1546s git-debrebase *** WALK 64d2fdf7628f675981360f0dce3aaaa227b0676a 1 *main::STDOUT 1546s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 1546s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 1546s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 1546s git-debrebase = Pseudomerge {"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804"},{"Differs" => 8,"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Ix" => 1}],"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent dab3cc0fcfead932f6714305cfb670067c157804\nparent 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge","Contributor" => $VAR1->{"Parents"}[0]} 1546s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1546s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1546s git-debrebase = Upstream {"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Parents" => [{"Ix" => 0,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Differs" => 2}],"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream"} 1546s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1546s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1546s git-debrebase = 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","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Type" => "Upstream","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","Parents" => [{"Differs" => 2,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Ix" => 0}]} 1546s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1546s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1546s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","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","Parents" => [{"Ix" => 0,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Differs" => 2}],"Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555"} 1546s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1546s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1546s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Differs" => 2}],"Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1546s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1546s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1546s 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","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Type" => "Upstream","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Parents" => [{"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Differs" => 2,"Ix" => 0}]} 1546s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1546s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1546s git-debrebase = Upstream {"Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","Parents" => [{"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 1546s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1546s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1546s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Differs" => 2,"Ix" => 0}],"Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656"} 1546s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1546s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1546s git-debrebase = Packaging {"Parents" => [{"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Differs" => 32,"Ix" => 0}],"Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1546s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1546s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1546s 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","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"}],"Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c"} 1546s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1546s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1546s git-debrebase = Packaging {"Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"}],"Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 1546s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1546s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1546s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Parents" => [{"Ix" => 0,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Differs" => 32}]} 1546s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1546s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1546s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2"}],"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","Type" => "Changelog"} 1546s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1546s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1546s 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","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}]} 1546s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1546s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1546s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1546s git-debrebase = Anchor {"Type" => "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","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1546s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 15 pm 0 1546s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1546s ' 1546s ++ git rev-parse HEAD 1546s + expect=64d2fdf7628f675981360f0dce3aaaa227b0676a 1546s + exec 1546s + local cid ctype info nparents 1546s + read cid ctype info 1546s + : ===== 64d2fdf7628f675981360f0dce3aaaa227b0676a Pseudomerge Contributor=dab3cc0fcfead932f6714305cfb670067c157804 ===== 1546s + test 64d2fdf7628f675981360f0dce3aaaa227b0676a = 64d2fdf7628f675981360f0dce3aaaa227b0676a 1546s + local cetype=Pseudomerge 1546s + '[' xPseudomerge = xPseudomerge ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P 64d2fdf7628f675981360f0dce3aaaa227b0676a 1546s + local 'parents=dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9' 1546s + expect='dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9' 1546s + enparents=1 1546s + : Pseudomerge/SAME 'dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9' 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s + expect=dab3cc0fcfead932f6714305cfb670067c157804 1546s + expect=dab3cc0fcfead932f6714305cfb670067c157804 1546s + enparents=2 1546s + git diff --quiet dab3cc0fcfead932f6714305cfb670067c157804..64d2fdf7628f675981360f0dce3aaaa227b0676a 1546s + etypes=Upstream 1546s + : 'reject pointless pseudomerges' 1546s + local 'overwritten= 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9' 1546s + overwritten=9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 1546s + t-git-debrebase analyse 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 1546s + local gdr=git-debrebase 1546s + : ' 1546s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1546s + git-debrebase --dgit=dgit -D analyse 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 1546s git-debrebase *** WALK 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 1 *main::STDOUT 1546s git-debrebase get_differs 18d7ec4a5706a591911fe795625a08874b135559 7fd71e34f90a1fbc62937d605009df6c8192ba92 = 0x22 1546s git-debrebase classify 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 $t=7fd71e34f90a1fbc62937d605009df6c8192ba92 @p 18d7ec4a5706a591911fe795625a08874b135559/0x22 1546s git-debrebase = Mixed {"Parents" => [{"Differs" => 34,"CommitId" => "18d7ec4a5706a591911fe795625a08874b135559","Ix" => 0}],"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Tree" => "7fd71e34f90a1fbc62937d605009df6c8192ba92","Type" => "Mixed","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n","Hdr" => "tree 7fd71e34f90a1fbc62937d605009df6c8192ba92\nparent 18d7ec4a5706a591911fe795625a08874b135559\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n"} 1546s git-debrebase get_differs 883a23a0f780f81e548aa5a710758628d9635e4c a33aa1dcb8b303bef3362e948b79ba4086ff1ed7 = 0x2 1546s git-debrebase classify 18d7ec4a5706a591911fe795625a08874b135559 $t=a33aa1dcb8b303bef3362e948b79ba4086ff1ed7 @p 883a23a0f780f81e548aa5a710758628d9635e4c/0x2 1546s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Upstream","Hdr" => "tree a33aa1dcb8b303bef3362e948b79ba4086ff1ed7\nparent 883a23a0f780f81e548aa5a710758628d9635e4c\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","CommitId" => "18d7ec4a5706a591911fe795625a08874b135559","Tree" => "a33aa1dcb8b303bef3362e948b79ba4086ff1ed7","Parents" => [{"CommitId" => "883a23a0f780f81e548aa5a710758628d9635e4c","Differs" => 2,"Ix" => 0}]} 1546s git-debrebase get_differs 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8 55acecd5e355512d4905bedf0f53a6eb06feb860 = 0x20 1546s git-debrebase classify 883a23a0f780f81e548aa5a710758628d9635e4c $t=55acecd5e355512d4905bedf0f53a6eb06feb860 @p 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8/0x20 1546s git-debrebase = Packaging {"Parents" => [{"CommitId" => "746c74f56cca2e6f50c892fb87a9ec15ecf2bde8","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Packaging","Hdr" => "tree 55acecd5e355512d4905bedf0f53a6eb06feb860\nparent 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","CommitId" => "883a23a0f780f81e548aa5a710758628d9635e4c","Tree" => "55acecd5e355512d4905bedf0f53a6eb06feb860"} 1546s git-debrebase get_differs 723bf8d3d175bfc9797521c3fa5d144421659ec9 270decbd8d0524e44c0e8a7e159283a5e00a92d3 = 0x4 1546s git-debrebase classify 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8 $t=270decbd8d0524e44c0e8a7e159283a5e00a92d3 @p 723bf8d3d175bfc9797521c3fa5d144421659ec9/0x4 1546s git-debrebase = AddPatches {"Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Type" => "AddPatches","Hdr" => "tree 270decbd8d0524e44c0e8a7e159283a5e00a92d3\nparent 723bf8d3d175bfc9797521c3fa5d144421659ec9\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","CommitId" => "746c74f56cca2e6f50c892fb87a9ec15ecf2bde8","Tree" => "270decbd8d0524e44c0e8a7e159283a5e00a92d3","Parents" => [{"Ix" => 0,"CommitId" => "723bf8d3d175bfc9797521c3fa5d144421659ec9","Differs" => 4}]} 1546s git-debrebase get_differs 088ca2748c333245f8f3dc6482c25427680a4f37 d8756ce5963485dffef0f9a43abc1ec0129d6c1e = 0x22 1546s git-debrebase classify 723bf8d3d175bfc9797521c3fa5d144421659ec9 $t=d8756ce5963485dffef0f9a43abc1ec0129d6c1e @p 088ca2748c333245f8f3dc6482c25427680a4f37/0x22 1546s git-debrebase = Mixed {"Parents" => [{"Ix" => 0,"CommitId" => "088ca2748c333245f8f3dc6482c25427680a4f37","Differs" => 34}],"Tree" => "d8756ce5963485dffef0f9a43abc1ec0129d6c1e","CommitId" => "723bf8d3d175bfc9797521c3fa5d144421659ec9","Type" => "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"} 1546s git-debrebase get_differs 5a670186618804169c6ac55f3c296ebd370af060 a448632c39f18e3867a3c19a5cf796f2c50ae2f6 = 0x2 1546s git-debrebase classify 088ca2748c333245f8f3dc6482c25427680a4f37 $t=a448632c39f18e3867a3c19a5cf796f2c50ae2f6 @p 5a670186618804169c6ac55f3c296ebd370af060/0x2 1546s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Upstream","Hdr" => "tree a448632c39f18e3867a3c19a5cf796f2c50ae2f6\nparent 5a670186618804169c6ac55f3c296ebd370af060\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "088ca2748c333245f8f3dc6482c25427680a4f37","Tree" => "a448632c39f18e3867a3c19a5cf796f2c50ae2f6","Parents" => [{"CommitId" => "5a670186618804169c6ac55f3c296ebd370af060","Differs" => 2,"Ix" => 0}]} 1546s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f = 0x20 1546s git-debrebase classify 5a670186618804169c6ac55f3c296ebd370af060 $t=7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 1546s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Ix" => 0}],"CommitId" => "5a670186618804169c6ac55f3c296ebd370af060","Tree" => "7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f","Hdr" => "tree 7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n"} 1546s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1546s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1546s 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","Type" => "AddPatches","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Parents" => [{"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Differs" => 4}]} 1546s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1546s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1546s git-debrebase = Changelog {"Type" => "Changelog","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","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}]} 1546s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1546s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1546s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Ix" => 0}],"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"} 1546s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1546s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1546s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1546s git-debrebase = Pseudomerge {"Parents" => [{"Differs" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0},{"Ix" => 1,"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Type" => "Pseudomerge","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1546s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1546s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1546s 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","Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Parents" => [{"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2}]} 1546s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1546s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1546s git-debrebase = Upstream {"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","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}]} 1546s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1546s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1546s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"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"} 1546s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1546s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1546s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1546s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "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","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1546s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 1546s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1546s ' 1546s + local ocid otype oinfo 1546s + read ocid otype oinfo 1546s + case "$otype" in 1546s ++ printf %s 'dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9' 1546s ++ wc -w 1546s + local cnparents=2 1546s + test 2 = 2 1546s ++ for f in $parents 1546s ++ echo dab3cc0fcfead932f6714305cfb670067c157804 1546s ++ for f in $parents 1546s ++ echo 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 1546s ++ wc -w 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=2 1546s + test 2 = 2 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== dab3cc0fcfead932f6714305cfb670067c157804 Upstream ===== 1546s + test dab3cc0fcfead932f6714305cfb670067c157804 = dab3cc0fcfead932f6714305cfb670067c157804 1546s + local cetype=Upstream 1546s + '[' xUpstream = xUpstream ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P dab3cc0fcfead932f6714305cfb670067c157804 1546s + local parents=6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1546s + expect=6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1546s + enparents=1 1546s + : Upstream/SAME 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s ++ wc -w 1546s ++ printf %s 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ wc -w 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s ++ for f in $parents 1546s ++ echo 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 Upstream ===== 1546s + test 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 = 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1546s + local cetype=Upstream 1546s + '[' xUpstream = xUpstream ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1546s + local parents=3025551c1e030f25c60bdabaab789745e585f391 1546s + expect=3025551c1e030f25c60bdabaab789745e585f391 1546s + enparents=1 1546s + : Upstream/SAME 3025551c1e030f25c60bdabaab789745e585f391 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s ++ printf %s 3025551c1e030f25c60bdabaab789745e585f391 1546s ++ wc -w 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ wc -w 1546s ++ for f in $parents 1546s ++ echo 3025551c1e030f25c60bdabaab789745e585f391 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== 3025551c1e030f25c60bdabaab789745e585f391 Upstream ===== 1546s + test 3025551c1e030f25c60bdabaab789745e585f391 = 3025551c1e030f25c60bdabaab789745e585f391 1546s + local cetype=Upstream 1546s + '[' xUpstream = xUpstream ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P 3025551c1e030f25c60bdabaab789745e585f391 1546s + local parents=cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1546s + expect=cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1546s + enparents=1 1546s + : Upstream/SAME cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s ++ wc -w 1546s ++ printf %s cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ wc -w 1546s ++ for f in $parents 1546s ++ echo cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 Upstream ===== 1546s + test cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 = cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1546s + local cetype=Upstream 1546s + '[' xUpstream = xUpstream ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1546s + local parents=302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1546s + expect=302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1546s + enparents=1 1546s + : Upstream/SAME 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s ++ wc -w 1546s ++ printf %s 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ wc -w 1546s ++ for f in $parents 1546s ++ echo 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 Upstream ===== 1546s + test 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 = 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1546s + local cetype=Upstream 1546s + '[' xUpstream = xUpstream ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1546s + local parents=b0291461cc529ff9fa4060b3e41ebff6cb563c49 1546s + expect=b0291461cc529ff9fa4060b3e41ebff6cb563c49 1546s + enparents=1 1546s + : Upstream/SAME b0291461cc529ff9fa4060b3e41ebff6cb563c49 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s ++ wc -w 1546s ++ printf %s b0291461cc529ff9fa4060b3e41ebff6cb563c49 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ for f in $parents 1546s ++ echo b0291461cc529ff9fa4060b3e41ebff6cb563c49 1546s ++ t-sort -u 1546s ++ wc -w 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== b0291461cc529ff9fa4060b3e41ebff6cb563c49 Upstream ===== 1546s + test b0291461cc529ff9fa4060b3e41ebff6cb563c49 = b0291461cc529ff9fa4060b3e41ebff6cb563c49 1546s + local cetype=Upstream 1546s + '[' xUpstream = xUpstream ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P b0291461cc529ff9fa4060b3e41ebff6cb563c49 1546s + local parents=64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1546s + expect=64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1546s + enparents=1 1546s + : Upstream/SAME 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s ++ printf %s 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1546s ++ wc -w 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ for f in $parents 1546s ++ echo 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1546s ++ wc -w 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== 64efa6cded3fc4da385f8ed4bd8c72164c1c914d Upstream ===== 1546s + test 64efa6cded3fc4da385f8ed4bd8c72164c1c914d = 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1546s + local cetype=Upstream 1546s + '[' xUpstream = xUpstream ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1546s + local parents=5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1546s + expect=5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1546s + enparents=1 1546s + : Upstream/SAME 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s ++ printf %s 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1546s ++ wc -w 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ for f in $parents 1546s ++ echo 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1546s ++ t-sort -u 1546s ++ wc -w 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 Packaging ===== 1546s + test 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 = 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1546s + local cetype=Upstream 1546s + '[' xPackaging = xUpstream ']' 1546s ++ git log -n1 --pretty=format:%P 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1546s + local parents=420fa3b34303353709bcfbcf88ccc4e272f5ee48 1546s + expect=420fa3b34303353709bcfbcf88ccc4e272f5ee48 1546s + enparents=1 1546s + : Packaging/Upstream 420fa3b34303353709bcfbcf88ccc4e272f5ee48 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + '[' x '!=' x ']' 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s + git diff --quiet 420fa3b34303353709bcfbcf88ccc4e272f5ee48..5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 -- :. ':!debian' 1546s + git diff --quiet 420fa3b34303353709bcfbcf88ccc4e272f5ee48..5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 -- :debian/patches 1546s + etypes=Packaging 1546s ++ printf %s 420fa3b34303353709bcfbcf88ccc4e272f5ee48 1546s ++ wc -w 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ for f in $parents 1546s ++ echo 420fa3b34303353709bcfbcf88ccc4e272f5ee48 1546s ++ wc -w 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== 420fa3b34303353709bcfbcf88ccc4e272f5ee48 Packaging ===== 1546s + test 420fa3b34303353709bcfbcf88ccc4e272f5ee48 = 420fa3b34303353709bcfbcf88ccc4e272f5ee48 1546s + local cetype=Packaging 1546s + '[' xPackaging = xPackaging ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P 420fa3b34303353709bcfbcf88ccc4e272f5ee48 1546s + local parents=4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1546s + expect=4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1546s + enparents=1 1546s + : Packaging/SAME 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s + git diff --quiet 4926fc77fd0b974ce5a2892ad46669ed4ec14edb..420fa3b34303353709bcfbcf88ccc4e272f5ee48 -- :. ':!debian' 1546s + git diff --quiet 4926fc77fd0b974ce5a2892ad46669ed4ec14edb..420fa3b34303353709bcfbcf88ccc4e272f5ee48 -- :debian/patches 1546s + etypes=Packaging 1546s ++ printf %s 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1546s ++ wc -w 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ for f in $parents 1546s ++ echo 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1546s ++ wc -w 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== 4926fc77fd0b974ce5a2892ad46669ed4ec14edb Packaging ===== 1546s + test 4926fc77fd0b974ce5a2892ad46669ed4ec14edb = 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1546s + local cetype=Packaging 1546s + '[' xPackaging = xPackaging ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1546s + local parents=6184b930def645d1f8da8cb6a91475445cbb817d 1546s + expect=6184b930def645d1f8da8cb6a91475445cbb817d 1546s + enparents=1 1546s + : Packaging/SAME 6184b930def645d1f8da8cb6a91475445cbb817d 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s + git diff --quiet 6184b930def645d1f8da8cb6a91475445cbb817d..4926fc77fd0b974ce5a2892ad46669ed4ec14edb -- :. ':!debian' 1546s + git diff --quiet 6184b930def645d1f8da8cb6a91475445cbb817d..4926fc77fd0b974ce5a2892ad46669ed4ec14edb -- :debian/patches 1546s + etypes=Packaging 1546s ++ printf %s 6184b930def645d1f8da8cb6a91475445cbb817d 1546s ++ wc -w 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ for f in $parents 1546s ++ echo 6184b930def645d1f8da8cb6a91475445cbb817d 1546s ++ wc -w 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== 6184b930def645d1f8da8cb6a91475445cbb817d Packaging ===== 1546s + test 6184b930def645d1f8da8cb6a91475445cbb817d = 6184b930def645d1f8da8cb6a91475445cbb817d 1546s + local cetype=Packaging 1546s + '[' xPackaging = xPackaging ']' 1546s + cetype=SAME 1546s ++ git log -n1 --pretty=format:%P 6184b930def645d1f8da8cb6a91475445cbb817d 1546s + local parents=6b98ac2fc854dc69f9cabc904a8e43328f649f41 1546s + expect=6b98ac2fc854dc69f9cabc904a8e43328f649f41 1546s + enparents=1 1546s + : Packaging/SAME 6b98ac2fc854dc69f9cabc904a8e43328f649f41 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s + git diff --quiet 6b98ac2fc854dc69f9cabc904a8e43328f649f41..6184b930def645d1f8da8cb6a91475445cbb817d -- :. ':!debian' 1546s + git diff --quiet 6b98ac2fc854dc69f9cabc904a8e43328f649f41..6184b930def645d1f8da8cb6a91475445cbb817d -- :debian/patches 1546s + etypes=Packaging 1546s ++ printf %s 6b98ac2fc854dc69f9cabc904a8e43328f649f41 1546s ++ wc -w 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ for f in $parents 1546s ++ echo 6b98ac2fc854dc69f9cabc904a8e43328f649f41 1546s ++ wc -w 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== 6b98ac2fc854dc69f9cabc904a8e43328f649f41 Changelog ===== 1546s + test 6b98ac2fc854dc69f9cabc904a8e43328f649f41 = 6b98ac2fc854dc69f9cabc904a8e43328f649f41 1546s + local cetype=Packaging 1546s + '[' xChangelog = xPackaging ']' 1546s ++ git log -n1 --pretty=format:%P 6b98ac2fc854dc69f9cabc904a8e43328f649f41 1546s + local parents=bef5ccd302033398655e3e4e8896fba41691d0b2 1546s + expect=bef5ccd302033398655e3e4e8896fba41691d0b2 1546s + enparents=1 1546s + : Changelog/Packaging bef5ccd302033398655e3e4e8896fba41691d0b2 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s + git diff --quiet bef5ccd302033398655e3e4e8896fba41691d0b2..6b98ac2fc854dc69f9cabc904a8e43328f649f41 -- :. ':!debian/changelog' 1546s + etypes=Packaging 1546s ++ printf %s bef5ccd302033398655e3e4e8896fba41691d0b2 1546s ++ wc -w 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ for f in $parents 1546s ++ echo bef5ccd302033398655e3e4e8896fba41691d0b2 1546s ++ wc -w 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== bef5ccd302033398655e3e4e8896fba41691d0b2 Changelog ===== 1546s + test bef5ccd302033398655e3e4e8896fba41691d0b2 = bef5ccd302033398655e3e4e8896fba41691d0b2 1546s + local cetype=Packaging 1546s + '[' xChangelog = xPackaging ']' 1546s ++ git log -n1 --pretty=format:%P bef5ccd302033398655e3e4e8896fba41691d0b2 1546s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1546s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1546s + enparents=1 1546s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..bef5ccd302033398655e3e4e8896fba41691d0b2 -- :. ':!debian/changelog' 1546s + etypes=Packaging 1546s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1546s ++ wc -w 1546s + local cnparents=1 1546s + test 1 = 1 1546s ++ for f in $parents 1546s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1546s ++ wc -w 1546s ++ t-sort -u 1546s ++ LC_COLLATE=C 1546s ++ sort -u 1546s + local cndparents=1 1546s + test 1 = 1 1546s + case "$parents" in 1546s + case "$ctype" in 1546s + read cid ctype info 1546s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1546s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1546s + local cetype=Packaging 1546s + '[' xAnchor = xPackaging ']' 1546s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1546s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1546s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1546s + enparents=1 1546s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1546s + case "$ctype/$cetype" in 1546s + case "$ctype/$etypes" in 1546s + case "$cetype" in 1546s + case "$ctype" in 1546s + break 1546s + git checkout -b stitched-mixed master 1546s Switched to a new branch 'stitched-mixed' 1546s + mix-it 1546s + t-git-next-date 1546s + GIT_COMMITTER_DATE='1530000009 +0100' 1546s + GIT_AUTHOR_DATE='1530000009 +0100' 1546s ++ git symbolic-ref HEAD 1546s + local m=refs/heads/stitched-mixed 1546s + t-some-changes 'subcommands refs/heads/stitched-mixed 1' 1546s + local 'token=subcommands refs/heads/stitched-mixed 1' 1546s + local which=dum 1546s + local fsuffix= 1546s + t-git-next-date 1546s + GIT_COMMITTER_DATE='1530000010 +0100' 1546s + GIT_AUTHOR_DATE='1530000010 +0100' 1546s + case "$which" in 1546s + echo '// debian subcommands refs/heads/stitched-mixed 1' 1546s + git add debian/zorkmid 1546s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)' 1546s [stitched-mixed 772b2a1] DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1) 1546s 1 file changed, 1 insertion(+) 1546s create mode 100644 debian/zorkmid 1546s + case "$which" in 1546s + echo '// upstream subcommands refs/heads/stitched-mixed 1' 1546s + git add src.c 1546s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)' 1546s [stitched-mixed c848bc7] UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1) 1546s 1 file changed, 1 insertion(+) 1546s + case "$which" in 1546s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1546s + echo '// both! subcommands refs/heads/stitched-mixed 1' 1546s + git add debian/zorkmid 1546s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1546s + echo '// both! subcommands refs/heads/stitched-mixed 1' 1546s + git add src.c 1546s + git commit -m 'MIXED add both() (subcommands refs/heads/stitched-mixed 1)' 1546s [stitched-mixed 0a3febb] MIXED add both() (subcommands refs/heads/stitched-mixed 1) 1546s 2 files changed, 2 insertions(+) 1546s + t-git-next-date 1546s + GIT_COMMITTER_DATE='1530000011 +0100' 1546s + GIT_AUTHOR_DATE='1530000011 +0100' 1546s + t-dgit --git-debrebase=true -wgf quilt-fixup 1546s + local dgit=dgit 1546s + pwd 1546s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1546s + : ' 1546s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1546s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --git-debrebase=true -wgf quilt-fixup 1546s | git rev-parse --show-toplevel 1546s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1546s | git config -z --get-regexp --local '.*' 1546s | git config -z --get-regexp --local '.*' 1546s | git config -z --get-regexp --global '.*' 1546s | git config -z --get-regexp --system '.*' 1546s format 3.0 (quilt), quilt mode linear 1546s Format `3.0 (quilt)', need to check/update patch stack 1546s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1546s => `' 1546s + git diff --quiet HEAD 1546s + git clean -xdff 1546s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1546s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1546s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1546s | git rev-parse 'HEAD~0' 1546s => `0a3febb41892833b131ed8ca6958d68efc7f925f' 1546s | git symbolic-ref -q HEAD 1546s => `refs/heads/stitched-mixed' 1546s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1546s CD work 1546s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1546s + git reset -q --hard 0a3febb41892833b131ed8ca6958d68efc7f925f 1546s examining quilt state (multiple patches, linear mode) 1546s branch_is_gdr 0a3febb41892833b131ed8ca6958d68efc7f925f... 1546s branch_is_gdr 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf gdr make-patches YES 1546s + git reset -q --hard 0a3febb41892833b131ed8ca6958d68efc7f925f 1546s + true --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1546s | git rev-parse 'HEAD~0' 1546s => `0a3febb41892833b131ed8ca6958d68efc7f925f' 1546s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1546s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1546s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1546s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1547s CD fake 1547s | find -name .git -prune -print0 1547s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1547s + git checkout -f 0a3febb41892833b131ed8ca6958d68efc7f925f -- debian 1547s + git add -Af . 1547s | git write-tree 1547s => `950c91fd34627527a1a98b70074264de9d8186a0' 1547s fake orig tree object 950c91fd34627527a1a98b70074264de9d8186a0 1547s CD .. 1547s + git reset -q --hard 0a3febb41892833b131ed8ca6958d68efc7f925f 1547s CD ../fake 1547s + git add -Af . 1547s | git write-tree 1547s => `8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4' 1547s fake o+d/p tree object 950c91fd34627527a1a98b70074264de9d8186a0 1547s CD ../work 1547s | git ls-tree --name-only -z 0a3febb41892833b131ed8ca6958d68efc7f925f 1547s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1547s | git diff-tree -z --no-renames -r 950c91fd34627527a1a98b70074264de9d8186a0 0a3febb41892833b131ed8ca6958d68efc7f925f 1547s => `: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' 1547s quiltify_trees_differ 950c91fd34627527a1a98b70074264de9d8186a0 0a3febb41892833b131ed8ca6958d68efc7f925f => 1 1547s | git diff-tree -z --no-renames --name-only -r 0a3febb41892833b131ed8ca6958d68efc7f925f 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 1547s => `src.c\x00' 1547s quiltify_trees_differ 0a3febb41892833b131ed8ca6958d68efc7f925f 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 => 1 1547s | git diff-tree -z --no-renames --name-only -r 950c91fd34627527a1a98b70074264de9d8186a0 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 1547s => `lib.c\x00new-upstream-file\x00src.c\x00' 1547s quiltify_trees_differ 950c91fd34627527a1a98b70074264de9d8186a0 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 => 1 1547s differences @dl ## ## ## == == ==. 1547s dgit: base trees orig=950c91fd34627527a1a9 o+d/p=8177bf2df97565c3d3ff 1547s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1547s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1547s starting quiltify (multiple patches, linear mode) 1547s | git ls-tree --name-only 0a3febb41892833b131ed8ca6958d68efc7f925f -- debian/rules debian/control 1547s => `debian/control'... 1547s quiltify investigate 0a3febb41892833b131ed8ca6958d68efc7f925f 1547s | git diff-tree -z --no-renames --name-only 0a3febb41892833b131ed8ca6958d68efc7f925f 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 1547s => `src.c\x00' 1547s quiltify_trees_differ 0a3febb41892833b131ed8ca6958d68efc7f925f 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 => 1 1547s | git ls-tree --name-only 0a3febb41892833b131ed8ca6958d68efc7f925f -- debian/rules debian/control 1547s => `debian/control'... 1547s | git cat-file commit 0a3febb41892833b131ed8ca6958d68efc7f925f 1547s => `tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691'... 1547s | git diff-tree -z --no-renames --name-only c848bc784454d4635b6a71ea59b65b373615e8e4 0a3febb41892833b131ed8ca6958d68efc7f925f 1547s => `debian\x00src.c\x00' 1547s quiltify_trees_differ c848bc784454d4635b6a71ea59b65b373615e8e4 0a3febb41892833b131ed8ca6958d68efc7f925f => 1 1547s considering C=0a3febb41892833b131ed8ca6958d68efc7f925f P=c848bc784454d4635b6a71ea59b65b373615e8e4 1547s | git diff-tree -r --name-only c848bc784454d4635b6a71ea59b65b373615e8e4 0a3febb41892833b131ed8ca6958d68efc7f925f -- debian/patches .pc debian/source/format 1547s => `' 1547s search queue P=c848bc784454d4635b6a71ea59b65b373615e8e4 NT 1547s quiltify investigate c848bc784454d4635b6a71ea59b65b373615e8e4 1547s | git diff-tree -z --no-renames --name-only c848bc784454d4635b6a71ea59b65b373615e8e4 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 1547s => `debian\x00src.c\x00' 1547s quiltify_trees_differ c848bc784454d4635b6a71ea59b65b373615e8e4 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 => 1 1547s | git ls-tree --name-only c848bc784454d4635b6a71ea59b65b373615e8e4 -- debian/rules debian/control 1547s => `debian/control'... 1547s | git cat-file commit c848bc784454d4635b6a71ea59b65b373615e8e4 1547s => `tree af40286d15dcd54aed3b8586be973b89dfad2ee8'... 1547s | git diff-tree -z --no-renames --name-only 772b2a1d3dacffb5498a61b7c9518d57d439e1ca c848bc784454d4635b6a71ea59b65b373615e8e4 1547s => `src.c\x00' 1547s quiltify_trees_differ 772b2a1d3dacffb5498a61b7c9518d57d439e1ca c848bc784454d4635b6a71ea59b65b373615e8e4 => 1 1547s considering C=c848bc784454d4635b6a71ea59b65b373615e8e4 P=772b2a1d3dacffb5498a61b7c9518d57d439e1ca 1547s | git diff-tree -r --name-only 772b2a1d3dacffb5498a61b7c9518d57d439e1ca c848bc784454d4635b6a71ea59b65b373615e8e4 -- debian/patches .pc debian/source/format 1547s => `' 1547s search queue P=772b2a1d3dacffb5498a61b7c9518d57d439e1ca NT 1547s quiltify investigate 772b2a1d3dacffb5498a61b7c9518d57d439e1ca 1547s | git diff-tree -z --no-renames --name-only 772b2a1d3dacffb5498a61b7c9518d57d439e1ca 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 1547s => `debian\x00' 1547s quiltify_trees_differ 772b2a1d3dacffb5498a61b7c9518d57d439e1ca 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 => 0 1547s search finished hooray! 1547s quiltify linearisation planning successful, executing... 1547s quiltify traverse 772b2a1d3dacffb5498a61b7c9518d57d439e1ca..c848bc784454d4635b6a71ea59b65b373615e8e4 1547s | git cat-file commit c848bc784454d4635b6a71ea59b65b373615e8e4 1547s => `tree af40286d15dcd54aed3b8586be973b89dfad2ee8'... 1547s | git log -n1 '--pretty=format:%aD' c848bc784454d4635b6a71ea59b65b373615e8e4 1547s => `Tue, 26 Jun 2018 09:00:10 +0100' 1547s + git checkout -q c848bc784454d4635b6a71ea59b65b373615e8e4 1547s + git checkout -q 0a3febb41892833b131ed8ca6958d68efc7f925f debian/changelog 1547s | realpath -- /usr/bin/dgit 1547s => `/usr/bin/dgit' 1547s | realpath -- .git/dgit/quilt-description.tmp 1547s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1547s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-subcommands-refshead.patch 1547s dpkg-source: info: using patch list from debian/patches/series 1547s dpkg-source: info: local changes detected, the modified files are: 1547s work/src.c 1547s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-subcommands-refshead.patch 1547s + git checkout -q c848bc784454d4635b6a71ea59b65b373615e8e4 debian/changelog 1547s quiltify traverse c848bc784454d4635b6a71ea59b65b373615e8e4..0a3febb41892833b131ed8ca6958d68efc7f925f 1547s | git cat-file commit 0a3febb41892833b131ed8ca6958d68efc7f925f 1547s => `tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691'... 1547s | git log -n1 '--pretty=format:%aD' 0a3febb41892833b131ed8ca6958d68efc7f925f 1547s => `Tue, 26 Jun 2018 09:00:10 +0100' 1547s + git checkout -q 0a3febb41892833b131ed8ca6958d68efc7f925f 1547s + git checkout -q 0a3febb41892833b131ed8ca6958d68efc7f925f debian/changelog 1547s | realpath -- /usr/bin/dgit 1547s => `/usr/bin/dgit' 1547s | realpath -- .git/dgit/quilt-description.tmp 1547s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1547s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-subcommands-refsheadsstit.patch 1547s dpkg-source: info: using patch list from debian/patches/series 1547s dpkg-source: info: local changes detected, the modified files are: 1547s work/src.c 1548s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-subcommands-refsheadsstit.patch 1548s + git checkout -q 0a3febb41892833b131ed8ca6958d68efc7f925f debian/changelog 1548s + git checkout -q master 1548s | git status --ignored --porcelain 1548s => ` M debian/patches/series'... 1548s + git add -f debian/patches 1548s Commit Debian 3.0 (quilt) metadata 1548s 1548s [dgit (9.15) quilt-fixup] 1548s 1548s + git commit -m 'Commit Debian 3.0 (quilt) metadata 1548s 1548s [dgit (9.15) quilt-fixup] 1548s ' 1548s [master a5e2aaa] Commit Debian 3.0 (quilt) metadata 1548s 3 files changed, 29 insertions(+) 1548s create mode 100644 debian/patches/mixed-add-both-subcommands-refsheadsstit.patch 1548s create mode 100644 debian/patches/upstream-edit-src.c-subcommands-refshead.patch 1548s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1548s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1548s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1548s ' 1548s + t-git-next-date 1548s + GIT_COMMITTER_DATE='1530000012 +0100' 1548s + GIT_AUTHOR_DATE='1530000012 +0100' 1548s + t-some-changes 'subcommands refs/heads/stitched-mixed 2' 1548s + local 'token=subcommands refs/heads/stitched-mixed 2' 1548s + local which=dum 1548s + local fsuffix= 1548s + t-git-next-date 1548s + GIT_COMMITTER_DATE='1530000013 +0100' 1548s + GIT_AUTHOR_DATE='1530000013 +0100' 1548s + case "$which" in 1548s + echo '// debian subcommands refs/heads/stitched-mixed 2' 1548s + git add debian/zorkmid 1548s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)' 1548s [stitched-mixed 8240b51] DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2) 1548s 1 file changed, 1 insertion(+) 1548s + case "$which" in 1548s + echo '// upstream subcommands refs/heads/stitched-mixed 2' 1548s + git add src.c 1548s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)' 1548s [stitched-mixed 7091ade] UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2) 1548s 1 file changed, 1 insertion(+) 1548s + case "$which" in 1548s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1548s + echo '// both! subcommands refs/heads/stitched-mixed 2' 1548s + git add debian/zorkmid 1548s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1548s + echo '// both! subcommands refs/heads/stitched-mixed 2' 1548s + git add src.c 1548s + git commit -m 'MIXED add both() (subcommands refs/heads/stitched-mixed 2)' 1548s [stitched-mixed 5e0bf3c] MIXED add both() (subcommands refs/heads/stitched-mixed 2) 1548s 2 files changed, 2 insertions(+) 1548s + t-git-next-date 1548s + GIT_COMMITTER_DATE='1530000014 +0100' 1548s + GIT_AUTHOR_DATE='1530000014 +0100' 1548s + t-git-next-date 1548s + GIT_COMMITTER_DATE='1530000015 +0100' 1548s + GIT_AUTHOR_DATE='1530000015 +0100' 1548s + git checkout -b unstitched-laundered master 1548s Switched to a new branch 'unstitched-laundered' 1548s + mix-it 1548s + t-git-next-date 1548s + GIT_COMMITTER_DATE='1530000016 +0100' 1548s + GIT_AUTHOR_DATE='1530000016 +0100' 1548s ++ git symbolic-ref HEAD 1548s + local m=refs/heads/unstitched-laundered 1548s + t-some-changes 'subcommands refs/heads/unstitched-laundered 1' 1548s + local 'token=subcommands refs/heads/unstitched-laundered 1' 1548s + local which=dum 1548s + local fsuffix= 1548s + t-git-next-date 1548s + GIT_COMMITTER_DATE='1530000017 +0100' 1548s + GIT_AUTHOR_DATE='1530000017 +0100' 1548s + case "$which" in 1548s + echo '// debian subcommands refs/heads/unstitched-laundered 1' 1548s + git add debian/zorkmid 1548s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)' 1548s [unstitched-laundered d21d62b] DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1) 1548s 1 file changed, 1 insertion(+) 1548s create mode 100644 debian/zorkmid 1548s + case "$which" in 1548s + echo '// upstream subcommands refs/heads/unstitched-laundered 1' 1548s + git add src.c 1548s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)' 1548s [unstitched-laundered 6e9f712] UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 1548s 1 file changed, 1 insertion(+) 1548s + case "$which" in 1548s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1548s + echo '// both! subcommands refs/heads/unstitched-laundered 1' 1548s + git add debian/zorkmid 1548s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1548s + echo '// both! subcommands refs/heads/unstitched-laundered 1' 1548s + git add src.c 1548s + git commit -m 'MIXED add both() (subcommands refs/heads/unstitched-laundered 1)' 1548s [unstitched-laundered 85e8a38] MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 1548s 2 files changed, 2 insertions(+) 1548s + t-git-next-date 1548s + GIT_COMMITTER_DATE='1530000018 +0100' 1548s + GIT_AUTHOR_DATE='1530000018 +0100' 1548s + t-dgit --git-debrebase=true -wgf quilt-fixup 1548s + local dgit=dgit 1548s + pwd 1548s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1548s + : ' 1548s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1548s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --git-debrebase=true -wgf quilt-fixup 1548s | git rev-parse --show-toplevel 1548s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1548s | git config -z --get-regexp --local '.*' 1548s | git config -z --get-regexp --local '.*' 1548s | git config -z --get-regexp --global '.*' 1548s | git config -z --get-regexp --system '.*' 1548s format 3.0 (quilt), quilt mode linear 1548s Format `3.0 (quilt)', need to check/update patch stack 1548s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1548s => `' 1548s + git diff --quiet HEAD 1548s + git clean -xdff 1548s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1548s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1548s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1548s | git rev-parse 'HEAD~0' 1548s => `85e8a3829c886a9d45de8e3ffb9a234849b63e04' 1548s | git symbolic-ref -q HEAD 1548s => `refs/heads/unstitched-laundered' 1548s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1548s CD work 1548s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1548s + git reset -q --hard 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1548s examining quilt state (multiple patches, linear mode) 1548s branch_is_gdr 85e8a3829c886a9d45de8e3ffb9a234849b63e04... 1548s branch_is_gdr 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf gdr make-patches YES 1548s + git reset -q --hard 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1548s + true --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1548s | git rev-parse 'HEAD~0' 1548s => `85e8a3829c886a9d45de8e3ffb9a234849b63e04' 1548s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1548s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1548s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1548s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1548s CD fake 1548s | find -name .git -prune -print0 1548s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1548s + git checkout -f 85e8a3829c886a9d45de8e3ffb9a234849b63e04 -- debian 1548s + git add -Af . 1548s | git write-tree 1548s => `49edf6484b13cb12c56a1dd6bf7fdee14eef8a10' 1548s fake orig tree object 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 1548s CD .. 1548s + git reset -q --hard 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1548s CD ../fake 1548s + git add -Af . 1548s | git write-tree 1548s => `ce93180215d1bdeb6ffe0e3ea156cbec27668884' 1548s fake o+d/p tree object 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 1548s CD ../work 1548s | git ls-tree --name-only -z 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1548s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1548s | git diff-tree -z --no-renames -r 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1548s => `: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' 1548s quiltify_trees_differ 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 85e8a3829c886a9d45de8e3ffb9a234849b63e04 => 1 1548s | git diff-tree -z --no-renames --name-only -r 85e8a3829c886a9d45de8e3ffb9a234849b63e04 ce93180215d1bdeb6ffe0e3ea156cbec27668884 1548s => `src.c\x00' 1548s quiltify_trees_differ 85e8a3829c886a9d45de8e3ffb9a234849b63e04 ce93180215d1bdeb6ffe0e3ea156cbec27668884 => 1 1548s | git diff-tree -z --no-renames --name-only -r 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 ce93180215d1bdeb6ffe0e3ea156cbec27668884 1548s => `lib.c\x00new-upstream-file\x00src.c\x00' 1548s quiltify_trees_differ 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 ce93180215d1bdeb6ffe0e3ea156cbec27668884 => 1 1548s differences @dl ## ## ## == == ==. 1548s dgit: base trees orig=49edf6484b13cb12c56a o+d/p=ce93180215d1bdeb6ffe 1548s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1548s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1548s starting quiltify (multiple patches, linear mode) 1548s | git ls-tree --name-only 85e8a3829c886a9d45de8e3ffb9a234849b63e04 -- debian/rules debian/control 1548s => `debian/control'... 1548s quiltify investigate 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1548s | git diff-tree -z --no-renames --name-only 85e8a3829c886a9d45de8e3ffb9a234849b63e04 ce93180215d1bdeb6ffe0e3ea156cbec27668884 1548s => `src.c\x00' 1548s quiltify_trees_differ 85e8a3829c886a9d45de8e3ffb9a234849b63e04 ce93180215d1bdeb6ffe0e3ea156cbec27668884 => 1 1548s | git ls-tree --name-only 85e8a3829c886a9d45de8e3ffb9a234849b63e04 -- debian/rules debian/control 1548s => `debian/control'... 1548s | git cat-file commit 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1548s => `tree e52bfe26cab82358d9166d4626737511a9ad43e0'... 1548s | git diff-tree -z --no-renames --name-only 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1548s => `debian\x00src.c\x00' 1548s quiltify_trees_differ 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 85e8a3829c886a9d45de8e3ffb9a234849b63e04 => 1 1548s considering C=85e8a3829c886a9d45de8e3ffb9a234849b63e04 P=6e9f7126541b0e82b28210a152f4f3ef82c8b51c 1548s | git diff-tree -r --name-only 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 85e8a3829c886a9d45de8e3ffb9a234849b63e04 -- debian/patches .pc debian/source/format 1548s => `' 1548s search queue P=6e9f7126541b0e82b28210a152f4f3ef82c8b51c NT 1548s quiltify investigate 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 1548s | git diff-tree -z --no-renames --name-only 6e9f7126541b0e82b28210a152f4f3ef82c8b51c ce93180215d1bdeb6ffe0e3ea156cbec27668884 1548s => `debian\x00src.c\x00' 1548s quiltify_trees_differ 6e9f7126541b0e82b28210a152f4f3ef82c8b51c ce93180215d1bdeb6ffe0e3ea156cbec27668884 => 1 1548s | git ls-tree --name-only 6e9f7126541b0e82b28210a152f4f3ef82c8b51c -- debian/rules debian/control 1548s => `debian/control'... 1548s | git cat-file commit 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 1548s => `tree 531dd9092765b0ad96064ac44739912e46bdaa5a'... 1548s | git diff-tree -z --no-renames --name-only d21d62b6ddb3e581d7b5b2079aed326347f2d928 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 1548s => `src.c\x00' 1548s quiltify_trees_differ d21d62b6ddb3e581d7b5b2079aed326347f2d928 6e9f7126541b0e82b28210a152f4f3ef82c8b51c => 1 1548s considering C=6e9f7126541b0e82b28210a152f4f3ef82c8b51c P=d21d62b6ddb3e581d7b5b2079aed326347f2d928 1548s | git diff-tree -r --name-only d21d62b6ddb3e581d7b5b2079aed326347f2d928 6e9f7126541b0e82b28210a152f4f3ef82c8b51c -- debian/patches .pc debian/source/format 1548s => `' 1548s search queue P=d21d62b6ddb3e581d7b5b2079aed326347f2d928 NT 1548s quiltify investigate d21d62b6ddb3e581d7b5b2079aed326347f2d928 1548s | git diff-tree -z --no-renames --name-only d21d62b6ddb3e581d7b5b2079aed326347f2d928 ce93180215d1bdeb6ffe0e3ea156cbec27668884 1548s => `debian\x00' 1548s quiltify_trees_differ d21d62b6ddb3e581d7b5b2079aed326347f2d928 ce93180215d1bdeb6ffe0e3ea156cbec27668884 => 0 1548s search finished hooray! 1548s quiltify linearisation planning successful, executing... 1548s quiltify traverse d21d62b6ddb3e581d7b5b2079aed326347f2d928..6e9f7126541b0e82b28210a152f4f3ef82c8b51c 1548s | git cat-file commit 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 1548s => `tree 531dd9092765b0ad96064ac44739912e46bdaa5a'... 1548s | git log -n1 '--pretty=format:%aD' 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 1548s => `Tue, 26 Jun 2018 09:00:17 +0100' 1548s + git checkout -q 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 1548s + git checkout -q 85e8a3829c886a9d45de8e3ffb9a234849b63e04 debian/changelog 1548s | realpath -- /usr/bin/dgit 1548s => `/usr/bin/dgit' 1548s | realpath -- .git/dgit/quilt-description.tmp 1548s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1548s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-subcommands-refshead.patch 1548s dpkg-source: info: using patch list from debian/patches/series 1548s dpkg-source: info: local changes detected, the modified files are: 1548s work/src.c 1549s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-subcommands-refshead.patch 1549s + git checkout -q 6e9f7126541b0e82b28210a152f4f3ef82c8b51c debian/changelog 1549s quiltify traverse 6e9f7126541b0e82b28210a152f4f3ef82c8b51c..85e8a3829c886a9d45de8e3ffb9a234849b63e04 1549s | git cat-file commit 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1549s => `tree e52bfe26cab82358d9166d4626737511a9ad43e0'... 1549s | git log -n1 '--pretty=format:%aD' 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1549s => `Tue, 26 Jun 2018 09:00:17 +0100' 1549s + git checkout -q 85e8a3829c886a9d45de8e3ffb9a234849b63e04 1549s + git checkout -q 85e8a3829c886a9d45de8e3ffb9a234849b63e04 debian/changelog 1549s | realpath -- /usr/bin/dgit 1549s => `/usr/bin/dgit' 1549s | realpath -- .git/dgit/quilt-description.tmp 1549s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1549s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-subcommands-refsheadsunst.patch 1549s dpkg-source: info: using patch list from debian/patches/series 1549s dpkg-source: info: local changes detected, the modified files are: 1549s work/src.c 1549s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-subcommands-refsheadsunst.patch 1549s + git checkout -q 85e8a3829c886a9d45de8e3ffb9a234849b63e04 debian/changelog 1549s + git checkout -q master 1549s | git status --ignored --porcelain 1549s => ` M debian/patches/series'... 1549s + git add -f debian/patches 1549s Commit Debian 3.0 (quilt) metadata 1549s 1549s [dgit (9.15) quilt-fixup] 1549s 1549s + git commit -m 'Commit Debian 3.0 (quilt) metadata 1549s 1549s [dgit (9.15) quilt-fixup] 1549s ' 1549s [master f210833] Commit Debian 3.0 (quilt) metadata 1549s 3 files changed, 29 insertions(+) 1549s create mode 100644 debian/patches/mixed-add-both-subcommands-refsheadsunst.patch 1549s create mode 100644 debian/patches/upstream-edit-src.c-subcommands-refshead.patch 1549s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1549s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1549s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1549s ' 1549s + t-git-next-date 1549s + GIT_COMMITTER_DATE='1530000019 +0100' 1549s + GIT_AUTHOR_DATE='1530000019 +0100' 1549s + t-some-changes 'subcommands refs/heads/unstitched-laundered 2' 1549s + local 'token=subcommands refs/heads/unstitched-laundered 2' 1549s + local which=dum 1549s + local fsuffix= 1549s + t-git-next-date 1549s + GIT_COMMITTER_DATE='1530000020 +0100' 1549s + GIT_AUTHOR_DATE='1530000020 +0100' 1549s + case "$which" in 1549s + echo '// debian subcommands refs/heads/unstitched-laundered 2' 1549s + git add debian/zorkmid 1549s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)' 1549s [unstitched-laundered 54e4f98] DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2) 1549s 1 file changed, 1 insertion(+) 1549s + case "$which" in 1549s + echo '// upstream subcommands refs/heads/unstitched-laundered 2' 1549s + git add src.c 1549s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)' 1549s [unstitched-laundered 15b5786] UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2) 1549s 1 file changed, 1 insertion(+) 1549s + case "$which" in 1549s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1549s + echo '// both! subcommands refs/heads/unstitched-laundered 2' 1549s + git add debian/zorkmid 1549s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1549s + echo '// both! subcommands refs/heads/unstitched-laundered 2' 1549s + git add src.c 1549s + git commit -m 'MIXED add both() (subcommands refs/heads/unstitched-laundered 2)' 1549s [unstitched-laundered 5c6280b] MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 1549s 2 files changed, 2 insertions(+) 1549s + t-git-next-date 1549s + GIT_COMMITTER_DATE='1530000021 +0100' 1549s + GIT_AUTHOR_DATE='1530000021 +0100' 1549s + t-git-next-date 1549s + GIT_COMMITTER_DATE='1530000022 +0100' 1549s + GIT_AUTHOR_DATE='1530000022 +0100' 1549s + git branch before-unstitch/unstitched-laundered 1549s + t-git-debrebase 1549s + local gdr=git-debrebase 1549s + : ' 1549s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1549s + git-debrebase --dgit=dgit -D 1549s git-debrebase ffq_prev_branchinfo branch current refs/heads/unstitched-laundered 1549s git-debrebase ffq check_specs * 1549s git-debrebase *** WALK 5c6280b3d52c002248dd7f608e1adb63f1295538 0 - 1549s git-debrebase get_differs 15b5786e8aa3b0253deec7a36f5926d7e5c2aab4 adfbc3faf90eab62de4813f7716481d852717bf2 = 0x22 1549s git-debrebase classify 5c6280b3d52c002248dd7f608e1adb63f1295538 $t=adfbc3faf90eab62de4813f7716481d852717bf2 @p 15b5786e8aa3b0253deec7a36f5926d7e5c2aab4/0x22 1549s git-debrebase = Mixed {"Hdr" => "tree adfbc3faf90eab62de4813f7716481d852717bf2\nparent 15b5786e8aa3b0253deec7a36f5926d7e5c2aab4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000020 +0100\n","Tree" => "adfbc3faf90eab62de4813f7716481d852717bf2","Parents" => [{"CommitId" => "15b5786e8aa3b0253deec7a36f5926d7e5c2aab4","Differs" => 34,"Ix" => 0}],"Type" => "Mixed","CommitId" => "5c6280b3d52c002248dd7f608e1adb63f1295538","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n"} 1549s git-debrebase get_differs 54e4f9870a939a8eb9f5f0db7bec775d11bf4306 f2c3fb1bbf83b614cb648bf9ac9bedd675316021 = 0x2 1549s git-debrebase classify 15b5786e8aa3b0253deec7a36f5926d7e5c2aab4 $t=f2c3fb1bbf83b614cb648bf9ac9bedd675316021 @p 54e4f9870a939a8eb9f5f0db7bec775d11bf4306/0x2 1549s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"Ix" => 0,"CommitId" => "54e4f9870a939a8eb9f5f0db7bec775d11bf4306","Differs" => 2}],"Type" => "Upstream","CommitId" => "15b5786e8aa3b0253deec7a36f5926d7e5c2aab4","Hdr" => "tree f2c3fb1bbf83b614cb648bf9ac9bedd675316021\nparent 54e4f9870a939a8eb9f5f0db7bec775d11bf4306\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000020 +0100\n","Tree" => "f2c3fb1bbf83b614cb648bf9ac9bedd675316021"} 1549s git-debrebase get_differs f210833dc45e533c145be531241b38c24ea3dd34 70700ae84a26e2c017102a14db0dd8dba67bed70 = 0x20 1549s git-debrebase classify 54e4f9870a939a8eb9f5f0db7bec775d11bf4306 $t=70700ae84a26e2c017102a14db0dd8dba67bed70 @p f210833dc45e533c145be531241b38c24ea3dd34/0x20 1549s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"CommitId" => "f210833dc45e533c145be531241b38c24ea3dd34","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "54e4f9870a939a8eb9f5f0db7bec775d11bf4306","Hdr" => "tree 70700ae84a26e2c017102a14db0dd8dba67bed70\nparent f210833dc45e533c145be531241b38c24ea3dd34\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000020 +0100\n","Tree" => "70700ae84a26e2c017102a14db0dd8dba67bed70"} 1549s git-debrebase get_differs 85e8a3829c886a9d45de8e3ffb9a234849b63e04 360c14201905457ce0dfedc4f4ce34364ae63a68 = 0x4 1549s git-debrebase classify f210833dc45e533c145be531241b38c24ea3dd34 $t=360c14201905457ce0dfedc4f4ce34364ae63a68 @p 85e8a3829c886a9d45de8e3ffb9a234849b63e04/0x4 1549s git-debrebase = AddPatches {"Hdr" => "tree 360c14201905457ce0dfedc4f4ce34364ae63a68\nparent 85e8a3829c886a9d45de8e3ffb9a234849b63e04\nauthor dgit test git user 1530000018 +0100\ncommitter dgit test git user 1530000018 +0100\n","Tree" => "360c14201905457ce0dfedc4f4ce34364ae63a68","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Type" => "AddPatches","Parents" => [{"Ix" => 0,"CommitId" => "85e8a3829c886a9d45de8e3ffb9a234849b63e04","Differs" => 4}],"CommitId" => "f210833dc45e533c145be531241b38c24ea3dd34"} 1549s git-debrebase get_differs 6e9f7126541b0e82b28210a152f4f3ef82c8b51c e52bfe26cab82358d9166d4626737511a9ad43e0 = 0x22 1549s git-debrebase classify 85e8a3829c886a9d45de8e3ffb9a234849b63e04 $t=e52bfe26cab82358d9166d4626737511a9ad43e0 @p 6e9f7126541b0e82b28210a152f4f3ef82c8b51c/0x22 1549s git-debrebase = Mixed {"Hdr" => "tree e52bfe26cab82358d9166d4626737511a9ad43e0\nparent 6e9f7126541b0e82b28210a152f4f3ef82c8b51c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "e52bfe26cab82358d9166d4626737511a9ad43e0","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "85e8a3829c886a9d45de8e3ffb9a234849b63e04","Type" => "Mixed","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "6e9f7126541b0e82b28210a152f4f3ef82c8b51c"}]} 1549s git-debrebase get_differs d21d62b6ddb3e581d7b5b2079aed326347f2d928 531dd9092765b0ad96064ac44739912e46bdaa5a = 0x2 1549s git-debrebase classify 6e9f7126541b0e82b28210a152f4f3ef82c8b51c $t=531dd9092765b0ad96064ac44739912e46bdaa5a @p d21d62b6ddb3e581d7b5b2079aed326347f2d928/0x2 1549s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "d21d62b6ddb3e581d7b5b2079aed326347f2d928"}],"CommitId" => "6e9f7126541b0e82b28210a152f4f3ef82c8b51c","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Hdr" => "tree 531dd9092765b0ad96064ac44739912e46bdaa5a\nparent d21d62b6ddb3e581d7b5b2079aed326347f2d928\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "531dd9092765b0ad96064ac44739912e46bdaa5a"} 1549s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 2c5286e4af2cdee0857ef37f95d3f8193bd91e00 = 0x20 1549s git-debrebase classify d21d62b6ddb3e581d7b5b2079aed326347f2d928 $t=2c5286e4af2cdee0857ef37f95d3f8193bd91e00 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 1549s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Ix" => 0}],"Type" => "Packaging","CommitId" => "d21d62b6ddb3e581d7b5b2079aed326347f2d928","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Hdr" => "tree 2c5286e4af2cdee0857ef37f95d3f8193bd91e00\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "2c5286e4af2cdee0857ef37f95d3f8193bd91e00"} 1549s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1549s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1549s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Type" => "AddPatches","Parents" => [{"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Differs" => 4}],"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1549s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1549s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1549s 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","Parents" => [{"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0}],"Type" => "Changelog","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"} 1549s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1549s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1549s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","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","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db"} 1549s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1549s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1549s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1549s git-debrebase = Pseudomerge {"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Type" => "Pseudomerge","Parents" => [{"Differs" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0},{"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Ix" => 1}],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","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","Contributor" => $VAR1->{"Parents"}[0]} 1549s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1549s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1549s 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" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2,"Ix" => 0}]} 1549s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1549s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1549s 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}],"Type" => "Upstream","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1549s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1549s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1549s git-debrebase = Upstream {"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" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1549s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1549s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1549s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1549s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1549s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 1549s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1549s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1549s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 20 1549s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1549s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1549s git-debrebase WALK REWRITING NOW cl=HASH(0x6b8ea4c1fe0) procd=HASH(0x6b8ea4ccca0) 1549s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1549s git-debrebase WALK BUILD d21d62b6ddb3e581d7b5b2079aed326347f2d928 Debian (rewriting=1) 1549s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1549s git-debrebase WALK BUILD 85e8a3829c886a9d45de8e3ffb9a234849b63e04 Debian (rewriting=1) 1549s git-debrebase WALK BUILD 54e4f9870a939a8eb9f5f0db7bec775d11bf4306 Debian (rewriting=1) 1549s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1549s git-debrebase WALK BUILD 5c6280b3d52c002248dd7f608e1adb63f1295538 Debian (rewriting=1) 1549s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1549s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1549s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1549s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1549s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1549s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1549s git-debrebase WALK BUILD 6e9f7126541b0e82b28210a152f4f3ef82c8b51c Upstream (rewriting=1) 1549s git-debrebase WALK BUILD 85e8a3829c886a9d45de8e3ffb9a234849b63e04 Upstream (rewriting=1) 1550s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1550s git-debrebase WALK BUILD 15b5786e8aa3b0253deec7a36f5926d7e5c2aab4 Upstream (rewriting=1) 1550s git-debrebase WALK BUILD 5c6280b3d52c002248dd7f608e1adb63f1295538 Upstream (rewriting=1) 1550s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1550s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5c6280b3d52c002248dd7f608e1adb63f1295538 = 0x4 1550s git-debrebase *** WALK RETURN 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 86248dea3770451139d1a57015bd9b36aa1ed39c 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1550s git-debrebase: laundered (head was 5c6280b3d52c002248dd7f608e1adb63f1295538) 1550s git-debrebase >= update refs/ffq-prev/heads/unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 0000000000000000000000000000000000000000 1550s git-debrebase >= delete refs/debrebase-last/heads/unstitched-laundered 1550s git-debrebase >= update HEAD 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5c6280b3d52c002248dd7f608e1adb63f1295538 1550s git-debrebase >$ 1550s Recorded previous head for preservation 1550s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1550s ' 1550s + t-gdr-good laundered 1550s + local state=laundered 1550s + local beforetag= 1550s + case $state in 1550s + git diff --quiet -- :. ':!debian/patches' 1550s + LC_MESSAGES=C 1550s + t-git-debrebase status 1550s + local gdr=git-debrebase 1550s + : ' 1550s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1550s + git-debrebase --dgit=dgit -D status 1550s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1550s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1550s git-debrebase = 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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 1550s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1550s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1550s 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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}],"Type" => "Upstream","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 1550s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1550s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1550s 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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Type" => "Upstream","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1550s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1550s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1550s git-debrebase = Upstream {"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","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","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Parents" => [{"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2}]} 1550s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1550s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1550s git-debrebase = Upstream {"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","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}]} 1550s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1550s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1550s git-debrebase = 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","Parents" => [{"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2}],"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Type" => "Upstream"} 1550s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1550s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1550s git-debrebase = Upstream {"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0,"Differs" => 2}],"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","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"} 1550s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1550s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1550s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}],"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","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"} 1550s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1550s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1550s 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,"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 1550s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1550s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1550s git-debrebase = Packaging {"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","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}]} 1550s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1550s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1550s git-debrebase = 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,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Type" => "Packaging","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 1550s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1550s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1550s 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","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog"} 1550s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1550s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1550s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","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","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 1550s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1550s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1550s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1550s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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"} 1550s git-debrebase ffq_prev_branchinfo branch current refs/heads/unstitched-laundered 1550s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1550s ' 1550s + case $state in 1550s + egrep '^ *branch is laundered' ../status.check 1550s branch is laundered 1550s + t-gdr-good-analyse HEAD laundered 1550s + local head=HEAD 1550s + local state=laundered 1550s + local wsfx= 1550s + local etypes bwtip 1550s + case $state in 1550s + etypes=Upstream 1550s ++ t-git-debrebase breakwater 1550s ++ local gdr=git-debrebase 1550s ++ : ' 1550s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1550s ++ git-debrebase --dgit=dgit -D breakwater 1550s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1550s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1550s 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","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Parents" => [{"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b"} 1550s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1550s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1550s git-debrebase = Upstream {"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","Type" => "Upstream","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"} 1550s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1550s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1550s git-debrebase = Upstream {"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","Ix" => 0,"Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e"} 1550s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1550s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1550s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Type" => "Upstream","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1550s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1550s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1550s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}]} 1550s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1550s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1550s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","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}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5"} 1550s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1550s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1550s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","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" => [{"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2}]} 1550s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1550s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1550s git-debrebase = Packaging {"Type" => "Packaging","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","Parents" => [{"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0}],"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 1550s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1550s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1550s git-debrebase = Packaging {"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1550s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1550s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1550s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}],"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Type" => "Packaging","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1550s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1550s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1550s 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","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 1550s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1550s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1550s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","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","Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 1550s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1550s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1550s git-debrebase = 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","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1550s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1550s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1550s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1550s 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},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 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","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1550s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1550s ' 1550s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1550s + anal=../anal 1550s + t-git-debrebase analyse HEAD 1550s + local gdr=git-debrebase 1550s + : ' 1550s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1550s + git-debrebase --dgit=dgit -D analyse HEAD 1550s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 1550s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1550s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1550s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","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","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2}]} 1550s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1550s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1550s git-debrebase = Upstream {"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "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","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}]} 1550s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1550s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1550s 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","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2}],"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1550s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1550s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1550s git-debrebase = 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","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Type" => "Upstream"} 1550s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1550s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1550s git-debrebase = Upstream {"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","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"}],"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1550s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1550s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1550s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Type" => "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","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5"} 1550s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1550s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1550s git-debrebase = Upstream {"Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2,"Ix" => 0}],"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","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Type" => "Upstream"} 1550s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1550s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1550s 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","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32,"Ix" => 0}]} 1550s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1550s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1550s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","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" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32,"Ix" => 0}]} 1550s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1550s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1550s 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","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32,"Ix" => 0}],"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1550s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1550s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1550s git-debrebase = Packaging {"Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Parents" => [{"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32}],"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 1550s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1550s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1550s git-debrebase = Changelog {"Type" => "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","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}]} 1550s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1550s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1550s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1550s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1550s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1550s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1550s git-debrebase = Anchor {"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","OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 1550s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1550s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1550s ' 1550s ++ git rev-parse HEAD 1550s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1550s + exec 1550s + local cid ctype info nparents 1550s + read cid ctype info 1550s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 1550s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1550s + local cetype=Upstream 1550s + '[' xUpstream = xUpstream ']' 1550s + cetype=SAME 1550s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1550s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1550s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1550s + enparents=1 1550s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 1550s ++ wc -w 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 1550s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 1550s + local cetype=Upstream 1550s + '[' xUpstream = xUpstream ']' 1550s + cetype=SAME 1550s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 1550s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1550s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1550s + enparents=1 1550s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ wc -w 1550s ++ for f in $parents 1550s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 1550s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1550s + local cetype=Upstream 1550s + '[' xUpstream = xUpstream ']' 1550s + cetype=SAME 1550s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1550s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 1550s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 1550s + enparents=1 1550s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s ++ wc -w 1550s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 1550s ++ wc -w 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 1550s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 1550s + local cetype=Upstream 1550s + '[' xUpstream = xUpstream ']' 1550s + cetype=SAME 1550s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 1550s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 1550s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 1550s + enparents=1 1550s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 1550s ++ wc -w 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 1550s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 1550s + local cetype=Upstream 1550s + '[' xUpstream = xUpstream ']' 1550s + cetype=SAME 1550s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 1550s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1550s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1550s + enparents=1 1550s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1550s ++ wc -w 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 1550s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1550s + local cetype=Upstream 1550s + '[' xUpstream = xUpstream ']' 1550s + cetype=SAME 1550s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1550s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1550s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1550s + enparents=1 1550s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1550s ++ wc -w 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 1550s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1550s + local cetype=Upstream 1550s + '[' xUpstream = xUpstream ']' 1550s + cetype=SAME 1550s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1550s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 1550s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 1550s + enparents=1 1550s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 1550s ++ wc -w 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 1550s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 1550s + local cetype=Upstream 1550s + '[' xPackaging = xUpstream ']' 1550s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 1550s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1550s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1550s + enparents=1 1550s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 1550s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1550s + bwtip= 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 1550s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 1550s + etypes=Packaging 1550s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s ++ wc -w 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 1550s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1550s + local cetype=Packaging 1550s + '[' xPackaging = xPackaging ']' 1550s + cetype=SAME 1550s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1550s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1550s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1550s + enparents=1 1550s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 1550s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 1550s + etypes=Packaging 1550s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1550s ++ wc -w 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 1550s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1550s + local cetype=Packaging 1550s + '[' xPackaging = xPackaging ']' 1550s + cetype=SAME 1550s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1550s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 1550s + expect=515e62b8d591fcc68597383b955d898db71abc6c 1550s + enparents=1 1550s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 1550s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 1550s + etypes=Packaging 1550s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 1550s ++ wc -w 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 1550s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 1550s + local cetype=Packaging 1550s + '[' xPackaging = xPackaging ']' 1550s + cetype=SAME 1550s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 1550s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 1550s + expect=809643e5389def220ea36d61f2d3dd504603e95a 1550s + enparents=1 1550s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 1550s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 1550s + etypes=Packaging 1550s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 1550s ++ wc -w 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 1550s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 1550s + local cetype=Packaging 1550s + '[' xChangelog = xPackaging ']' 1550s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 1550s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 1550s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 1550s + enparents=1 1550s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 1550s + etypes=Packaging 1550s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ wc -w 1550s ++ for f in $parents 1550s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 1550s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 1550s + local cetype=Packaging 1550s + '[' xChangelog = xPackaging ']' 1550s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 1550s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1550s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1550s + enparents=1 1550s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 1550s + etypes=Packaging 1550s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1550s ++ wc -w 1550s + local cnparents=1 1550s + test 1 = 1 1550s ++ for f in $parents 1550s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1550s ++ t-sort -u 1550s ++ LC_COLLATE=C 1550s ++ sort -u 1550s ++ wc -w 1550s + local cndparents=1 1550s + test 1 = 1 1550s + case "$parents" in 1550s + case "$ctype" in 1550s + read cid ctype info 1550s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1550s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1550s + local cetype=Packaging 1550s + '[' xAnchor = xPackaging ']' 1550s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1550s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1550s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1550s + enparents=1 1550s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1550s + case "$ctype/$cetype" in 1550s + case "$ctype/$etypes" in 1550s + case "$cetype" in 1550s + case "$ctype" in 1550s + break 1550s + git checkout -b unstitched-mixed master 1550s Switched to a new branch 'unstitched-mixed' 1550s + git branch before-unstitch/unstitched-mixed 1550s + t-git-debrebase 1550s + local gdr=git-debrebase 1550s + : ' 1550s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1550s + git-debrebase --dgit=dgit -D 1550s git-debrebase ffq_prev_branchinfo branch current refs/heads/unstitched-mixed 1550s git-debrebase ffq check_specs * 1550s git-debrebase *** WALK 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0 - 1550s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1550s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1550s git-debrebase = AddPatches {"Type" => "AddPatches","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"} 1550s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1550s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1550s git-debrebase = Changelog {"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","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "dch -r -D unstable\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Type" => "Changelog"} 1550s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1550s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1550s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","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","Type" => "Changelog"} 1550s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1550s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1550s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1550s git-debrebase = Pseudomerge {"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],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","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]]} 1550s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1550s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1550s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0}],"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Type" => "Upstream"} 1550s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1550s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1550s git-debrebase = Upstream {"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","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Type" => "Upstream"} 1550s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1550s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1550s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","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"}]} 1550s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1550s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1550s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1550s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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"} 1550s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 4 proc 9 pm 0 1550s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1551s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1551s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 10 1551s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1551s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1551s git-debrebase WALK REWRITING NOW cl=HASH(0xfe3d54fa3c8) procd=HASH(0xfe3d54795e8) 1551s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1551s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1551s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1551s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1551s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1551s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1551s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1551s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1551s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf = 0x4 1551s git-debrebase *** WALK RETURN 9f40936eece8f6452df026cc64200db82005a166 809643e5389def220ea36d61f2d3dd504603e95a 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1551s git-debrebase: laundered (head was 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf) 1551s git-debrebase >= update refs/ffq-prev/heads/unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0000000000000000000000000000000000000000 1551s git-debrebase >= delete refs/debrebase-last/heads/unstitched-mixed 1551s git-debrebase >= update HEAD 9f40936eece8f6452df026cc64200db82005a166 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1551s git-debrebase >$ 1551s Recorded previous head for preservation 1551s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1551s ' 1551s + mix-it 1551s + t-git-next-date 1551s + GIT_COMMITTER_DATE='1530000023 +0100' 1551s + GIT_AUTHOR_DATE='1530000023 +0100' 1551s ++ git symbolic-ref HEAD 1551s + local m=refs/heads/unstitched-mixed 1551s + t-some-changes 'subcommands refs/heads/unstitched-mixed 1' 1551s + local 'token=subcommands refs/heads/unstitched-mixed 1' 1551s + local which=dum 1551s + local fsuffix= 1551s + t-git-next-date 1551s + GIT_COMMITTER_DATE='1530000024 +0100' 1551s + GIT_AUTHOR_DATE='1530000024 +0100' 1551s + case "$which" in 1551s + echo '// debian subcommands refs/heads/unstitched-mixed 1' 1551s + git add debian/zorkmid 1551s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)' 1551s [unstitched-mixed a4efcc9] DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1) 1551s 1 file changed, 1 insertion(+) 1551s create mode 100644 debian/zorkmid 1551s + case "$which" in 1551s + echo '// upstream subcommands refs/heads/unstitched-mixed 1' 1551s + git add src.c 1551s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)' 1551s [unstitched-mixed 5138bd8] UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1) 1551s 1 file changed, 1 insertion(+) 1551s + case "$which" in 1551s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1551s + echo '// both! subcommands refs/heads/unstitched-mixed 1' 1551s + git add debian/zorkmid 1551s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1551s + echo '// both! subcommands refs/heads/unstitched-mixed 1' 1551s + git add src.c 1551s + git commit -m 'MIXED add both() (subcommands refs/heads/unstitched-mixed 1)' 1551s [unstitched-mixed 6e00b9c] MIXED add both() (subcommands refs/heads/unstitched-mixed 1) 1551s 2 files changed, 2 insertions(+) 1551s + t-git-next-date 1551s + GIT_COMMITTER_DATE='1530000025 +0100' 1551s + GIT_AUTHOR_DATE='1530000025 +0100' 1551s + t-dgit --git-debrebase=true -wgf quilt-fixup 1551s + local dgit=dgit 1551s + pwd 1551s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1551s + : ' 1551s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1551s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --git-debrebase=true -wgf quilt-fixup 1551s | git rev-parse --show-toplevel 1551s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1551s | git config -z --get-regexp --local '.*' 1551s | git config -z --get-regexp --local '.*' 1551s | git config -z --get-regexp --global '.*' 1551s | git config -z --get-regexp --system '.*' 1551s format 3.0 (quilt), quilt mode linear 1551s Format `3.0 (quilt)', need to check/update patch stack 1551s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1551s => `' 1551s + git diff --quiet HEAD 1551s + git clean -xdff 1551s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1551s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1551s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1551s | git rev-parse 'HEAD~0' 1551s => `6e00b9cbfb2ac78131496aadb210310e5b4b6a84' 1551s | git symbolic-ref -q HEAD 1551s => `refs/heads/unstitched-mixed' 1551s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1551s CD work 1551s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1551s + git reset -q --hard 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1551s examining quilt state (multiple patches, linear mode) 1551s branch_is_gdr 6e00b9cbfb2ac78131496aadb210310e5b4b6a84... 1551s branch_is_gdr 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 gdr anchor YES 1551s + git reset -q --hard 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1551s + true --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1551s | git rev-parse 'HEAD~0' 1551s => `6e00b9cbfb2ac78131496aadb210310e5b4b6a84' 1551s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1551s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1551s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1551s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1551s CD fake 1551s | find -name .git -prune -print0 1551s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1551s + git checkout -f 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 -- debian 1551s + git add -Af . 1551s | git write-tree 1551s => `17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71' 1551s fake orig tree object 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s CD .. 1551s + git reset -q --hard 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1551s CD ../fake 1551s + git add -Af . 1551s | git write-tree 1551s => `17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71' 1551s fake o+d/p tree object 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s CD ../work 1551s | git ls-tree --name-only -z 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1551s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1551s | git diff-tree -z --no-renames -r 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1551s => `: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' 1551s quiltify_trees_differ 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 => 1 1551s | git diff-tree -z --no-renames --name-only -r 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s => `lib.c\x00new-upstream-file\x00src.c\x00' 1551s quiltify_trees_differ 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 1551s | git diff-tree -z --no-renames --name-only -r 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s => `' 1551s quiltify_trees_differ 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 0 1551s differences @dl ## == ## == == ==. 1551s dgit: base trees orig=17884f4e2f6a0b8bf92b o+d/p=17884f4e2f6a0b8bf92b 1551s dgit: quilt differences: src: ## orig == gitignores: == orig == 1551s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1551s starting quiltify (multiple patches, linear mode) 1551s | git ls-tree --name-only 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 -- debian/rules debian/control 1551s => `debian/control'... 1551s quiltify investigate 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1551s | git diff-tree -z --no-renames --name-only 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s => `lib.c\x00new-upstream-file\x00src.c\x00' 1551s quiltify_trees_differ 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 1551s | git ls-tree --name-only 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 -- debian/rules debian/control 1551s => `debian/control'... 1551s | git cat-file commit 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1551s => `tree 4d870e59c3a21c2e6202b59474df673e46ef6449'... 1551s | git diff-tree -z --no-renames --name-only 5138bd8205d6eeb162d87a2d085746c0c305261c 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1551s => `debian\x00src.c\x00' 1551s quiltify_trees_differ 5138bd8205d6eeb162d87a2d085746c0c305261c 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 => 1 1551s considering C=6e00b9cbfb2ac78131496aadb210310e5b4b6a84 P=5138bd8205d6eeb162d87a2d085746c0c305261c 1551s | git diff-tree -r --name-only 5138bd8205d6eeb162d87a2d085746c0c305261c 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 -- debian/patches .pc debian/source/format 1551s => `' 1551s search queue P=5138bd8205d6eeb162d87a2d085746c0c305261c NT 1551s quiltify investigate 5138bd8205d6eeb162d87a2d085746c0c305261c 1551s | git diff-tree -z --no-renames --name-only 5138bd8205d6eeb162d87a2d085746c0c305261c 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s => `debian\x00lib.c\x00new-upstream-file\x00src.c\x00' 1551s quiltify_trees_differ 5138bd8205d6eeb162d87a2d085746c0c305261c 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 1551s | git ls-tree --name-only 5138bd8205d6eeb162d87a2d085746c0c305261c -- debian/rules debian/control 1551s => `debian/control'... 1551s | git cat-file commit 5138bd8205d6eeb162d87a2d085746c0c305261c 1551s => `tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f'... 1551s | git diff-tree -z --no-renames --name-only a4efcc9f58a06f20c5de1258de24211048e99433 5138bd8205d6eeb162d87a2d085746c0c305261c 1551s => `src.c\x00' 1551s quiltify_trees_differ a4efcc9f58a06f20c5de1258de24211048e99433 5138bd8205d6eeb162d87a2d085746c0c305261c => 1 1551s considering C=5138bd8205d6eeb162d87a2d085746c0c305261c P=a4efcc9f58a06f20c5de1258de24211048e99433 1551s | git diff-tree -r --name-only a4efcc9f58a06f20c5de1258de24211048e99433 5138bd8205d6eeb162d87a2d085746c0c305261c -- debian/patches .pc debian/source/format 1551s => `' 1551s search queue P=a4efcc9f58a06f20c5de1258de24211048e99433 NT 1551s quiltify investigate a4efcc9f58a06f20c5de1258de24211048e99433 1551s | git diff-tree -z --no-renames --name-only a4efcc9f58a06f20c5de1258de24211048e99433 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s => `debian\x00lib.c\x00new-upstream-file\x00src.c\x00' 1551s quiltify_trees_differ a4efcc9f58a06f20c5de1258de24211048e99433 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 1551s | git ls-tree --name-only a4efcc9f58a06f20c5de1258de24211048e99433 -- debian/rules debian/control 1551s => `debian/control'... 1551s | git cat-file commit a4efcc9f58a06f20c5de1258de24211048e99433 1551s => `tree 1b9dba384382fd10423f44e82b75e4a495de36dc'... 1551s | git diff-tree -z --no-renames --name-only 9f40936eece8f6452df026cc64200db82005a166 a4efcc9f58a06f20c5de1258de24211048e99433 1551s => `debian\x00' 1551s quiltify_trees_differ 9f40936eece8f6452df026cc64200db82005a166 a4efcc9f58a06f20c5de1258de24211048e99433 => 0 1551s considering C=a4efcc9f58a06f20c5de1258de24211048e99433 P=9f40936eece8f6452df026cc64200db82005a166 1551s | git diff-tree -r --name-only 9f40936eece8f6452df026cc64200db82005a166 a4efcc9f58a06f20c5de1258de24211048e99433 -- debian/patches .pc debian/source/format 1551s => `' 1551s search queue P=9f40936eece8f6452df026cc64200db82005a166 triv 1551s quiltify investigate 9f40936eece8f6452df026cc64200db82005a166 1551s | git diff-tree -z --no-renames --name-only 9f40936eece8f6452df026cc64200db82005a166 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s => `debian\x00lib.c\x00new-upstream-file\x00src.c\x00' 1551s quiltify_trees_differ 9f40936eece8f6452df026cc64200db82005a166 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 1551s | git ls-tree --name-only 9f40936eece8f6452df026cc64200db82005a166 -- debian/rules debian/control 1551s => `debian/control'... 1551s | git cat-file commit 9f40936eece8f6452df026cc64200db82005a166 1551s => `tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d'... 1551s | git diff-tree -z --no-renames --name-only ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 9f40936eece8f6452df026cc64200db82005a166 1551s => `lib.c\x00' 1551s quiltify_trees_differ ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 9f40936eece8f6452df026cc64200db82005a166 => 1 1551s considering C=9f40936eece8f6452df026cc64200db82005a166 P=ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 1551s | git diff-tree -r --name-only ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 9f40936eece8f6452df026cc64200db82005a166 -- debian/patches .pc debian/source/format 1551s => `' 1551s search queue P=ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b NT 1551s quiltify investigate ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 1551s | git diff-tree -z --no-renames --name-only ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s => `debian\x00new-upstream-file\x00src.c\x00' 1551s quiltify_trees_differ ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 1551s | git ls-tree --name-only ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b -- debian/rules debian/control 1551s => `debian/control'... 1551s | git cat-file commit ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 1551s => `tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56'... 1551s | git diff-tree -z --no-renames --name-only eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 1551s => `src.c\x00' 1551s quiltify_trees_differ eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b => 1 1551s considering C=ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b P=eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 1551s | git diff-tree -r --name-only eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b -- debian/patches .pc debian/source/format 1551s => `' 1551s search queue P=eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 NT 1551s quiltify investigate eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 1551s | git diff-tree -z --no-renames --name-only eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s => `debian\x00new-upstream-file\x00' 1551s quiltify_trees_differ eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 1551s | git ls-tree --name-only eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 -- debian/rules debian/control 1551s => `debian/control'... 1551s | git cat-file commit eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 1551s => `tree 0163f07d35eebcd058425aa0dd1766b7d27d207c'... 1551s | git diff-tree -z --no-renames --name-only 809643e5389def220ea36d61f2d3dd504603e95a eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 1551s => `new-upstream-file\x00' 1551s quiltify_trees_differ 809643e5389def220ea36d61f2d3dd504603e95a eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 => 1 1551s considering C=eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 P=809643e5389def220ea36d61f2d3dd504603e95a 1551s | git diff-tree -r --name-only 809643e5389def220ea36d61f2d3dd504603e95a eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 -- debian/patches .pc debian/source/format 1551s => `' 1551s search queue P=809643e5389def220ea36d61f2d3dd504603e95a NT 1551s quiltify investigate 809643e5389def220ea36d61f2d3dd504603e95a 1551s | git diff-tree -z --no-renames --name-only 809643e5389def220ea36d61f2d3dd504603e95a 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 1551s => `debian\x00' 1551s quiltify_trees_differ 809643e5389def220ea36d61f2d3dd504603e95a 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 0 1551s search finished hooray! 1551s quiltify linearisation planning successful, executing... 1551s quiltify traverse 809643e5389def220ea36d61f2d3dd504603e95a..eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 1551s | git cat-file commit eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 1551s => `tree 0163f07d35eebcd058425aa0dd1766b7d27d207c'... 1551s | git log -n1 '--pretty=format:%aD' eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 1551s => `Sun, 6 Dec 2015 23:50:08 +0000' 1551s + git checkout -q eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 1551s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 1551s | realpath -- /usr/bin/dgit 1551s => `/usr/bin/dgit' 1551s | realpath -- .git/dgit/quilt-description.tmp 1551s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1551s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0001-Add-a-new-upstream-file.patch 1551s dpkg-source: info: local changes detected, the modified files are: 1551s work/new-upstream-file 1552s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0001-Add-a-new-upstream-file.patch 1552s + git checkout -q eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 debian/changelog 1552s quiltify traverse eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2..ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 1552s | git cat-file commit ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 1552s => `tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56'... 1552s | git log -n1 '--pretty=format:%aD' ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 1552s => `Sun, 6 Dec 2015 23:50:39 +0000' 1552s + git checkout -q ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 1552s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 1552s | realpath -- /usr/bin/dgit 1552s => `/usr/bin/dgit' 1552s | realpath -- .git/dgit/quilt-description.tmp 1552s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1552s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0002-Edit-the-.c-file.patch 1552s dpkg-source: info: using patch list from debian/patches/series 1552s dpkg-source: info: local changes detected, the modified files are: 1552s work/src.c 1552s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0002-Edit-the-.c-file.patch 1552s + git checkout -q ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b debian/changelog 1552s quiltify traverse ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b..9f40936eece8f6452df026cc64200db82005a166 1552s | git cat-file commit 9f40936eece8f6452df026cc64200db82005a166 1552s => `tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d'... 1552s | git log -n1 '--pretty=format:%aD' 9f40936eece8f6452df026cc64200db82005a166 1552s => `Sat, 4 Jun 2016 22:09:32 +0100' 1552s + git checkout -q 9f40936eece8f6452df026cc64200db82005a166 1552s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 1552s | realpath -- /usr/bin/dgit 1552s => `/usr/bin/dgit' 1552s | realpath -- .git/dgit/quilt-description.tmp 1552s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1552s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . subdir/addnewups 1552s dpkg-source: info: using patch list from debian/patches/series 1552s dpkg-source: info: local changes detected, the modified files are: 1552s work/lib.c 1552s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/subdir/addnewups 1552s + git checkout -q 9f40936eece8f6452df026cc64200db82005a166 debian/changelog 1552s quiltify traverse 9f40936eece8f6452df026cc64200db82005a166..a4efcc9f58a06f20c5de1258de24211048e99433 1552s quiltify traverse a4efcc9f58a06f20c5de1258de24211048e99433..5138bd8205d6eeb162d87a2d085746c0c305261c 1552s | git cat-file commit 5138bd8205d6eeb162d87a2d085746c0c305261c 1552s => `tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f'... 1552s | git log -n1 '--pretty=format:%aD' 5138bd8205d6eeb162d87a2d085746c0c305261c 1552s => `Tue, 26 Jun 2018 09:00:24 +0100' 1552s + git checkout -q 5138bd8205d6eeb162d87a2d085746c0c305261c 1552s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 1552s | realpath -- /usr/bin/dgit 1552s => `/usr/bin/dgit' 1552s | realpath -- .git/dgit/quilt-description.tmp 1552s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1552s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-subcommands-refshead.patch 1553s dpkg-source: info: using patch list from debian/patches/series 1553s dpkg-source: info: local changes detected, the modified files are: 1553s work/src.c 1553s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-subcommands-refshead.patch 1553s + git checkout -q 5138bd8205d6eeb162d87a2d085746c0c305261c debian/changelog 1553s quiltify traverse 5138bd8205d6eeb162d87a2d085746c0c305261c..6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1553s | git cat-file commit 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1553s => `tree 4d870e59c3a21c2e6202b59474df673e46ef6449'... 1553s | git log -n1 '--pretty=format:%aD' 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1553s => `Tue, 26 Jun 2018 09:00:24 +0100' 1553s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 1553s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 1553s | realpath -- /usr/bin/dgit 1553s => `/usr/bin/dgit' 1553s | realpath -- .git/dgit/quilt-description.tmp 1553s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 1553s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-subcommands-refsheadsunst.patch 1553s dpkg-source: info: using patch list from debian/patches/series 1553s dpkg-source: info: local changes detected, the modified files are: 1553s work/src.c 1553s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-subcommands-refsheadsunst.patch 1553s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 1553s + git checkout -q master 1553s | git status --ignored --porcelain 1553s => `?? .pc/'... 1553s + git add -f debian/patches 1553s Commit Debian 3.0 (quilt) metadata 1553s 1553s [dgit (9.15) quilt-fixup] 1553s 1553s + git commit -m 'Commit Debian 3.0 (quilt) metadata 1553s 1553s [dgit (9.15) quilt-fixup] 1553s ' 1553s [master d525d15] Commit Debian 3.0 (quilt) metadata 1553s 6 files changed, 69 insertions(+) 1553s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1553s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1553s create mode 100644 debian/patches/mixed-add-both-subcommands-refsheadsunst.patch 1553s create mode 100644 debian/patches/series 1553s create mode 100644 debian/patches/subdir/addnewups 1553s create mode 100644 debian/patches/upstream-edit-src.c-subcommands-refshead.patch 1553s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1553s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1553s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1553s ' 1553s + t-git-next-date 1553s + GIT_COMMITTER_DATE='1530000026 +0100' 1553s + GIT_AUTHOR_DATE='1530000026 +0100' 1553s + t-some-changes 'subcommands refs/heads/unstitched-mixed 2' 1553s + local 'token=subcommands refs/heads/unstitched-mixed 2' 1553s + local which=dum 1553s + local fsuffix= 1553s + t-git-next-date 1553s + GIT_COMMITTER_DATE='1530000027 +0100' 1553s + GIT_AUTHOR_DATE='1530000027 +0100' 1553s + case "$which" in 1553s + echo '// debian subcommands refs/heads/unstitched-mixed 2' 1553s + git add debian/zorkmid 1553s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)' 1553s [unstitched-mixed 5360dd2] DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2) 1553s 1 file changed, 1 insertion(+) 1553s + case "$which" in 1553s + echo '// upstream subcommands refs/heads/unstitched-mixed 2' 1553s + git add src.c 1553s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)' 1553s [unstitched-mixed 5668ce4] UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2) 1553s 1 file changed, 1 insertion(+) 1553s + case "$which" in 1553s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1553s + echo '// both! subcommands refs/heads/unstitched-mixed 2' 1553s + git add debian/zorkmid 1553s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1553s + echo '// both! subcommands refs/heads/unstitched-mixed 2' 1553s + git add src.c 1553s + git commit -m 'MIXED add both() (subcommands refs/heads/unstitched-mixed 2)' 1553s [unstitched-mixed 9b56b9c] MIXED add both() (subcommands refs/heads/unstitched-mixed 2) 1553s 2 files changed, 2 insertions(+) 1553s + t-git-next-date 1553s + GIT_COMMITTER_DATE='1530000028 +0100' 1553s + GIT_AUTHOR_DATE='1530000028 +0100' 1553s + t-git-next-date 1553s + GIT_COMMITTER_DATE='1530000029 +0100' 1553s + GIT_AUTHOR_DATE='1530000029 +0100' 1553s + t-git-next-date 1553s + GIT_COMMITTER_DATE='1530000030 +0100' 1553s + GIT_AUTHOR_DATE='1530000030 +0100' 1553s + git show-ref 1553s 0bcedd364c245298b6ec08d8f29abf69e34b6e5b refs/debrebase-last/heads/master 1553s 64d2fdf7628f675981360f0dce3aaaa227b0676a refs/debrebase-last/heads/stitched-laundered 1553s 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-intern/quilt-cache 1553s 5c6280b3d52c002248dd7f608e1adb63f1295538 refs/ffq-prev/heads/unstitched-laundered 1553s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/ffq-prev/heads/unstitched-mixed 1553s 5c6280b3d52c002248dd7f608e1adb63f1295538 refs/heads/before-unstitch/unstitched-laundered 1553s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/heads/before-unstitch/unstitched-mixed 1553s 0bcedd364c245298b6ec08d8f29abf69e34b6e5b refs/heads/converted-from-gbp 1553s de5adc8d36110abf62d562d9a1985a4796748ece refs/heads/gdr-unprocessable/merge 1553s 3bc5395fa4571258183be3d3f389950314c53d4e refs/heads/gdr-unprocessable/origin 1553s 4db56a8b17bbf91452b3242af0628eb6790a7c6a refs/heads/make-upstream 1553s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/heads/master 1553s 178896af44c5b02e05a3442df6c33233b6acb807 refs/heads/raw-converted-from-gbp 1553s 64d2fdf7628f675981360f0dce3aaaa227b0676a refs/heads/stitched-laundered 1553s 5e0bf3cea3c715230b96aca41156852390014b98 refs/heads/stitched-mixed 1553s 5472c89e9f96508ec91185b6f57e8a1875ea7a4f refs/heads/unstitched-laundered 1553s 9b56b9c2600dc10b9eec97d535d89870476de971 refs/heads/unstitched-mixed 1553s 923df13cd47c1ac87a6a0646124ace159c3d8291 refs/heads/upstream 1553s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/remotes/dgit/dgit/sid 1553s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/remotes/origin/master 1553s 2ac4b0d013b82664602ee9889a0a530356bb26ed refs/tags/archive/test-dummy/2.0-1 1553s e92210c34f1a1e1c8671211bf38e790ae6a45d8b refs/tags/archive/test-dummy/2.0-2 1553s 12582ce674f91ab851247353b572f25513b178b1 refs/tags/test-dummy/2.0-1 1553s d62b9605c24f15de3c77af4c0df157fa49290c99 refs/tags/test-dummy/2.0-2 1553s 36aaf480de3774b593cb7e92a69d85ac0f3c6748 refs/tags/upstream/2.0 1553s a8b25984b338928272b3ddd50dd036d6db8f83d2 refs/tags/v1.0 1553s + Ec='F:No ongoing git-debrebase session' 1553s + Ep='F:Patch export produced patch amendments' 1553s + subcmd '' Ult Ull Vlt Vl nU 1553s + local subcmd= 1553s + shift 1553s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1553s + work=work--stitched-laundered 1553s + : '---------- stitched-laundered ----------' 1553s + git update-ref --stdin 1553s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 1553s + sed s/stitched-laundered/work--stitched-laundered/ 1553s + git checkout work--stitched-laundered 1553s Switched to branch 'work--stitched-laundered' 1553s + checkletters=Ult 1553s + shift 1553s + before=before-work--stitched-laundered 1553s + git branch before-work--stitched-laundered 1553s + local xopts= 1553s + case "$checkletters" in 1553s + case "$checkletters" in 1553s + case "$checkletters" in 1553s + case "$checkletters" in 1553s + t-git-debrebase 1553s + local gdr=git-debrebase 1553s + : ' 1553s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1553s + git-debrebase --dgit=dgit -D 1553s git-debrebase ffq_prev_branchinfo branch current refs/heads/work--stitched-laundered 1553s git-debrebase ffq check_specs * 1553s git-debrebase *** WALK 64d2fdf7628f675981360f0dce3aaaa227b0676a 0 - 1553s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 1553s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 1553s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 1553s git-debrebase = Pseudomerge {"CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a","Contributor" => {"Ix" => 0,"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Differs" => 0},"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Type" => "Pseudomerge","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","Overwritten" => [{"Differs" => 8,"Ix" => 1,"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9"}],"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 1553s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1553s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1553s git-debrebase = Upstream {"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","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","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Differs" => 2}]} 1553s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1553s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1553s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Type" => "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"} 1553s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1553s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1553s git-debrebase = Upstream {"Type" => "Upstream","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","Parents" => [{"Ix" => 0,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Differs" => 2}],"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555"} 1553s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1553s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1553s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Upstream","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9"}],"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745"} 1553s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1553s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1553s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9"} 1553s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1553s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1553s git-debrebase = Upstream {"Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Parents" => [{"Ix" => 0,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Differs" => 2}],"Type" => "Upstream","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"} 1553s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1553s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1553s git-debrebase = Upstream {"Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Parents" => [{"Ix" => 0,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n"} 1553s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1553s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1553s git-debrebase = 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","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"} 1553s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1553s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1553s git-debrebase = Packaging {"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","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","Parents" => [{"Ix" => 0,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Differs" => 32}]} 1553s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1553s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1553s git-debrebase = 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","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1553s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1553s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1553s 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","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"}]} 1553s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1553s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1553s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Parents" => [{"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Ix" => 0,"Differs" => 16}],"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"} 1553s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1553s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1553s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Type" => "Changelog","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","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2"} 1553s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1553s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1553s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1553s 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","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}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1553s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 15 pm 0 1553s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1553s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1553s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 1553s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1553s git-debrebase WALK BUILD bef5ccd302033398655e3e4e8896fba41691d0b2 Debian (rewriting=0) 1553s git-debrebase WALK BUILD 6b98ac2fc854dc69f9cabc904a8e43328f649f41 Debian (rewriting=0) 1553s git-debrebase WALK BUILD 6184b930def645d1f8da8cb6a91475445cbb817d Debian (rewriting=0) 1553s git-debrebase WALK BUILD 4926fc77fd0b974ce5a2892ad46669ed4ec14edb Debian (rewriting=0) 1553s git-debrebase WALK BUILD 420fa3b34303353709bcfbcf88ccc4e272f5ee48 Debian (rewriting=0) 1553s git-debrebase WALK BUILD 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 Debian (rewriting=0) 1553s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1553s git-debrebase WALK BUILD 64efa6cded3fc4da385f8ed4bd8c72164c1c914d Upstream (rewriting=0) 1553s git-debrebase WALK BUILD b0291461cc529ff9fa4060b3e41ebff6cb563c49 Upstream (rewriting=0) 1553s git-debrebase WALK BUILD 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 Upstream (rewriting=0) 1553s git-debrebase WALK BUILD cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 Upstream (rewriting=0) 1553s git-debrebase WALK BUILD 3025551c1e030f25c60bdabaab789745e585f391 Upstream (rewriting=0) 1553s git-debrebase WALK BUILD 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 Upstream (rewriting=0) 1553s git-debrebase WALK BUILD dab3cc0fcfead932f6714305cfb670067c157804 Upstream (rewriting=0) 1554s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1554s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1554s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a = 0 1554s git-debrebase *** WALK RETURN dab3cc0fcfead932f6714305cfb670067c157804 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1554s git-debrebase: laundered (head was 64d2fdf7628f675981360f0dce3aaaa227b0676a) 1554s git-debrebase >= update refs/ffq-prev/heads/work--stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 0000000000000000000000000000000000000000 1554s git-debrebase >= delete refs/debrebase-last/heads/work--stitched-laundered 1554s git-debrebase >= update HEAD dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a 1554s git-debrebase >$ 1554s Recorded previous head for preservation 1554s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1554s ' 1554s + peel=peel--stitched-laundered 1554s + git checkout -b peel--stitched-laundered 1554s Switched to a new branch 'peel--stitched-laundered' 1554s + t-clean-on-branch peel--stitched-laundered 1554s + t-output '## peel--stitched-laundered' git status -b --porcelain 1554s + printf '%s\n' '## peel--stitched-laundered' 1554s + shift 1554s + git status -b --porcelain 1554s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1554s + : '---------- stitched-laundered Ult ----------' 1554s + '[' xUlt '!=' x ']' 1554s + : '---- stitched-laundered ...Ult ----' 1554s + make_check Ult 1554s + case "$1" in 1554s + t-refs-same-start 1554s + unset t_ref_val 1554s + t_ref_names=() 1554s + t-refs-same refs/heads/before-work--stitched-laundered refs/ffq-prev/heads/work--stitched-laundered 1554s + local g 1554s + for g in $* 1554s + t-ref-same refs/heads/before-work--stitched-laundered 1554s + local name=refs/heads/before-work--stitched-laundered 1554s + local val 1554s ++ t-git-get-ref refs/heads/before-work--stitched-laundered 1554s ++ local ref=refs/heads/before-work--stitched-laundered 1554s ++ case "$ref" in 1554s ++ perl -ne ' 1554s $x = $1 if m#^(\w+) \Qrefs/heads/before-work--stitched-laundered\E(?:\^\{\})?$#; 1554s END { print "$x\n" if length $x; } 1554s ' 1554s ++ git show-ref -d refs/heads/before-work--stitched-laundered 1554s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1554s + t-ref-same-val refs/heads/before-work--stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1554s + local name=refs/heads/before-work--stitched-laundered 1554s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1554s + case "${t_ref_val-unset}" in 1554s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1554s + t_ref_names+=("$name") 1554s + for g in $* 1554s + t-ref-same refs/ffq-prev/heads/work--stitched-laundered 1554s + local name=refs/ffq-prev/heads/work--stitched-laundered 1554s + local val 1554s ++ t-git-get-ref refs/ffq-prev/heads/work--stitched-laundered 1554s ++ local ref=refs/ffq-prev/heads/work--stitched-laundered 1554s ++ case "$ref" in 1554s ++ git show-ref -d refs/ffq-prev/heads/work--stitched-laundered 1554s ++ perl -ne ' 1554s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--stitched-laundered\E(?:\^\{\})?$#; 1554s END { print "$x\n" if length $x; } 1554s ' 1554s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1554s + t-ref-same-val refs/ffq-prev/heads/work--stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1554s + local name=refs/ffq-prev/heads/work--stitched-laundered 1554s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1554s + case "${t_ref_val-unset}" in 1554s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1554s + t_ref_names+=("$name") 1554s + make_check u 1554s + case "$1" in 1554s + t-git-get-ref refs/ffq-prev/heads/work--stitched-laundered 1554s + local ref=refs/ffq-prev/heads/work--stitched-laundered 1554s + case "$ref" in 1554s + perl -ne ' 1554s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--stitched-laundered\E(?:\^\{\})?$#; 1554s END { print "$x\n" if length $x; } 1554s ' 1554s + git show-ref -d refs/ffq-prev/heads/work--stitched-laundered 1554s 64d2fdf7628f675981360f0dce3aaaa227b0676a 1554s + t-refs-notexist refs/debrebase-last/heads/work--stitched-laundered 1554s + local val 1554s + for g in $* 1554s ++ t-git-get-ref refs/debrebase-last/heads/work--stitched-laundered 1554s ++ local ref=refs/debrebase-last/heads/work--stitched-laundered 1554s ++ case "$ref" in 1554s ++ perl -ne ' 1554s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work--stitched-laundered\E(?:\^\{\})?$#; 1554s END { print "$x\n" if length $x; } 1554s ' 1554s ++ git show-ref -d refs/debrebase-last/heads/work--stitched-laundered 1554s ++ test 1 = 1 1554s + val= 1554s + '[' x '!=' x ']' 1554s + checkletters=lt 1554s + '[' xlt '!=' x ']' 1554s + : '---- stitched-laundered ...lt ----' 1554s + make_check lt 1554s + case "$1" in 1554s + git diff --quiet HEAD refs/heads/before-work--stitched-laundered -- :. ':!debian/patches' 1554s + t-gdr-good laundered 1554s + local state=laundered 1554s + local beforetag= 1554s + case $state in 1554s + git diff --quiet -- :. ':!debian/patches' 1554s + LC_MESSAGES=C 1554s + t-git-debrebase status 1554s + local gdr=git-debrebase 1554s + : ' 1554s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1554s + git-debrebase --dgit=dgit -D status 1554s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1554s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1554s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Type" => "Upstream","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1554s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1554s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1554s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Ix" => 0,"Differs" => 2}],"Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf"} 1554s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1554s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1554s 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","Type" => "Upstream","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","Parents" => [{"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1554s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1554s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1554s git-debrebase = Upstream {"Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"} 1554s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1554s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1554s git-debrebase = Upstream {"Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Differs" => 2,"Ix" => 0}]} 1554s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1554s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1554s git-debrebase = Upstream {"Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","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","Type" => "Upstream","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"} 1554s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1554s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1554s git-debrebase = Upstream {"Type" => "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","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}]} 1554s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1554s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1554s git-debrebase = Packaging {"Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","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}]} 1554s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1554s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1554s git-debrebase = Packaging {"Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48"} 1554s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1554s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1554s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging"} 1554s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1554s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1554s git-debrebase = Packaging {"Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Type" => "Packaging","Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1554s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1554s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1554s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Changelog","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1554s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1554s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1554s 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","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1554s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1554s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1554s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1554s git-debrebase = Anchor {"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"},{"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","OrigParents" => [$VAR1->{"Parents"}[1]]} 1554s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel--stitched-laundered 1554s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1554s ' 1554s + case $state in 1554s + egrep '^ *branch is laundered' ../status.check 1554s branch is laundered 1554s + t-gdr-good-analyse HEAD laundered 1554s + local head=HEAD 1554s + local state=laundered 1554s + local wsfx= 1554s + local etypes bwtip 1554s + case $state in 1554s + etypes=Upstream 1554s ++ t-git-debrebase breakwater 1554s ++ local gdr=git-debrebase 1554s ++ : ' 1554s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1554s ++ git-debrebase --dgit=dgit -D breakwater 1554s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1554s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1554s 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","Parents" => [{"Differs" => 2,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Ix" => 0}],"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804"} 1554s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1554s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1554s git-debrebase = Upstream {"Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","Type" => "Upstream","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"} 1554s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1554s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1554s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Ix" => 0,"Differs" => 2}]} 1554s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1554s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1554s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","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}]} 1554s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1554s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1554s git-debrebase = Upstream {"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Type" => "Upstream","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","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"} 1554s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1554s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1554s git-debrebase = Upstream {"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","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"} 1554s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1554s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1554s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Parents" => [{"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Ix" => 0}],"Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1554s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1554s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1554s git-debrebase = Packaging {"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Ix" => 0,"Differs" => 32}]} 1554s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1554s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1554s git-debrebase = Packaging {"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Differs" => 32}]} 1554s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1554s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1554s git-debrebase = Packaging {"Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"}],"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"} 1554s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1554s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1554s git-debrebase = Packaging {"Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"Differs" => 32,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Ix" => 0}],"Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Type" => "Packaging"} 1554s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1554s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1554s 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","Parents" => [{"Differs" => 16,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Ix" => 0}],"Type" => "Changelog","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"} 1554s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1554s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1554s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","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","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1554s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1554s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1554s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1554s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "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","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"} 1554s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1554s ' 1554s + bwtip=Y:5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1554s + anal=../anal 1554s + t-git-debrebase analyse HEAD 1554s + local gdr=git-debrebase 1554s + : ' 1554s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1554s + git-debrebase --dgit=dgit -D analyse HEAD 1554s git-debrebase *** WALK dab3cc0fcfead932f6714305cfb670067c157804 1 *main::STDOUT 1554s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1554s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1554s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"}],"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"} 1554s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1554s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1554s git-debrebase = 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","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","Parents" => [{"Differs" => 2,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Ix" => 0}],"Type" => "Upstream"} 1554s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1554s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1554s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","Type" => "Upstream","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1554s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1554s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1554s git-debrebase = Upstream {"Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9"}]} 1554s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1554s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1554s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Differs" => 2}],"Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1554s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1554s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1554s 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" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f"} 1554s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1554s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1554s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}],"Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n"} 1554s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1554s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1554s git-debrebase = Packaging {"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Type" => "Packaging"} 1554s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1554s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1554s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Type" => "Packaging","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1554s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1554s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1554s git-debrebase = Packaging {"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","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","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Parents" => [{"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Ix" => 0,"Differs" => 32}],"Type" => "Packaging"} 1554s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1554s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1554s 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","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"}]} 1554s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1554s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1554s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Ix" => 0,"Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","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","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"} 1554s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1554s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1554s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"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 1530000008 +0100\n","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2"} 1554s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1554s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1554s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1554s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"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","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"} 1554s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1554s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1554s ' 1554s ++ git rev-parse HEAD 1554s + expect=dab3cc0fcfead932f6714305cfb670067c157804 1554s + exec 1554s + local cid ctype info nparents 1554s + read cid ctype info 1554s + : ===== dab3cc0fcfead932f6714305cfb670067c157804 Upstream ===== 1554s + test dab3cc0fcfead932f6714305cfb670067c157804 = dab3cc0fcfead932f6714305cfb670067c157804 1554s + local cetype=Upstream 1554s + '[' xUpstream = xUpstream ']' 1554s + cetype=SAME 1554s ++ git log -n1 --pretty=format:%P dab3cc0fcfead932f6714305cfb670067c157804 1554s + local parents=6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1554s + expect=6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1554s + enparents=1 1554s + : Upstream/SAME 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s ++ wc -w 1554s ++ printf %s 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 Upstream ===== 1554s + test 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 = 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1554s + local cetype=Upstream 1554s + '[' xUpstream = xUpstream ']' 1554s + cetype=SAME 1554s ++ git log -n1 --pretty=format:%P 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 1554s + local parents=3025551c1e030f25c60bdabaab789745e585f391 1554s + expect=3025551c1e030f25c60bdabaab789745e585f391 1554s + enparents=1 1554s + : Upstream/SAME 3025551c1e030f25c60bdabaab789745e585f391 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s ++ printf %s 3025551c1e030f25c60bdabaab789745e585f391 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo 3025551c1e030f25c60bdabaab789745e585f391 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== 3025551c1e030f25c60bdabaab789745e585f391 Upstream ===== 1554s + test 3025551c1e030f25c60bdabaab789745e585f391 = 3025551c1e030f25c60bdabaab789745e585f391 1554s + local cetype=Upstream 1554s + '[' xUpstream = xUpstream ']' 1554s + cetype=SAME 1554s ++ git log -n1 --pretty=format:%P 3025551c1e030f25c60bdabaab789745e585f391 1554s + local parents=cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1554s + expect=cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1554s + enparents=1 1554s + : Upstream/SAME cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s ++ printf %s cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 Upstream ===== 1554s + test cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 = cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1554s + local cetype=Upstream 1554s + '[' xUpstream = xUpstream ']' 1554s + cetype=SAME 1554s ++ git log -n1 --pretty=format:%P cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 1554s + local parents=302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1554s + expect=302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1554s + enparents=1 1554s + : Upstream/SAME 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s ++ printf %s 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 Upstream ===== 1554s + test 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 = 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1554s + local cetype=Upstream 1554s + '[' xUpstream = xUpstream ']' 1554s + cetype=SAME 1554s ++ git log -n1 --pretty=format:%P 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 1554s + local parents=b0291461cc529ff9fa4060b3e41ebff6cb563c49 1554s + expect=b0291461cc529ff9fa4060b3e41ebff6cb563c49 1554s + enparents=1 1554s + : Upstream/SAME b0291461cc529ff9fa4060b3e41ebff6cb563c49 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s ++ wc -w 1554s ++ printf %s b0291461cc529ff9fa4060b3e41ebff6cb563c49 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo b0291461cc529ff9fa4060b3e41ebff6cb563c49 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== b0291461cc529ff9fa4060b3e41ebff6cb563c49 Upstream ===== 1554s + test b0291461cc529ff9fa4060b3e41ebff6cb563c49 = b0291461cc529ff9fa4060b3e41ebff6cb563c49 1554s + local cetype=Upstream 1554s + '[' xUpstream = xUpstream ']' 1554s + cetype=SAME 1554s ++ git log -n1 --pretty=format:%P b0291461cc529ff9fa4060b3e41ebff6cb563c49 1554s + local parents=64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1554s + expect=64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1554s + enparents=1 1554s + : Upstream/SAME 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s ++ printf %s 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== 64efa6cded3fc4da385f8ed4bd8c72164c1c914d Upstream ===== 1554s + test 64efa6cded3fc4da385f8ed4bd8c72164c1c914d = 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1554s + local cetype=Upstream 1554s + '[' xUpstream = xUpstream ']' 1554s + cetype=SAME 1554s ++ git log -n1 --pretty=format:%P 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 1554s + local parents=5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1554s + expect=5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1554s + enparents=1 1554s + : Upstream/SAME 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s ++ printf %s 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 Packaging ===== 1554s + test 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 = 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1554s + local cetype=Upstream 1554s + '[' xPackaging = xUpstream ']' 1554s ++ git log -n1 --pretty=format:%P 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1554s + local parents=420fa3b34303353709bcfbcf88ccc4e272f5ee48 1554s + expect=420fa3b34303353709bcfbcf88ccc4e272f5ee48 1554s + enparents=1 1554s + : Packaging/Upstream 420fa3b34303353709bcfbcf88ccc4e272f5ee48 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + '[' xY:5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 '!=' x ']' 1554s + test Y:5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 = Y:5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 1554s + bwtip= 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s + git diff --quiet 420fa3b34303353709bcfbcf88ccc4e272f5ee48..5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 -- :. ':!debian' 1554s + git diff --quiet 420fa3b34303353709bcfbcf88ccc4e272f5ee48..5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 -- :debian/patches 1554s + etypes=Packaging 1554s ++ printf %s 420fa3b34303353709bcfbcf88ccc4e272f5ee48 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo 420fa3b34303353709bcfbcf88ccc4e272f5ee48 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== 420fa3b34303353709bcfbcf88ccc4e272f5ee48 Packaging ===== 1554s + test 420fa3b34303353709bcfbcf88ccc4e272f5ee48 = 420fa3b34303353709bcfbcf88ccc4e272f5ee48 1554s + local cetype=Packaging 1554s + '[' xPackaging = xPackaging ']' 1554s + cetype=SAME 1554s ++ git log -n1 --pretty=format:%P 420fa3b34303353709bcfbcf88ccc4e272f5ee48 1554s + local parents=4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1554s + expect=4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1554s + enparents=1 1554s + : Packaging/SAME 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s + git diff --quiet 4926fc77fd0b974ce5a2892ad46669ed4ec14edb..420fa3b34303353709bcfbcf88ccc4e272f5ee48 -- :. ':!debian' 1554s + git diff --quiet 4926fc77fd0b974ce5a2892ad46669ed4ec14edb..420fa3b34303353709bcfbcf88ccc4e272f5ee48 -- :debian/patches 1554s + etypes=Packaging 1554s ++ printf %s 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== 4926fc77fd0b974ce5a2892ad46669ed4ec14edb Packaging ===== 1554s + test 4926fc77fd0b974ce5a2892ad46669ed4ec14edb = 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1554s + local cetype=Packaging 1554s + '[' xPackaging = xPackaging ']' 1554s + cetype=SAME 1554s ++ git log -n1 --pretty=format:%P 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 1554s + local parents=6184b930def645d1f8da8cb6a91475445cbb817d 1554s + expect=6184b930def645d1f8da8cb6a91475445cbb817d 1554s + enparents=1 1554s + : Packaging/SAME 6184b930def645d1f8da8cb6a91475445cbb817d 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s + git diff --quiet 6184b930def645d1f8da8cb6a91475445cbb817d..4926fc77fd0b974ce5a2892ad46669ed4ec14edb -- :. ':!debian' 1554s + git diff --quiet 6184b930def645d1f8da8cb6a91475445cbb817d..4926fc77fd0b974ce5a2892ad46669ed4ec14edb -- :debian/patches 1554s + etypes=Packaging 1554s ++ printf %s 6184b930def645d1f8da8cb6a91475445cbb817d 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo 6184b930def645d1f8da8cb6a91475445cbb817d 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== 6184b930def645d1f8da8cb6a91475445cbb817d Packaging ===== 1554s + test 6184b930def645d1f8da8cb6a91475445cbb817d = 6184b930def645d1f8da8cb6a91475445cbb817d 1554s + local cetype=Packaging 1554s + '[' xPackaging = xPackaging ']' 1554s + cetype=SAME 1554s ++ git log -n1 --pretty=format:%P 6184b930def645d1f8da8cb6a91475445cbb817d 1554s + local parents=6b98ac2fc854dc69f9cabc904a8e43328f649f41 1554s + expect=6b98ac2fc854dc69f9cabc904a8e43328f649f41 1554s + enparents=1 1554s + : Packaging/SAME 6b98ac2fc854dc69f9cabc904a8e43328f649f41 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s + git diff --quiet 6b98ac2fc854dc69f9cabc904a8e43328f649f41..6184b930def645d1f8da8cb6a91475445cbb817d -- :. ':!debian' 1554s + git diff --quiet 6b98ac2fc854dc69f9cabc904a8e43328f649f41..6184b930def645d1f8da8cb6a91475445cbb817d -- :debian/patches 1554s + etypes=Packaging 1554s ++ printf %s 6b98ac2fc854dc69f9cabc904a8e43328f649f41 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo 6b98ac2fc854dc69f9cabc904a8e43328f649f41 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== 6b98ac2fc854dc69f9cabc904a8e43328f649f41 Changelog ===== 1554s + test 6b98ac2fc854dc69f9cabc904a8e43328f649f41 = 6b98ac2fc854dc69f9cabc904a8e43328f649f41 1554s + local cetype=Packaging 1554s + '[' xChangelog = xPackaging ']' 1554s ++ git log -n1 --pretty=format:%P 6b98ac2fc854dc69f9cabc904a8e43328f649f41 1554s + local parents=bef5ccd302033398655e3e4e8896fba41691d0b2 1554s + expect=bef5ccd302033398655e3e4e8896fba41691d0b2 1554s + enparents=1 1554s + : Changelog/Packaging bef5ccd302033398655e3e4e8896fba41691d0b2 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s + git diff --quiet bef5ccd302033398655e3e4e8896fba41691d0b2..6b98ac2fc854dc69f9cabc904a8e43328f649f41 -- :. ':!debian/changelog' 1554s + etypes=Packaging 1554s ++ printf %s bef5ccd302033398655e3e4e8896fba41691d0b2 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo bef5ccd302033398655e3e4e8896fba41691d0b2 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== bef5ccd302033398655e3e4e8896fba41691d0b2 Changelog ===== 1554s + test bef5ccd302033398655e3e4e8896fba41691d0b2 = bef5ccd302033398655e3e4e8896fba41691d0b2 1554s + local cetype=Packaging 1554s + '[' xChangelog = xPackaging ']' 1554s ++ git log -n1 --pretty=format:%P bef5ccd302033398655e3e4e8896fba41691d0b2 1554s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1554s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1554s + enparents=1 1554s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..bef5ccd302033398655e3e4e8896fba41691d0b2 -- :. ':!debian/changelog' 1554s + etypes=Packaging 1554s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1554s ++ wc -w 1554s + local cnparents=1 1554s + test 1 = 1 1554s ++ for f in $parents 1554s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1554s ++ wc -w 1554s ++ t-sort -u 1554s ++ LC_COLLATE=C 1554s ++ sort -u 1554s + local cndparents=1 1554s + test 1 = 1 1554s + case "$parents" in 1554s + case "$ctype" in 1554s + read cid ctype info 1554s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1554s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1554s + local cetype=Packaging 1554s + '[' xAnchor = xPackaging ']' 1554s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1554s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1554s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1554s + enparents=1 1554s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1554s + case "$ctype/$cetype" in 1554s + case "$ctype/$etypes" in 1554s + case "$cetype" in 1554s + case "$ctype" in 1554s + break 1554s + checkletters=t 1554s + '[' xt '!=' x ']' 1554s + : '---- stitched-laundered ...t ----' 1554s + make_check t 1554s + case "$1" in 1554s + git diff --quiet HEAD refs/heads/before-work--stitched-laundered 1554s + checkletters= 1554s + '[' x '!=' x ']' 1554s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1554s + work=work--stitched-mixed 1554s + : '---------- stitched-mixed ----------' 1554s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 1554s + git update-ref --stdin 1554s + sed s/stitched-mixed/work--stitched-mixed/ 1554s + git checkout work--stitched-mixed 1554s Switched to branch 'work--stitched-mixed' 1554s + checkletters=Ull 1554s + shift 1554s + before=before-work--stitched-mixed 1554s + git branch before-work--stitched-mixed 1554s + local xopts= 1554s + case "$checkletters" in 1554s + case "$checkletters" in 1554s + case "$checkletters" in 1554s + case "$checkletters" in 1554s + t-git-debrebase 1554s + local gdr=git-debrebase 1554s + : ' 1554s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1554s + git-debrebase --dgit=dgit -D 1554s git-debrebase ffq_prev_branchinfo branch current refs/heads/work--stitched-mixed 1554s git-debrebase ffq check_specs * 1554s git-debrebase *** WALK 5e0bf3cea3c715230b96aca41156852390014b98 0 - 1554s git-debrebase get_differs 7091adece516711371505e702f87d9973010f25b 50e48c643e8c0e3794bbfe42b45ab72549dda504 = 0x22 1554s git-debrebase classify 5e0bf3cea3c715230b96aca41156852390014b98 $t=50e48c643e8c0e3794bbfe42b45ab72549dda504 @p 7091adece516711371505e702f87d9973010f25b/0x22 1554s git-debrebase = Mixed {"CommitId" => "5e0bf3cea3c715230b96aca41156852390014b98","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "7091adece516711371505e702f87d9973010f25b"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n","Tree" => "50e48c643e8c0e3794bbfe42b45ab72549dda504","Hdr" => "tree 50e48c643e8c0e3794bbfe42b45ab72549dda504\nparent 7091adece516711371505e702f87d9973010f25b\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Mixed"} 1554s git-debrebase get_differs 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 6066466a7bfccd9539954883312605a59c5b4502 = 0x2 1554s git-debrebase classify 7091adece516711371505e702f87d9973010f25b $t=6066466a7bfccd9539954883312605a59c5b4502 @p 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1/0x2 1554s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1"}],"CommitId" => "7091adece516711371505e702f87d9973010f25b","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Upstream","Hdr" => "tree 6066466a7bfccd9539954883312605a59c5b4502\nparent 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "6066466a7bfccd9539954883312605a59c5b4502"} 1554s git-debrebase get_differs a5e2aaa2551f9e331d30511eb4356a22c939e752 0cbb6dcc737dae60cb32b3675f13a2dbfc737647 = 0x20 1554s git-debrebase classify 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 $t=0cbb6dcc737dae60cb32b3675f13a2dbfc737647 @p a5e2aaa2551f9e331d30511eb4356a22c939e752/0x20 1554s git-debrebase = Packaging {"Tree" => "0cbb6dcc737dae60cb32b3675f13a2dbfc737647","Type" => "Packaging","Hdr" => "tree 0cbb6dcc737dae60cb32b3675f13a2dbfc737647\nparent a5e2aaa2551f9e331d30511eb4356a22c939e752\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752"}],"CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1"} 1554s git-debrebase get_differs 0a3febb41892833b131ed8ca6958d68efc7f925f 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 = 0x4 1554s git-debrebase classify a5e2aaa2551f9e331d30511eb4356a22c939e752 $t=0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 @p 0a3febb41892833b131ed8ca6958d68efc7f925f/0x4 1554s git-debrebase = AddPatches {"Tree" => "0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3","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","CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752","Parents" => [{"CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Ix" => 0,"Differs" => 4}]} 1554s git-debrebase get_differs c848bc784454d4635b6a71ea59b65b373615e8e4 cb27fe0206f700a55e3ec45caa3b80b9d71ed691 = 0x22 1554s git-debrebase classify 0a3febb41892833b131ed8ca6958d68efc7f925f $t=cb27fe0206f700a55e3ec45caa3b80b9d71ed691 @p c848bc784454d4635b6a71ea59b65b373615e8e4/0x22 1554s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n","CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4"}],"Tree" => "cb27fe0206f700a55e3ec45caa3b80b9d71ed691","Type" => "Mixed","Hdr" => "tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691\nparent c848bc784454d4635b6a71ea59b65b373615e8e4\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 1554s git-debrebase get_differs 772b2a1d3dacffb5498a61b7c9518d57d439e1ca af40286d15dcd54aed3b8586be973b89dfad2ee8 = 0x2 1554s git-debrebase classify c848bc784454d4635b6a71ea59b65b373615e8e4 $t=af40286d15dcd54aed3b8586be973b89dfad2ee8 @p 772b2a1d3dacffb5498a61b7c9518d57d439e1ca/0x2 1554s git-debrebase = Upstream {"Tree" => "af40286d15dcd54aed3b8586be973b89dfad2ee8","Type" => "Upstream","Hdr" => "tree af40286d15dcd54aed3b8586be973b89dfad2ee8\nparent 772b2a1d3dacffb5498a61b7c9518d57d439e1ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n"} 1554s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf eadc003377c95410215ba90c8b32bc80c122ce2b = 0x20 1554s git-debrebase classify 772b2a1d3dacffb5498a61b7c9518d57d439e1ca $t=eadc003377c95410215ba90c8b32bc80c122ce2b @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 1554s git-debrebase = Packaging {"Tree" => "eadc003377c95410215ba90c8b32bc80c122ce2b","Hdr" => "tree eadc003377c95410215ba90c8b32bc80c122ce2b\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"}],"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n"} 1554s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1554s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1554s git-debrebase = AddPatches {"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "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" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"} 1554s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1554s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1554s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}],"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"} 1554s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1554s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1554s git-debrebase = Changelog {"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","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}]} 1554s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1554s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1554s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1554s git-debrebase = Pseudomerge {"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Overwritten" => [{"Differs" => 8,"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Parents" => [{"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0,"Ix" => 0},$VAR1->{"Overwritten"}[0]],"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","Type" => "Pseudomerge","Contributor" => $VAR1->{"Parents"}[0],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 1554s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1554s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1554s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2,"Ix" => 0}],"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream"} 1554s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1554s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1554s git-debrebase = Upstream {"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","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"}]} 1554s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1554s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1554s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","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","Type" => "Upstream"} 1554s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1554s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1554s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1554s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1554s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 1554s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1555s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1555s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 20 1555s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1555s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1555s git-debrebase WALK REWRITING NOW cl=HASH(0xd1987892dd8) procd=HASH(0xd1987897a78) 1555s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1555s git-debrebase WALK BUILD 772b2a1d3dacffb5498a61b7c9518d57d439e1ca Debian (rewriting=1) 1555s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1555s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Debian (rewriting=1) 1555s git-debrebase WALK BUILD 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 Debian (rewriting=1) 1555s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1555s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Debian (rewriting=1) 1555s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1555s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1555s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1555s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1555s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1555s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1555s git-debrebase WALK BUILD c848bc784454d4635b6a71ea59b65b373615e8e4 Upstream (rewriting=1) 1555s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Upstream (rewriting=1) 1555s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1555s git-debrebase WALK BUILD 7091adece516711371505e702f87d9973010f25b Upstream (rewriting=1) 1555s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Upstream (rewriting=1) 1555s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1555s git-debrebase get_differs 97a91c40026ff6a52a5cc7d020dda82048f2e77d 5e0bf3cea3c715230b96aca41156852390014b98 = 0x4 1555s git-debrebase *** WALK RETURN 97a91c40026ff6a52a5cc7d020dda82048f2e77d e7d45cf6ecfa83b4fd6418de6b88f8471799e588 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1555s git-debrebase: laundered (head was 5e0bf3cea3c715230b96aca41156852390014b98) 1555s git-debrebase >= update refs/ffq-prev/heads/work--stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 0000000000000000000000000000000000000000 1555s git-debrebase >= delete refs/debrebase-last/heads/work--stitched-mixed 1555s git-debrebase >= update HEAD 97a91c40026ff6a52a5cc7d020dda82048f2e77d 5e0bf3cea3c715230b96aca41156852390014b98 1555s git-debrebase >$ 1555s Recorded previous head for preservation 1555s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1555s ' 1555s + peel=peel--stitched-mixed 1555s + git checkout -b peel--stitched-mixed 1555s Switched to a new branch 'peel--stitched-mixed' 1555s + t-clean-on-branch peel--stitched-mixed 1555s + t-output '## peel--stitched-mixed' git status -b --porcelain 1555s + printf '%s\n' '## peel--stitched-mixed' 1555s + shift 1555s + git status -b --porcelain 1555s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1555s + : '---------- stitched-mixed Ull ----------' 1555s + '[' xUll '!=' x ']' 1555s + : '---- stitched-mixed ...Ull ----' 1555s + make_check Ull 1555s + case "$1" in 1555s + t-refs-same-start 1555s + unset t_ref_val 1555s + t_ref_names=() 1555s + t-refs-same refs/heads/before-work--stitched-mixed refs/ffq-prev/heads/work--stitched-mixed 1555s + local g 1555s + for g in $* 1555s + t-ref-same refs/heads/before-work--stitched-mixed 1555s + local name=refs/heads/before-work--stitched-mixed 1555s + local val 1555s ++ t-git-get-ref refs/heads/before-work--stitched-mixed 1555s ++ local ref=refs/heads/before-work--stitched-mixed 1555s ++ case "$ref" in 1555s ++ git show-ref -d refs/heads/before-work--stitched-mixed 1555s ++ perl -ne ' 1555s $x = $1 if m#^(\w+) \Qrefs/heads/before-work--stitched-mixed\E(?:\^\{\})?$#; 1555s END { print "$x\n" if length $x; } 1555s ' 1555s + val=5e0bf3cea3c715230b96aca41156852390014b98 1555s + t-ref-same-val refs/heads/before-work--stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 1555s + local name=refs/heads/before-work--stitched-mixed 1555s + local val=5e0bf3cea3c715230b96aca41156852390014b98 1555s + case "${t_ref_val-unset}" in 1555s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 1555s + t_ref_names+=("$name") 1555s + for g in $* 1555s + t-ref-same refs/ffq-prev/heads/work--stitched-mixed 1555s + local name=refs/ffq-prev/heads/work--stitched-mixed 1555s + local val 1555s ++ t-git-get-ref refs/ffq-prev/heads/work--stitched-mixed 1555s ++ local ref=refs/ffq-prev/heads/work--stitched-mixed 1555s ++ case "$ref" in 1555s ++ git show-ref -d refs/ffq-prev/heads/work--stitched-mixed 1555s ++ perl -ne ' 1555s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--stitched-mixed\E(?:\^\{\})?$#; 1555s END { print "$x\n" if length $x; } 1555s ' 1555s + val=5e0bf3cea3c715230b96aca41156852390014b98 1555s + t-ref-same-val refs/ffq-prev/heads/work--stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 1555s + local name=refs/ffq-prev/heads/work--stitched-mixed 1555s + local val=5e0bf3cea3c715230b96aca41156852390014b98 1555s + case "${t_ref_val-unset}" in 1555s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 1555s + t_ref_names+=("$name") 1555s + make_check u 1555s + case "$1" in 1555s + t-git-get-ref refs/ffq-prev/heads/work--stitched-mixed 1555s + local ref=refs/ffq-prev/heads/work--stitched-mixed 1555s + case "$ref" in 1555s + git show-ref -d refs/ffq-prev/heads/work--stitched-mixed 1555s + perl -ne ' 1555s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--stitched-mixed\E(?:\^\{\})?$#; 1555s END { print "$x\n" if length $x; } 1555s ' 1555s 5e0bf3cea3c715230b96aca41156852390014b98 1555s + t-refs-notexist refs/debrebase-last/heads/work--stitched-mixed 1555s + local val 1555s + for g in $* 1555s ++ t-git-get-ref refs/debrebase-last/heads/work--stitched-mixed 1555s ++ local ref=refs/debrebase-last/heads/work--stitched-mixed 1555s ++ case "$ref" in 1555s ++ git show-ref -d refs/debrebase-last/heads/work--stitched-mixed 1555s ++ perl -ne ' 1555s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work--stitched-mixed\E(?:\^\{\})?$#; 1555s END { print "$x\n" if length $x; } 1555s ' 1555s ++ test 1 = 1 1555s + val= 1555s + '[' x '!=' x ']' 1555s + checkletters=ll 1555s + '[' xll '!=' x ']' 1555s + : '---- stitched-mixed ...ll ----' 1555s + make_check ll 1555s + case "$1" in 1555s + git diff --quiet HEAD refs/heads/before-work--stitched-mixed -- :. ':!debian/patches' 1555s + t-gdr-good laundered 1555s + local state=laundered 1555s + local beforetag= 1555s + case $state in 1555s + git diff --quiet -- :. ':!debian/patches' 1555s + LC_MESSAGES=C 1555s + t-git-debrebase status 1555s + local gdr=git-debrebase 1555s + : ' 1555s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1555s + git-debrebase --dgit=dgit -D status 1555s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 1555s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 1555s git-debrebase = Upstream {"Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","Parents" => [{"Differs" => 2,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Ix" => 0}],"CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","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"} 1555s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 1555s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 1555s git-debrebase = Upstream {"Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Parents" => [{"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Ix" => 0,"Differs" => 2}]} 1555s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 1555s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 1555s git-debrebase = Upstream {"Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Parents" => [{"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Ix" => 0,"Differs" => 2}]} 1555s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 1555s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 1555s git-debrebase = Upstream {"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Parents" => [{"Ix" => 0,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Differs" => 2}],"Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Type" => "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"} 1555s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 1555s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 1555s git-debrebase = Upstream {"Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Parents" => [{"Ix" => 0,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Differs" => 2}],"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","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","Type" => "Upstream"} 1555s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 1555s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 1555s git-debrebase = Upstream {"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Parents" => [{"Ix" => 0,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Differs" => 2}],"Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","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"} 1555s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 1555s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 1555s 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","Parents" => [{"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Ix" => 0,"Differs" => 2}],"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5"} 1555s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 1555s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 1555s git-debrebase = Packaging {"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","CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Parents" => [{"Ix" => 0,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Differs" => 32}],"Tree" => "324fefac260fae19926241bd0cd3439ae536e63e"} 1555s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 1555s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 1555s git-debrebase = Packaging {"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","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Parents" => [{"Ix" => 0,"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Differs" => 32}]} 1555s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 1555s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 1555s git-debrebase = Packaging {"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Parents" => [{"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Ix" => 0,"Differs" => 32}],"Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1555s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 1555s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 1555s git-debrebase = Packaging {"Tree" => "84e220841747026f0ad129576c4e2db185521ecc","CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Parents" => [{"Differs" => 32,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Ix" => 0}],"Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n"} 1555s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1555s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 1555s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Parents" => [{"Ix" => 0,"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Differs" => 16}],"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"} 1555s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1555s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1555s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","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","Type" => "Changelog"} 1555s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1555s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1555s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1555s git-debrebase = Anchor {"Type" => "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","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1555s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel--stitched-mixed 1555s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1555s ' 1555s + case $state in 1555s + egrep '^ *branch is laundered' ../status.check 1555s branch is laundered 1555s + t-gdr-good-analyse HEAD laundered 1555s + local head=HEAD 1555s + local state=laundered 1555s + local wsfx= 1555s + local etypes bwtip 1555s + case $state in 1555s + etypes=Upstream 1555s ++ t-git-debrebase breakwater 1555s ++ local gdr=git-debrebase 1555s ++ : ' 1555s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1555s ++ git-debrebase --dgit=dgit -D breakwater 1555s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 1555s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 1555s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "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"} 1555s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 1555s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 1555s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Parents" => [{"Differs" => 2,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Ix" => 0}],"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Type" => "Upstream","Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53"} 1555s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 1555s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 1555s git-debrebase = Upstream {"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","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"} 1555s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 1555s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 1555s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Parents" => [{"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n"} 1555s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 1555s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 1555s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Differs" => 2,"Ix" => 0}],"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Type" => "Upstream","Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1555s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 1555s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 1555s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Ix" => 0}],"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Type" => "Upstream","Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee"} 1555s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 1555s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 1555s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","Type" => "Upstream","Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5"} 1555s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 1555s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 1555s 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,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Differs" => 32}],"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e","Type" => "Packaging","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1555s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 1555s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 1555s git-debrebase = Packaging {"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Type" => "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","Parents" => [{"Differs" => 32,"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Ix" => 0}]} 1555s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 1555s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 1555s 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","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"} 1555s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 1555s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 1555s git-debrebase = Packaging {"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Parents" => [{"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Differs" => 32,"Ix" => 0}]} 1555s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1555s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 1555s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Differs" => 16}],"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1555s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1555s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1555s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1555s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1555s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1555s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1555s 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},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1555s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1555s ' 1555s + bwtip=Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1555s + anal=../anal 1555s + t-git-debrebase analyse HEAD 1555s + local gdr=git-debrebase 1555s + : ' 1555s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1555s + git-debrebase --dgit=dgit -D analyse HEAD 1555s git-debrebase *** WALK 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1 *main::STDOUT 1555s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 1555s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 1555s 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","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Ix" => 0}],"CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","Type" => "Upstream"} 1555s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 1555s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 1555s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"}],"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","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"} 1555s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 1555s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 1555s git-debrebase = Upstream {"Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\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: upstream part]\n","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","Type" => "Upstream","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a"}]} 1555s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 1555s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 1555s 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","Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Type" => "Upstream","CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Parents" => [{"Ix" => 0,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Differs" => 2}]} 1555s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 1555s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 1555s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Differs" => 2}],"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Type" => "Upstream","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","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"} 1555s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 1555s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 1555s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Parents" => [{"Ix" => 0,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Differs" => 2}],"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"} 1555s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 1555s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 1555s git-debrebase = 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","Type" => "Upstream","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Parents" => [{"Ix" => 0,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Differs" => 2}]} 1555s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 1555s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 1555s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0}],"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","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"} 1555s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 1555s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 1555s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a"}],"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Type" => "Packaging","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n"} 1555s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 1555s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 1555s git-debrebase = Packaging {"Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "5052af319e257b8c20174a42da76f055391029f3"}],"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Type" => "Packaging"} 1555s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 1555s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 1555s git-debrebase = Packaging {"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"}],"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"} 1555s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1555s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 1555s git-debrebase = Changelog {"Parents" => [{"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Ix" => 0,"Differs" => 16}],"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","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"} 1555s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1555s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1555s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","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","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1555s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1555s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1555s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1555s git-debrebase = Anchor {"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","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]]} 1555s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1555s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1555s ' 1555s ++ git rev-parse HEAD 1555s + expect=97a91c40026ff6a52a5cc7d020dda82048f2e77d 1555s + exec 1555s + local cid ctype info nparents 1555s + read cid ctype info 1555s + : ===== 97a91c40026ff6a52a5cc7d020dda82048f2e77d Upstream ===== 1555s + test 97a91c40026ff6a52a5cc7d020dda82048f2e77d = 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1555s + local cetype=Upstream 1555s + '[' xUpstream = xUpstream ']' 1555s + cetype=SAME 1555s ++ git log -n1 --pretty=format:%P 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1555s + local parents=2f5a428eb6044c48a90076bcad0c49753a477557 1555s + expect=2f5a428eb6044c48a90076bcad0c49753a477557 1555s + enparents=1 1555s + : Upstream/SAME 2f5a428eb6044c48a90076bcad0c49753a477557 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s ++ wc -w 1555s ++ printf %s 2f5a428eb6044c48a90076bcad0c49753a477557 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ t-sort -u 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s ++ wc -w 1555s ++ for f in $parents 1555s ++ echo 2f5a428eb6044c48a90076bcad0c49753a477557 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== 2f5a428eb6044c48a90076bcad0c49753a477557 Upstream ===== 1555s + test 2f5a428eb6044c48a90076bcad0c49753a477557 = 2f5a428eb6044c48a90076bcad0c49753a477557 1555s + local cetype=Upstream 1555s + '[' xUpstream = xUpstream ']' 1555s + cetype=SAME 1555s ++ git log -n1 --pretty=format:%P 2f5a428eb6044c48a90076bcad0c49753a477557 1555s + local parents=dbe44ad09874a6a4cc7cc047c096dd541f833180 1555s + expect=dbe44ad09874a6a4cc7cc047c096dd541f833180 1555s + enparents=1 1555s + : Upstream/SAME dbe44ad09874a6a4cc7cc047c096dd541f833180 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s ++ wc -w 1555s ++ printf %s dbe44ad09874a6a4cc7cc047c096dd541f833180 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ t-sort -u 1555s ++ wc -w 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s ++ for f in $parents 1555s ++ echo dbe44ad09874a6a4cc7cc047c096dd541f833180 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== dbe44ad09874a6a4cc7cc047c096dd541f833180 Upstream ===== 1555s + test dbe44ad09874a6a4cc7cc047c096dd541f833180 = dbe44ad09874a6a4cc7cc047c096dd541f833180 1555s + local cetype=Upstream 1555s + '[' xUpstream = xUpstream ']' 1555s + cetype=SAME 1555s ++ git log -n1 --pretty=format:%P dbe44ad09874a6a4cc7cc047c096dd541f833180 1555s + local parents=2f5c652341e9f1508c8539185075ac0deb3ad68a 1555s + expect=2f5c652341e9f1508c8539185075ac0deb3ad68a 1555s + enparents=1 1555s + : Upstream/SAME 2f5c652341e9f1508c8539185075ac0deb3ad68a 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s ++ wc -w 1555s ++ printf %s 2f5c652341e9f1508c8539185075ac0deb3ad68a 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ t-sort -u 1555s ++ wc -w 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s ++ for f in $parents 1555s ++ echo 2f5c652341e9f1508c8539185075ac0deb3ad68a 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== 2f5c652341e9f1508c8539185075ac0deb3ad68a Upstream ===== 1555s + test 2f5c652341e9f1508c8539185075ac0deb3ad68a = 2f5c652341e9f1508c8539185075ac0deb3ad68a 1555s + local cetype=Upstream 1555s + '[' xUpstream = xUpstream ']' 1555s + cetype=SAME 1555s ++ git log -n1 --pretty=format:%P 2f5c652341e9f1508c8539185075ac0deb3ad68a 1555s + local parents=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1555s + expect=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1555s + enparents=1 1555s + : Upstream/SAME 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s ++ wc -w 1555s ++ printf %s 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ wc -w 1555s ++ t-sort -u 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s ++ for f in $parents 1555s ++ echo 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc Upstream ===== 1555s + test 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc = 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1555s + local cetype=Upstream 1555s + '[' xUpstream = xUpstream ']' 1555s + cetype=SAME 1555s ++ git log -n1 --pretty=format:%P 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1555s + local parents=53c89ace547b642d3714cc2f5cc74a4fc0922af4 1555s + expect=53c89ace547b642d3714cc2f5cc74a4fc0922af4 1555s + enparents=1 1555s + : Upstream/SAME 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s ++ printf %s 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1555s ++ wc -w 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ for f in $parents 1555s ++ echo 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1555s ++ wc -w 1555s ++ t-sort -u 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== 53c89ace547b642d3714cc2f5cc74a4fc0922af4 Upstream ===== 1555s + test 53c89ace547b642d3714cc2f5cc74a4fc0922af4 = 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1555s + local cetype=Upstream 1555s + '[' xUpstream = xUpstream ']' 1555s + cetype=SAME 1555s ++ git log -n1 --pretty=format:%P 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1555s + local parents=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1555s + expect=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1555s + enparents=1 1555s + : Upstream/SAME 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s ++ printf %s 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1555s ++ wc -w 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ for f in $parents 1555s ++ echo 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1555s ++ wc -w 1555s ++ t-sort -u 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 Upstream ===== 1555s + test 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 = 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1555s + local cetype=Upstream 1555s + '[' xUpstream = xUpstream ']' 1555s + cetype=SAME 1555s ++ git log -n1 --pretty=format:%P 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1555s + local parents=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1555s + expect=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1555s + enparents=1 1555s + : Upstream/SAME e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s ++ printf %s e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1555s ++ wc -w 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ for f in $parents 1555s ++ echo e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1555s ++ wc -w 1555s ++ t-sort -u 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== e7d45cf6ecfa83b4fd6418de6b88f8471799e588 Packaging ===== 1555s + test e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1555s + local cetype=Upstream 1555s + '[' xPackaging = xUpstream ']' 1555s ++ git log -n1 --pretty=format:%P e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1555s + local parents=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1555s + expect=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1555s + enparents=1 1555s + : Packaging/Upstream ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + '[' xY:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 '!=' x ']' 1555s + test Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1555s + bwtip= 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :. ':!debian' 1555s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :debian/patches 1555s + etypes=Packaging 1555s ++ printf %s ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1555s ++ wc -w 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ for f in $parents 1555s ++ echo ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1555s ++ wc -w 1555s ++ t-sort -u 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== ef1a3b6b02c3b4091eea7c3218709c1aa84c299e Packaging ===== 1555s + test ef1a3b6b02c3b4091eea7c3218709c1aa84c299e = ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1555s + local cetype=Packaging 1555s + '[' xPackaging = xPackaging ']' 1555s + cetype=SAME 1555s ++ git log -n1 --pretty=format:%P ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1555s + local parents=906c70d0be27939a63e478000e80b0914705ad3a 1555s + expect=906c70d0be27939a63e478000e80b0914705ad3a 1555s + enparents=1 1555s + : Packaging/SAME 906c70d0be27939a63e478000e80b0914705ad3a 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :. ':!debian' 1555s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :debian/patches 1555s + etypes=Packaging 1555s ++ printf %s 906c70d0be27939a63e478000e80b0914705ad3a 1555s ++ wc -w 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ for f in $parents 1555s ++ echo 906c70d0be27939a63e478000e80b0914705ad3a 1555s ++ wc -w 1555s ++ t-sort -u 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== 906c70d0be27939a63e478000e80b0914705ad3a Packaging ===== 1555s + test 906c70d0be27939a63e478000e80b0914705ad3a = 906c70d0be27939a63e478000e80b0914705ad3a 1555s + local cetype=Packaging 1555s + '[' xPackaging = xPackaging ']' 1555s + cetype=SAME 1555s ++ git log -n1 --pretty=format:%P 906c70d0be27939a63e478000e80b0914705ad3a 1555s + local parents=5052af319e257b8c20174a42da76f055391029f3 1555s + expect=5052af319e257b8c20174a42da76f055391029f3 1555s + enparents=1 1555s + : Packaging/SAME 5052af319e257b8c20174a42da76f055391029f3 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :. ':!debian' 1555s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :debian/patches 1555s + etypes=Packaging 1555s ++ printf %s 5052af319e257b8c20174a42da76f055391029f3 1555s ++ wc -w 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ for f in $parents 1555s ++ echo 5052af319e257b8c20174a42da76f055391029f3 1555s ++ wc -w 1555s ++ t-sort -u 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== 5052af319e257b8c20174a42da76f055391029f3 Packaging ===== 1555s + test 5052af319e257b8c20174a42da76f055391029f3 = 5052af319e257b8c20174a42da76f055391029f3 1555s + local cetype=Packaging 1555s + '[' xPackaging = xPackaging ']' 1555s + cetype=SAME 1555s ++ git log -n1 --pretty=format:%P 5052af319e257b8c20174a42da76f055391029f3 1555s + local parents=1aefa2934a527f1fa4ddaf809508b879f5086949 1555s + expect=1aefa2934a527f1fa4ddaf809508b879f5086949 1555s + enparents=1 1555s + : Packaging/SAME 1aefa2934a527f1fa4ddaf809508b879f5086949 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :. ':!debian' 1555s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :debian/patches 1555s + etypes=Packaging 1555s ++ printf %s 1aefa2934a527f1fa4ddaf809508b879f5086949 1555s ++ wc -w 1555s + local cnparents=1 1555s + test 1 = 1 1555s ++ for f in $parents 1555s ++ echo 1aefa2934a527f1fa4ddaf809508b879f5086949 1555s ++ wc -w 1555s ++ t-sort -u 1555s ++ LC_COLLATE=C 1555s ++ sort -u 1555s + local cndparents=1 1555s + test 1 = 1 1555s + case "$parents" in 1555s + case "$ctype" in 1555s + read cid ctype info 1555s + : ===== 1aefa2934a527f1fa4ddaf809508b879f5086949 Changelog ===== 1555s + test 1aefa2934a527f1fa4ddaf809508b879f5086949 = 1aefa2934a527f1fa4ddaf809508b879f5086949 1555s + local cetype=Packaging 1555s + '[' xChangelog = xPackaging ']' 1555s ++ git log -n1 --pretty=format:%P 1aefa2934a527f1fa4ddaf809508b879f5086949 1555s + local parents=60728ea4003218c146a7f595c4ff746760566965 1555s + expect=60728ea4003218c146a7f595c4ff746760566965 1555s + enparents=1 1555s + : Changelog/Packaging 60728ea4003218c146a7f595c4ff746760566965 1555s + case "$ctype/$cetype" in 1555s + case "$ctype/$etypes" in 1555s + case "$cetype" in 1555s + case "$ctype" in 1555s + git diff --quiet 60728ea4003218c146a7f595c4ff746760566965..1aefa2934a527f1fa4ddaf809508b879f5086949 -- :. ':!debian/changelog' 1555s + etypes=Packaging 1555s ++ printf %s 60728ea4003218c146a7f595c4ff746760566965 1555s ++ wc -w 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ for f in $parents 1556s ++ echo 60728ea4003218c146a7f595c4ff746760566965 1556s ++ wc -w 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 60728ea4003218c146a7f595c4ff746760566965 Changelog ===== 1556s + test 60728ea4003218c146a7f595c4ff746760566965 = 60728ea4003218c146a7f595c4ff746760566965 1556s + local cetype=Packaging 1556s + '[' xChangelog = xPackaging ']' 1556s ++ git log -n1 --pretty=format:%P 60728ea4003218c146a7f595c4ff746760566965 1556s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + enparents=1 1556s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..60728ea4003218c146a7f595c4ff746760566965 -- :. ':!debian/changelog' 1556s + etypes=Packaging 1556s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s ++ wc -w 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ for f in $parents 1556s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s ++ wc -w 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1556s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + local cetype=Packaging 1556s + '[' xAnchor = xPackaging ']' 1556s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1556s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1556s + enparents=1 1556s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s + break 1556s + checkletters=l 1556s + '[' xl '!=' x ']' 1556s + : '---- stitched-mixed ...l ----' 1556s + make_check l 1556s + case "$1" in 1556s + git diff --quiet HEAD refs/heads/before-work--stitched-mixed -- :. ':!debian/patches' 1556s + t-gdr-good laundered 1556s + local state=laundered 1556s + local beforetag= 1556s + case $state in 1556s + git diff --quiet -- :. ':!debian/patches' 1556s + LC_MESSAGES=C 1556s + t-git-debrebase status 1556s + local gdr=git-debrebase 1556s + : ' 1556s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1556s + git-debrebase --dgit=dgit -D status 1556s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 1556s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 1556s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1556s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 1556s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 1556s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"}]} 1556s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 1556s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 1556s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Differs" => 2}],"Type" => "Upstream","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1556s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 1556s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 1556s git-debrebase = Upstream {"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Parents" => [{"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream"} 1556s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 1556s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 1556s git-debrebase = Upstream {"Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Differs" => 2}],"Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream"} 1556s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 1556s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 1556s git-debrebase = Upstream {"Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream"} 1556s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 1556s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 1556s 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","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1556s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 1556s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 1556s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e","CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Type" => "Packaging","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0}]} 1556s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 1556s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 1556s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Type" => "Packaging","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}]} 1556s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 1556s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 1556s git-debrebase = Packaging {"Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging"} 1556s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 1556s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 1556s git-debrebase = Packaging {"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Parents" => [{"Ix" => 0,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Differs" => 32}],"Type" => "Packaging","Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1556s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1556s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 1556s git-debrebase = Changelog {"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Differs" => 16,"Ix" => 0}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Changelog"} 1556s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1556s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1556s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1556s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1556s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1556s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1556s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]]} 1556s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel--stitched-mixed 1556s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1556s ' 1556s + case $state in 1556s + egrep '^ *branch is laundered' ../status.check 1556s branch is laundered 1556s + t-gdr-good-analyse HEAD laundered 1556s + local head=HEAD 1556s + local state=laundered 1556s + local wsfx= 1556s + local etypes bwtip 1556s + case $state in 1556s + etypes=Upstream 1556s ++ t-git-debrebase breakwater 1556s ++ local gdr=git-debrebase 1556s ++ : ' 1556s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1556s ++ git-debrebase --dgit=dgit -D breakwater 1556s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 1556s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 1556s git-debrebase = Upstream {"Parents" => [{"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Ix" => 0,"Differs" => 2}],"Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","Type" => "Upstream","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","CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d"} 1556s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 1556s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 1556s git-debrebase = Upstream {"Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","Parents" => [{"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Ix" => 0,"Differs" => 2}],"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","Type" => "Upstream"} 1556s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 1556s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 1556s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Differs" => 2}],"Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c"} 1556s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 1556s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 1556s git-debrebase = Upstream {"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","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","Type" => "Upstream","Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Parents" => [{"Ix" => 0,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Differs" => 2}]} 1556s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 1556s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 1556s git-debrebase = Upstream {"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","Type" => "Upstream","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4"}]} 1556s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 1556s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 1556s git-debrebase = Upstream {"Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","Parents" => [{"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Ix" => 0,"Differs" => 2}],"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","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Type" => "Upstream"} 1556s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 1556s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 1556s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588"}]} 1556s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 1556s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 1556s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0}],"Tree" => "324fefac260fae19926241bd0cd3439ae536e63e"} 1556s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 1556s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 1556s git-debrebase = Packaging {"Parents" => [{"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Ix" => 0,"Differs" => 32}],"Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","Type" => "Packaging","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e"} 1556s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 1556s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 1556s git-debrebase = Packaging {"Parents" => [{"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Ix" => 0,"Differs" => 32}],"Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1556s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 1556s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 1556s git-debrebase = Packaging {"Parents" => [{"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Ix" => 0,"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","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n"} 1556s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1556s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 1556s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "60728ea4003218c146a7f595c4ff746760566965"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Msg" => "dch -r -D unstable\n","Type" => "Changelog"} 1556s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1556s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1556s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1556s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1556s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1556s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1556s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1556s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1556s ' 1556s + bwtip=Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1556s + anal=../anal 1556s + t-git-debrebase analyse HEAD 1556s + local gdr=git-debrebase 1556s + : ' 1556s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1556s + git-debrebase --dgit=dgit -D analyse HEAD 1556s git-debrebase *** WALK 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1 *main::STDOUT 1556s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 1556s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 1556s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Ix" => 0,"Differs" => 2}],"CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c"} 1556s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 1556s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 1556s git-debrebase = Upstream {"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","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Differs" => 2}],"Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557"} 1556s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 1556s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 1556s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Differs" => 2}],"Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\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: upstream part]\n","Type" => "Upstream"} 1556s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 1556s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 1556s git-debrebase = Upstream {"Parents" => [{"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Ix" => 0,"Differs" => 2}],"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","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","Type" => "Upstream"} 1556s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 1556s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 1556s git-debrebase = Upstream {"Parents" => [{"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Ix" => 0,"Differs" => 2}],"Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","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","Type" => "Upstream"} 1556s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 1556s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 1556s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5"}],"Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","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","Type" => "Upstream"} 1556s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 1556s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 1556s git-debrebase = 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","Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream"} 1556s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 1556s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 1556s git-debrebase = 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","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0}],"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e"} 1556s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 1556s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 1556s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Differs" => 32}],"Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Packaging"} 1556s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 1556s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 1556s git-debrebase = Packaging {"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "5052af319e257b8c20174a42da76f055391029f3"}],"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1556s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 1556s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 1556s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Differs" => 32}],"Tree" => "84e220841747026f0ad129576c4e2db185521ecc","CommitId" => "5052af319e257b8c20174a42da76f055391029f3","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"} 1556s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1556s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 1556s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","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","Type" => "Changelog"} 1556s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1556s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1556s git-debrebase = Changelog {"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"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"} 1556s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1556s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1556s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1556s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1556s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1556s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1556s ' 1556s ++ git rev-parse HEAD 1556s + expect=97a91c40026ff6a52a5cc7d020dda82048f2e77d 1556s + exec 1556s + local cid ctype info nparents 1556s + read cid ctype info 1556s + : ===== 97a91c40026ff6a52a5cc7d020dda82048f2e77d Upstream ===== 1556s + test 97a91c40026ff6a52a5cc7d020dda82048f2e77d = 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1556s + local cetype=Upstream 1556s + '[' xUpstream = xUpstream ']' 1556s + cetype=SAME 1556s ++ git log -n1 --pretty=format:%P 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1556s + local parents=2f5a428eb6044c48a90076bcad0c49753a477557 1556s + expect=2f5a428eb6044c48a90076bcad0c49753a477557 1556s + enparents=1 1556s + : Upstream/SAME 2f5a428eb6044c48a90076bcad0c49753a477557 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s ++ printf %s 2f5a428eb6044c48a90076bcad0c49753a477557 1556s ++ wc -w 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ wc -w 1556s ++ for f in $parents 1556s ++ echo 2f5a428eb6044c48a90076bcad0c49753a477557 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 2f5a428eb6044c48a90076bcad0c49753a477557 Upstream ===== 1556s + test 2f5a428eb6044c48a90076bcad0c49753a477557 = 2f5a428eb6044c48a90076bcad0c49753a477557 1556s + local cetype=Upstream 1556s + '[' xUpstream = xUpstream ']' 1556s + cetype=SAME 1556s ++ git log -n1 --pretty=format:%P 2f5a428eb6044c48a90076bcad0c49753a477557 1556s + local parents=dbe44ad09874a6a4cc7cc047c096dd541f833180 1556s + expect=dbe44ad09874a6a4cc7cc047c096dd541f833180 1556s + enparents=1 1556s + : Upstream/SAME dbe44ad09874a6a4cc7cc047c096dd541f833180 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s ++ printf %s dbe44ad09874a6a4cc7cc047c096dd541f833180 1556s ++ wc -w 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ wc -w 1556s ++ for f in $parents 1556s ++ echo dbe44ad09874a6a4cc7cc047c096dd541f833180 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== dbe44ad09874a6a4cc7cc047c096dd541f833180 Upstream ===== 1556s + test dbe44ad09874a6a4cc7cc047c096dd541f833180 = dbe44ad09874a6a4cc7cc047c096dd541f833180 1556s + local cetype=Upstream 1556s + '[' xUpstream = xUpstream ']' 1556s + cetype=SAME 1556s ++ git log -n1 --pretty=format:%P dbe44ad09874a6a4cc7cc047c096dd541f833180 1556s + local parents=2f5c652341e9f1508c8539185075ac0deb3ad68a 1556s + expect=2f5c652341e9f1508c8539185075ac0deb3ad68a 1556s + enparents=1 1556s + : Upstream/SAME 2f5c652341e9f1508c8539185075ac0deb3ad68a 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s ++ wc -w 1556s ++ printf %s 2f5c652341e9f1508c8539185075ac0deb3ad68a 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ wc -w 1556s ++ for f in $parents 1556s ++ echo 2f5c652341e9f1508c8539185075ac0deb3ad68a 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 2f5c652341e9f1508c8539185075ac0deb3ad68a Upstream ===== 1556s + test 2f5c652341e9f1508c8539185075ac0deb3ad68a = 2f5c652341e9f1508c8539185075ac0deb3ad68a 1556s + local cetype=Upstream 1556s + '[' xUpstream = xUpstream ']' 1556s + cetype=SAME 1556s ++ git log -n1 --pretty=format:%P 2f5c652341e9f1508c8539185075ac0deb3ad68a 1556s + local parents=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1556s + expect=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1556s + enparents=1 1556s + : Upstream/SAME 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s ++ wc -w 1556s ++ printf %s 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ wc -w 1556s ++ for f in $parents 1556s ++ echo 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc Upstream ===== 1556s + test 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc = 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1556s + local cetype=Upstream 1556s + '[' xUpstream = xUpstream ']' 1556s + cetype=SAME 1556s ++ git log -n1 --pretty=format:%P 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1556s + local parents=53c89ace547b642d3714cc2f5cc74a4fc0922af4 1556s + expect=53c89ace547b642d3714cc2f5cc74a4fc0922af4 1556s + enparents=1 1556s + : Upstream/SAME 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s ++ wc -w 1556s ++ printf %s 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ wc -w 1556s ++ for f in $parents 1556s ++ echo 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 53c89ace547b642d3714cc2f5cc74a4fc0922af4 Upstream ===== 1556s + test 53c89ace547b642d3714cc2f5cc74a4fc0922af4 = 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1556s + local cetype=Upstream 1556s + '[' xUpstream = xUpstream ']' 1556s + cetype=SAME 1556s ++ git log -n1 --pretty=format:%P 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1556s + local parents=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1556s + expect=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1556s + enparents=1 1556s + : Upstream/SAME 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s ++ wc -w 1556s ++ printf %s 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ for f in $parents 1556s ++ echo 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1556s ++ wc -w 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 Upstream ===== 1556s + test 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 = 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1556s + local cetype=Upstream 1556s + '[' xUpstream = xUpstream ']' 1556s + cetype=SAME 1556s ++ git log -n1 --pretty=format:%P 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1556s + local parents=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1556s + expect=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1556s + enparents=1 1556s + : Upstream/SAME e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s ++ printf %s e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1556s ++ wc -w 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ for f in $parents 1556s ++ echo e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s ++ wc -w 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== e7d45cf6ecfa83b4fd6418de6b88f8471799e588 Packaging ===== 1556s + test e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1556s + local cetype=Upstream 1556s + '[' xPackaging = xUpstream ']' 1556s ++ git log -n1 --pretty=format:%P e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1556s + local parents=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1556s + expect=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1556s + enparents=1 1556s + : Packaging/Upstream ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + '[' xY:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 '!=' x ']' 1556s + test Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1556s + bwtip= 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :. ':!debian' 1556s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :debian/patches 1556s + etypes=Packaging 1556s ++ printf %s ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1556s ++ wc -w 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ for f in $parents 1556s ++ wc -w 1556s ++ echo ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== ef1a3b6b02c3b4091eea7c3218709c1aa84c299e Packaging ===== 1556s + test ef1a3b6b02c3b4091eea7c3218709c1aa84c299e = ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1556s + local cetype=Packaging 1556s + '[' xPackaging = xPackaging ']' 1556s + cetype=SAME 1556s ++ git log -n1 --pretty=format:%P ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1556s + local parents=906c70d0be27939a63e478000e80b0914705ad3a 1556s + expect=906c70d0be27939a63e478000e80b0914705ad3a 1556s + enparents=1 1556s + : Packaging/SAME 906c70d0be27939a63e478000e80b0914705ad3a 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :. ':!debian' 1556s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :debian/patches 1556s + etypes=Packaging 1556s ++ printf %s 906c70d0be27939a63e478000e80b0914705ad3a 1556s ++ wc -w 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ wc -w 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s ++ for f in $parents 1556s ++ echo 906c70d0be27939a63e478000e80b0914705ad3a 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 906c70d0be27939a63e478000e80b0914705ad3a Packaging ===== 1556s + test 906c70d0be27939a63e478000e80b0914705ad3a = 906c70d0be27939a63e478000e80b0914705ad3a 1556s + local cetype=Packaging 1556s + '[' xPackaging = xPackaging ']' 1556s + cetype=SAME 1556s ++ git log -n1 --pretty=format:%P 906c70d0be27939a63e478000e80b0914705ad3a 1556s + local parents=5052af319e257b8c20174a42da76f055391029f3 1556s + expect=5052af319e257b8c20174a42da76f055391029f3 1556s + enparents=1 1556s + : Packaging/SAME 5052af319e257b8c20174a42da76f055391029f3 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :. ':!debian' 1556s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :debian/patches 1556s + etypes=Packaging 1556s ++ printf %s 5052af319e257b8c20174a42da76f055391029f3 1556s ++ wc -w 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ for f in $parents 1556s ++ echo 5052af319e257b8c20174a42da76f055391029f3 1556s ++ wc -w 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 5052af319e257b8c20174a42da76f055391029f3 Packaging ===== 1556s + test 5052af319e257b8c20174a42da76f055391029f3 = 5052af319e257b8c20174a42da76f055391029f3 1556s + local cetype=Packaging 1556s + '[' xPackaging = xPackaging ']' 1556s + cetype=SAME 1556s ++ git log -n1 --pretty=format:%P 5052af319e257b8c20174a42da76f055391029f3 1556s + local parents=1aefa2934a527f1fa4ddaf809508b879f5086949 1556s + expect=1aefa2934a527f1fa4ddaf809508b879f5086949 1556s + enparents=1 1556s + : Packaging/SAME 1aefa2934a527f1fa4ddaf809508b879f5086949 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :. ':!debian' 1556s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :debian/patches 1556s + etypes=Packaging 1556s ++ wc -w 1556s ++ printf %s 1aefa2934a527f1fa4ddaf809508b879f5086949 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s ++ wc -w 1556s ++ for f in $parents 1556s ++ echo 1aefa2934a527f1fa4ddaf809508b879f5086949 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 1aefa2934a527f1fa4ddaf809508b879f5086949 Changelog ===== 1556s + test 1aefa2934a527f1fa4ddaf809508b879f5086949 = 1aefa2934a527f1fa4ddaf809508b879f5086949 1556s + local cetype=Packaging 1556s + '[' xChangelog = xPackaging ']' 1556s ++ git log -n1 --pretty=format:%P 1aefa2934a527f1fa4ddaf809508b879f5086949 1556s + local parents=60728ea4003218c146a7f595c4ff746760566965 1556s + expect=60728ea4003218c146a7f595c4ff746760566965 1556s + enparents=1 1556s + : Changelog/Packaging 60728ea4003218c146a7f595c4ff746760566965 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s + git diff --quiet 60728ea4003218c146a7f595c4ff746760566965..1aefa2934a527f1fa4ddaf809508b879f5086949 -- :. ':!debian/changelog' 1556s + etypes=Packaging 1556s ++ wc -w 1556s ++ printf %s 60728ea4003218c146a7f595c4ff746760566965 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ for f in $parents 1556s ++ wc -w 1556s ++ echo 60728ea4003218c146a7f595c4ff746760566965 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 60728ea4003218c146a7f595c4ff746760566965 Changelog ===== 1556s + test 60728ea4003218c146a7f595c4ff746760566965 = 60728ea4003218c146a7f595c4ff746760566965 1556s + local cetype=Packaging 1556s + '[' xChangelog = xPackaging ']' 1556s ++ git log -n1 --pretty=format:%P 60728ea4003218c146a7f595c4ff746760566965 1556s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + enparents=1 1556s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..60728ea4003218c146a7f595c4ff746760566965 -- :. ':!debian/changelog' 1556s + etypes=Packaging 1556s ++ wc -w 1556s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + local cnparents=1 1556s + test 1 = 1 1556s ++ t-sort -u 1556s ++ LC_COLLATE=C 1556s ++ sort -u 1556s ++ wc -w 1556s ++ for f in $parents 1556s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + local cndparents=1 1556s + test 1 = 1 1556s + case "$parents" in 1556s + case "$ctype" in 1556s + read cid ctype info 1556s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1556s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + local cetype=Packaging 1556s + '[' xAnchor = xPackaging ']' 1556s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1556s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1556s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1556s + enparents=1 1556s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1556s + case "$ctype/$cetype" in 1556s + case "$ctype/$etypes" in 1556s + case "$cetype" in 1556s + case "$ctype" in 1556s + break 1556s + checkletters= 1556s + '[' x '!=' x ']' 1556s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1556s + work=work--unstitched-laundered 1556s + : '---------- unstitched-laundered ----------' 1556s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 1556s + sed s/unstitched-laundered/work--unstitched-laundered/ 1556s + git update-ref --stdin 1556s + git checkout work--unstitched-laundered 1556s Switched to branch 'work--unstitched-laundered' 1556s + checkletters=Vlt 1556s + shift 1556s + before=before-work--unstitched-laundered 1556s + git branch before-work--unstitched-laundered 1556s + local xopts= 1556s + case "$checkletters" in 1556s + case "$checkletters" in 1556s + case "$checkletters" in 1556s + case "$checkletters" in 1556s + t-git-debrebase 1556s + local gdr=git-debrebase 1556s + : ' 1556s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1556s + git-debrebase --dgit=dgit -D 1557s git-debrebase ffq_prev_branchinfo branch current refs/heads/work--unstitched-laundered 1557s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 0 - 1557s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1557s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1557s 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","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}]} 1557s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1557s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1557s git-debrebase = Upstream {"Type" => "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","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0,"Differs" => 2}]} 1557s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1557s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1557s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0}],"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","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"} 1557s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1557s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1557s git-debrebase = 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","Type" => "Upstream","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0,"Differs" => 2}],"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d"} 1557s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1557s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1557s git-debrebase = Upstream {"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0,"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","Type" => "Upstream"} 1557s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1557s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1557s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","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"} 1557s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1557s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1557s 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","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Parents" => [{"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2}]} 1557s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1557s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1557s git-debrebase = Packaging {"Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0,"Differs" => 32}],"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","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"} 1557s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1557s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1557s git-debrebase = Packaging {"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}],"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"} 1557s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1557s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1557s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}],"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","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"} 1557s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1557s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1557s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}],"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","Type" => "Packaging"} 1557s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1557s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1557s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}],"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"} 1557s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1557s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1557s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","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"} 1557s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1557s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1557s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1557s 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" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Type" => "Anchor","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1557s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1557s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1557s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1557s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 14 1557s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1557s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 1557s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 1557s git-debrebase WALK BUILD 515e62b8d591fcc68597383b955d898db71abc6c Debian (rewriting=0) 1557s git-debrebase WALK BUILD 301cc9756d79fc379acfed35ff33c0785f2e1b7d Debian (rewriting=0) 1557s git-debrebase WALK BUILD f2db5dc7e25f34f0f34d04d0160f912a76b3667d Debian (rewriting=0) 1557s git-debrebase WALK BUILD 86248dea3770451139d1a57015bd9b36aa1ed39c Debian (rewriting=0) 1557s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1557s git-debrebase WALK BUILD 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream (rewriting=0) 1557s git-debrebase WALK BUILD e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream (rewriting=0) 1557s git-debrebase WALK BUILD 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream (rewriting=0) 1557s git-debrebase WALK BUILD b79d513107e3cff19d401deb87cc3e6c4809966e Upstream (rewriting=0) 1557s git-debrebase WALK BUILD eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream (rewriting=0) 1557s git-debrebase WALK BUILD fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream (rewriting=0) 1557s git-debrebase WALK BUILD 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream (rewriting=0) 1557s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1557s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 0 1557s git-debrebase *** WALK RETURN 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 86248dea3770451139d1a57015bd9b36aa1ed39c 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1557s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1557s ' 1557s + peel=peel--unstitched-laundered 1557s + git checkout -b peel--unstitched-laundered 1557s Switched to a new branch 'peel--unstitched-laundered' 1557s + t-clean-on-branch peel--unstitched-laundered 1557s + t-output '## peel--unstitched-laundered' git status -b --porcelain 1557s + printf '%s\n' '## peel--unstitched-laundered' 1557s + shift 1557s + git status -b --porcelain 1557s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1557s + : '---------- unstitched-laundered Vlt ----------' 1557s + '[' xVlt '!=' x ']' 1557s + : '---- unstitched-laundered ...Vlt ----' 1557s + make_check Vlt 1557s + case "$1" in 1557s + t-refs-same-start 1557s + unset t_ref_val 1557s + t_ref_names=() 1557s + t-refs-same refs/ffq-prev/heads/work--unstitched-laundered refs/ffq-prev/heads/unstitched-laundered 1557s + local g 1557s + for g in $* 1557s + t-ref-same refs/ffq-prev/heads/work--unstitched-laundered 1557s + local name=refs/ffq-prev/heads/work--unstitched-laundered 1557s + local val 1557s ++ t-git-get-ref refs/ffq-prev/heads/work--unstitched-laundered 1557s ++ local ref=refs/ffq-prev/heads/work--unstitched-laundered 1557s ++ case "$ref" in 1557s ++ git show-ref -d refs/ffq-prev/heads/work--unstitched-laundered 1557s ++ perl -ne ' 1557s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--unstitched-laundered\E(?:\^\{\})?$#; 1557s END { print "$x\n" if length $x; } 1557s ' 1557s + val=5c6280b3d52c002248dd7f608e1adb63f1295538 1557s + t-ref-same-val refs/ffq-prev/heads/work--unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 1557s + local name=refs/ffq-prev/heads/work--unstitched-laundered 1557s + local val=5c6280b3d52c002248dd7f608e1adb63f1295538 1557s + case "${t_ref_val-unset}" in 1557s + t_ref_val=5c6280b3d52c002248dd7f608e1adb63f1295538 1557s + t_ref_names+=("$name") 1557s + for g in $* 1557s + t-ref-same refs/ffq-prev/heads/unstitched-laundered 1557s + local name=refs/ffq-prev/heads/unstitched-laundered 1557s + local val 1557s ++ t-git-get-ref refs/ffq-prev/heads/unstitched-laundered 1557s ++ local ref=refs/ffq-prev/heads/unstitched-laundered 1557s ++ case "$ref" in 1557s ++ git show-ref -d refs/ffq-prev/heads/unstitched-laundered 1557s ++ perl -ne ' 1557s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/unstitched-laundered\E(?:\^\{\})?$#; 1557s END { print "$x\n" if length $x; } 1557s ' 1557s + val=5c6280b3d52c002248dd7f608e1adb63f1295538 1557s + t-ref-same-val refs/ffq-prev/heads/unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 1557s + local name=refs/ffq-prev/heads/unstitched-laundered 1557s + local val=5c6280b3d52c002248dd7f608e1adb63f1295538 1557s + case "${t_ref_val-unset}" in 1557s + t_ref_val=5c6280b3d52c002248dd7f608e1adb63f1295538 1557s + t_ref_names+=("$name") 1557s + t-refs-notexist refs/debrebase-last/heads/work--unstitched-laundered 1557s + local val 1557s + for g in $* 1557s ++ t-git-get-ref refs/debrebase-last/heads/work--unstitched-laundered 1557s ++ local ref=refs/debrebase-last/heads/work--unstitched-laundered 1557s ++ case "$ref" in 1557s ++ git show-ref -d refs/debrebase-last/heads/work--unstitched-laundered 1557s ++ perl -ne ' 1557s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work--unstitched-laundered\E(?:\^\{\})?$#; 1557s END { print "$x\n" if length $x; } 1557s ' 1557s ++ test 1 = 1 1557s + val= 1557s + '[' x '!=' x ']' 1557s + checkletters=lt 1557s + '[' xlt '!=' x ']' 1557s + : '---- unstitched-laundered ...lt ----' 1557s + make_check lt 1557s + case "$1" in 1557s + git diff --quiet HEAD refs/heads/before-work--unstitched-laundered -- :. ':!debian/patches' 1557s + t-gdr-good laundered 1557s + local state=laundered 1557s + local beforetag= 1557s + case $state in 1557s + git diff --quiet -- :. ':!debian/patches' 1557s + LC_MESSAGES=C 1557s + t-git-debrebase status 1557s + local gdr=git-debrebase 1557s + : ' 1557s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1557s + git-debrebase --dgit=dgit -D status 1557s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1557s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1557s git-debrebase = Upstream {"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}],"Type" => "Upstream","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 1557s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1557s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1557s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "Upstream","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","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"} 1557s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1557s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1557s 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,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Type" => "Upstream","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e"} 1557s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1557s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1557s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Type" => "Upstream","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","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}]} 1557s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1557s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1557s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}]} 1557s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1557s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1557s 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}],"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 1557s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1557s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1557s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","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","Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0,"Differs" => 2}]} 1557s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1557s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1557s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","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"} 1557s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1557s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1557s git-debrebase = Packaging {"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","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}]} 1557s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1557s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1557s 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}],"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Type" => "Packaging","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1557s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1557s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1557s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","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"}]} 1557s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1557s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1557s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}],"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"} 1557s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1557s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1557s git-debrebase = 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","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1557s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1557s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1557s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1557s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"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"} 1557s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel--unstitched-laundered 1557s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1557s ' 1557s + case $state in 1557s + egrep '^ *branch is laundered' ../status.check 1557s branch is laundered 1557s + t-gdr-good-analyse HEAD laundered 1557s + local head=HEAD 1557s + local state=laundered 1557s + local wsfx= 1557s + local etypes bwtip 1557s + case $state in 1557s + etypes=Upstream 1557s ++ t-git-debrebase breakwater 1557s ++ local gdr=git-debrebase 1557s ++ : ' 1557s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1557s ++ git-debrebase --dgit=dgit -D breakwater 1557s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1557s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1557s git-debrebase = Upstream {"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","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","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}],"Type" => "Upstream"} 1557s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1557s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1557s git-debrebase = Upstream {"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","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1557s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1557s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1557s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","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","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"} 1557s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1557s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1557s git-debrebase = 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","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Type" => "Upstream"} 1557s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1557s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1557s git-debrebase = Upstream {"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" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2,"Ix" => 0}],"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"} 1557s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1557s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1557s 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","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Parents" => [{"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2}],"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 1557s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1557s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1557s git-debrebase = Upstream {"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","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Type" => "Upstream"} 1557s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1557s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1557s 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","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}],"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Type" => "Packaging"} 1557s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1557s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1557s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Parents" => [{"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","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"} 1557s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1557s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1557s git-debrebase = 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","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Parents" => [{"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging"} 1557s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1557s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1557s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Parents" => [{"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32}],"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","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"} 1557s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1557s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1557s 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","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Type" => "Changelog"} 1557s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1557s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1557s git-debrebase = 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" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog"} 1557s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1557s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1557s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1557s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor"} 1557s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1557s ' 1557s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1557s + anal=../anal 1557s + t-git-debrebase analyse HEAD 1557s + local gdr=git-debrebase 1557s + : ' 1557s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1557s + git-debrebase --dgit=dgit -D analyse HEAD 1557s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 1557s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1557s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1557s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Type" => "Upstream","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","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","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 1557s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1557s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1557s 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","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da"} 1557s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1557s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1557s git-debrebase = Upstream {"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Type" => "Upstream","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"} 1557s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1557s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1557s git-debrebase = Upstream {"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Type" => "Upstream","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2,"Ix" => 0}],"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"} 1557s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1557s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1557s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 1557s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1557s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1557s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Type" => "Upstream","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","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","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 1557s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1557s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1557s git-debrebase = Upstream {"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"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"} 1557s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1557s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1557s git-debrebase = Packaging {"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"Type" => "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"} 1557s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1557s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1557s git-debrebase = Packaging {"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32,"Ix" => 0}],"Type" => "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"} 1557s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1557s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1557s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32,"Ix" => 0}],"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89"} 1557s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1557s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1557s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Type" => "Packaging","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}],"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"} 1557s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1557s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1557s 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","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1557s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1557s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1557s 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","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Type" => "Changelog"} 1557s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1557s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1557s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1557s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"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"} 1557s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1557s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1557s ' 1557s ++ git rev-parse HEAD 1557s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1557s + exec 1557s + local cid ctype info nparents 1557s + read cid ctype info 1557s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 1557s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1557s + local cetype=Upstream 1557s + '[' xUpstream = xUpstream ']' 1557s + cetype=SAME 1557s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1557s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1557s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1557s + enparents=1 1557s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 1557s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 1557s + local cetype=Upstream 1557s + '[' xUpstream = xUpstream ']' 1557s + cetype=SAME 1557s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 1557s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1557s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1557s + enparents=1 1557s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1557s ++ t-sort -u 1557s ++ wc -w 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 1557s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1557s + local cetype=Upstream 1557s + '[' xUpstream = xUpstream ']' 1557s + cetype=SAME 1557s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1557s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 1557s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 1557s + enparents=1 1557s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 1557s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 1557s + local cetype=Upstream 1557s + '[' xUpstream = xUpstream ']' 1557s + cetype=SAME 1557s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 1557s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 1557s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 1557s + enparents=1 1557s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 1557s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 1557s + local cetype=Upstream 1557s + '[' xUpstream = xUpstream ']' 1557s + cetype=SAME 1557s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 1557s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1557s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1557s + enparents=1 1557s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 1557s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1557s + local cetype=Upstream 1557s + '[' xUpstream = xUpstream ']' 1557s + cetype=SAME 1557s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1557s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1557s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1557s + enparents=1 1557s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 1557s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1557s + local cetype=Upstream 1557s + '[' xUpstream = xUpstream ']' 1557s + cetype=SAME 1557s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1557s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 1557s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 1557s + enparents=1 1557s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 1557s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 1557s + local cetype=Upstream 1557s + '[' xPackaging = xUpstream ']' 1557s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 1557s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1557s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1557s + enparents=1 1557s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 1557s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1557s + bwtip= 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 1557s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 1557s + etypes=Packaging 1557s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 1557s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1557s + local cetype=Packaging 1557s + '[' xPackaging = xPackaging ']' 1557s + cetype=SAME 1557s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1557s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1557s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1557s + enparents=1 1557s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 1557s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 1557s + etypes=Packaging 1557s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 1557s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1557s + local cetype=Packaging 1557s + '[' xPackaging = xPackaging ']' 1557s + cetype=SAME 1557s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1557s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 1557s + expect=515e62b8d591fcc68597383b955d898db71abc6c 1557s + enparents=1 1557s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 1557s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 1557s + etypes=Packaging 1557s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 1557s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 1557s + local cetype=Packaging 1557s + '[' xPackaging = xPackaging ']' 1557s + cetype=SAME 1557s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 1557s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 1557s + expect=809643e5389def220ea36d61f2d3dd504603e95a 1557s + enparents=1 1557s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 1557s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 1557s + etypes=Packaging 1557s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 1557s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 1557s + local cetype=Packaging 1557s + '[' xChangelog = xPackaging ']' 1557s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 1557s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 1557s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 1557s + enparents=1 1557s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 1557s + etypes=Packaging 1557s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 1557s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 1557s + local cetype=Packaging 1557s + '[' xChangelog = xPackaging ']' 1557s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 1557s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1557s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1557s + enparents=1 1557s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 1557s + etypes=Packaging 1557s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1557s ++ wc -w 1557s + local cnparents=1 1557s + test 1 = 1 1557s ++ for f in $parents 1557s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1557s ++ wc -w 1557s ++ t-sort -u 1557s ++ LC_COLLATE=C 1557s ++ sort -u 1557s + local cndparents=1 1557s + test 1 = 1 1557s + case "$parents" in 1557s + case "$ctype" in 1557s + read cid ctype info 1557s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1557s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1557s + local cetype=Packaging 1557s + '[' xAnchor = xPackaging ']' 1557s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1557s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1557s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1557s + enparents=1 1557s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1557s + case "$ctype/$cetype" in 1557s + case "$ctype/$etypes" in 1557s + case "$cetype" in 1557s + case "$ctype" in 1557s + break 1557s + checkletters=t 1557s + '[' xt '!=' x ']' 1557s + : '---- unstitched-laundered ...t ----' 1557s + make_check t 1557s + case "$1" in 1557s + git diff --quiet HEAD refs/heads/before-work--unstitched-laundered 1557s + checkletters= 1557s + '[' x '!=' x ']' 1557s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1557s + work=work--unstitched-mixed 1557s + : '---------- unstitched-mixed ----------' 1557s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 1557s + git update-ref --stdin 1557s + sed s/unstitched-mixed/work--unstitched-mixed/ 1557s + git checkout work--unstitched-mixed 1557s Switched to branch 'work--unstitched-mixed' 1557s + checkletters=Vl 1557s + shift 1557s + before=before-work--unstitched-mixed 1557s + git branch before-work--unstitched-mixed 1558s + local xopts= 1558s + case "$checkletters" in 1558s + case "$checkletters" in 1558s + case "$checkletters" in 1558s + case "$checkletters" in 1558s + t-git-debrebase 1558s + local gdr=git-debrebase 1558s + : ' 1558s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1558s + git-debrebase --dgit=dgit -D 1558s git-debrebase ffq_prev_branchinfo branch current refs/heads/work--unstitched-mixed 1558s git-debrebase *** WALK 9b56b9c2600dc10b9eec97d535d89870476de971 0 - 1558s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 1558s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 1558s git-debrebase = Mixed {"Hdr" => "tree bec3a99f595d6254a65c51aa0160db363a70a9f9\nparent 5668ce44fba4db3f42ac837f0104a9335a819367\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Type" => "Mixed","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367"}],"Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971"} 1558s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 1558s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 1558s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Hdr" => "tree cd4c1550c7da8a4cd81ed765f7a91f2c58843a39\nparent 5360dd228488e99ffa3d55e906ddc0de1c111c4e\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Type" => "Upstream","Parents" => [{"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Differs" => 2,"Ix" => 0}]} 1558s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 1558s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 1558s git-debrebase = Packaging {"Hdr" => "tree 1e25a192cedaf5e20ce34baba2c091c4a579d05c\nparent d525d15277201d3a1cb95e2a82545c25ba458386\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Type" => "Packaging","Parents" => [{"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Differs" => 32,"Ix" => 0}],"Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e"} 1558s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 1558s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 1558s git-debrebase = AddPatches {"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Parents" => [{"Ix" => 0,"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Differs" => 4}],"Type" => "AddPatches","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","Hdr" => "tree e6c6c599f5b52414c68918fbedd2a0a4abe68178\nparent 6e00b9cbfb2ac78131496aadb210310e5b4b6a84\nauthor dgit test git user 1530000025 +0100\ncommitter dgit test git user 1530000025 +0100\n"} 1558s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 1558s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 1558s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n","CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Hdr" => "tree 4d870e59c3a21c2e6202b59474df673e46ef6449\nparent 5138bd8205d6eeb162d87a2d085746c0c305261c\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Type" => "Mixed","Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449","Parents" => [{"Differs" => 34,"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Ix" => 0}]} 1558s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 1558s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 1558s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Differs" => 2}],"Type" => "Upstream","Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n"} 1558s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 1558s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 1558s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","Parents" => [{"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 1b9dba384382fd10423f44e82b75e4a495de36dc\nparent 9f40936eece8f6452df026cc64200db82005a166\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n"} 1558s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1558s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 1558s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Differs" => 2,"Ix" => 0}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1558s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1558s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 1558s git-debrebase = Upstream {"Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Parents" => [{"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Differs" => 2,"Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b"} 1558s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1558s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 1558s git-debrebase = Upstream {"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 1558s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1558s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1558s git-debrebase = Changelog {"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","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 1558s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1558s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1558s git-debrebase = Changelog {"Type" => "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","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1558s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1558s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1558s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1558s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"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"} 1558s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 7 proc 15 pm -1 1558s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1558s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1558s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 1558s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1558s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 1558s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 1558s git-debrebase WALK BUILD a4efcc9f58a06f20c5de1258de24211048e99433 Debian (rewriting=0) 1558s git-debrebase WALK REWRITING NOW cl=HASH(0x7f50aafd0e8) procd=HASH(0x7f50aaff8f0) 1558s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1558s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Debian (rewriting=1) 1558s git-debrebase WALK BUILD 5360dd228488e99ffa3d55e906ddc0de1c111c4e Debian (rewriting=1) 1558s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1558s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Debian (rewriting=1) 1558s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1558s git-debrebase WALK BUILD eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 Upstream (rewriting=1) 1558s git-debrebase WALK BUILD ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b Upstream (rewriting=1) 1558s git-debrebase WALK BUILD 9f40936eece8f6452df026cc64200db82005a166 Upstream (rewriting=1) 1558s git-debrebase WALK BUILD 5138bd8205d6eeb162d87a2d085746c0c305261c Upstream (rewriting=1) 1558s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Upstream (rewriting=1) 1558s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1558s git-debrebase WALK BUILD 5668ce44fba4db3f42ac837f0104a9335a819367 Upstream (rewriting=1) 1558s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Upstream (rewriting=1) 1558s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1558s git-debrebase get_differs 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 = 0x4 1558s git-debrebase *** WALK RETURN 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 72e35041bfbd2d841ef8d4b4bf24616be30909ce 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1558s git-debrebase: laundered (head was 9b56b9c2600dc10b9eec97d535d89870476de971) 1558s git-debrebase >= update HEAD 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 1558s git-debrebase >$ 1558s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1558s ' 1558s + peel=peel--unstitched-mixed 1558s + git checkout -b peel--unstitched-mixed 1558s Switched to a new branch 'peel--unstitched-mixed' 1558s + t-clean-on-branch peel--unstitched-mixed 1558s + t-output '## peel--unstitched-mixed' git status -b --porcelain 1558s + printf '%s\n' '## peel--unstitched-mixed' 1558s + shift 1558s + git status -b --porcelain 1558s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1558s + : '---------- unstitched-mixed Vl ----------' 1558s + '[' xVl '!=' x ']' 1558s + : '---- unstitched-mixed ...Vl ----' 1558s + make_check Vl 1558s + case "$1" in 1558s + t-refs-same-start 1558s + unset t_ref_val 1558s + t_ref_names=() 1558s + t-refs-same refs/ffq-prev/heads/work--unstitched-mixed refs/ffq-prev/heads/unstitched-mixed 1558s + local g 1558s + for g in $* 1558s + t-ref-same refs/ffq-prev/heads/work--unstitched-mixed 1558s + local name=refs/ffq-prev/heads/work--unstitched-mixed 1558s + local val 1558s ++ t-git-get-ref refs/ffq-prev/heads/work--unstitched-mixed 1558s ++ local ref=refs/ffq-prev/heads/work--unstitched-mixed 1558s ++ case "$ref" in 1558s ++ perl -ne ' 1558s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--unstitched-mixed\E(?:\^\{\})?$#; 1558s END { print "$x\n" if length $x; } 1558s ' 1558s ++ git show-ref -d refs/ffq-prev/heads/work--unstitched-mixed 1558s + val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1558s + t-ref-same-val refs/ffq-prev/heads/work--unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1558s + local name=refs/ffq-prev/heads/work--unstitched-mixed 1558s + local val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1558s + case "${t_ref_val-unset}" in 1558s + t_ref_val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1558s + t_ref_names+=("$name") 1558s + for g in $* 1558s + t-ref-same refs/ffq-prev/heads/unstitched-mixed 1558s + local name=refs/ffq-prev/heads/unstitched-mixed 1558s + local val 1558s ++ t-git-get-ref refs/ffq-prev/heads/unstitched-mixed 1558s ++ local ref=refs/ffq-prev/heads/unstitched-mixed 1558s ++ case "$ref" in 1558s ++ git show-ref -d refs/ffq-prev/heads/unstitched-mixed 1558s ++ perl -ne ' 1558s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/unstitched-mixed\E(?:\^\{\})?$#; 1558s END { print "$x\n" if length $x; } 1558s ' 1558s + val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1558s + t-ref-same-val refs/ffq-prev/heads/unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1558s + local name=refs/ffq-prev/heads/unstitched-mixed 1558s + local val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1558s + case "${t_ref_val-unset}" in 1558s + t_ref_val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1558s + t_ref_names+=("$name") 1558s + t-refs-notexist refs/debrebase-last/heads/work--unstitched-mixed 1558s + local val 1558s + for g in $* 1558s ++ t-git-get-ref refs/debrebase-last/heads/work--unstitched-mixed 1558s ++ local ref=refs/debrebase-last/heads/work--unstitched-mixed 1558s ++ case "$ref" in 1558s ++ git show-ref -d refs/debrebase-last/heads/work--unstitched-mixed 1558s ++ perl -ne ' 1558s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work--unstitched-mixed\E(?:\^\{\})?$#; 1558s END { print "$x\n" if length $x; } 1558s ' 1558s ++ test 1 = 1 1558s + val= 1558s + '[' x '!=' x ']' 1558s + checkletters=l 1558s + '[' xl '!=' x ']' 1558s + : '---- unstitched-mixed ...l ----' 1558s + make_check l 1558s + case "$1" in 1558s + git diff --quiet HEAD refs/heads/before-work--unstitched-mixed -- :. ':!debian/patches' 1558s + t-gdr-good laundered 1558s + local state=laundered 1558s + local beforetag= 1558s + case $state in 1558s + git diff --quiet -- :. ':!debian/patches' 1558s + LC_MESSAGES=C 1558s + t-git-debrebase status 1558s + local gdr=git-debrebase 1558s + : ' 1558s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1558s + git-debrebase --dgit=dgit -D status 1558s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1558s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1558s git-debrebase = Upstream {"CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45"}],"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","Type" => "Upstream"} 1558s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1558s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1558s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Parents" => [{"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Ix" => 0}],"Type" => "Upstream","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2"} 1558s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1558s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1558s git-debrebase = Upstream {"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","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","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Type" => "Upstream"} 1558s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1558s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1558s git-debrebase = Upstream {"Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","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}]} 1558s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1558s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1558s git-debrebase = Upstream {"Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198"}]} 1558s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1558s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1558s git-debrebase = Upstream {"Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Parents" => [{"Ix" => 0,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Type" => "Upstream"} 1558s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1558s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1558s git-debrebase = Upstream {"Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Type" => "Upstream","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","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"}],"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"} 1558s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1558s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1558s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c"}],"Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1558s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1558s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1558s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0"}],"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"} 1558s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1558s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1558s git-debrebase = Packaging {"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","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Type" => "Packaging"} 1558s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1558s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1558s git-debrebase = Packaging {"Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Type" => "Packaging","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n"} 1558s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1558s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1558s 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","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog"} 1558s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1558s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1558s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog"} 1558s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1558s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1558s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1558s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1558s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel--unstitched-mixed 1558s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1558s ' 1558s + case $state in 1558s + egrep '^ *branch is laundered' ../status.check 1558s branch is laundered 1558s + t-gdr-good-analyse HEAD laundered 1558s + local head=HEAD 1558s + local state=laundered 1558s + local wsfx= 1558s + local etypes bwtip 1558s + case $state in 1558s + etypes=Upstream 1558s ++ t-git-debrebase breakwater 1558s ++ local gdr=git-debrebase 1558s ++ : ' 1558s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1558s ++ git-debrebase --dgit=dgit -D breakwater 1558s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1558s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1558s git-debrebase = 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" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45"}],"CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","Type" => "Upstream"} 1558s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1558s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1558s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Parents" => [{"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Ix" => 0}],"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1558s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1558s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1558s git-debrebase = Upstream {"Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Type" => "Upstream","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Parents" => [{"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Differs" => 2,"Ix" => 0}],"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"} 1558s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1558s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1558s git-debrebase = 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","Type" => "Upstream","Parents" => [{"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Differs" => 2,"Ix" => 0}],"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42"} 1558s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1558s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1558s git-debrebase = 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","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Type" => "Upstream","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Parents" => [{"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2,"Ix" => 0}]} 1558s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1558s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1558s git-debrebase = Upstream {"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"}],"Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n"} 1558s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1558s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1558s git-debrebase = Upstream {"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","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Type" => "Upstream","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Parents" => [{"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Differs" => 2,"Ix" => 0}]} 1558s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1558s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1558s git-debrebase = Packaging {"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","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c"}],"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"} 1558s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1558s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1558s git-debrebase = 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","Type" => "Packaging","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Parents" => [{"Differs" => 32,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Ix" => 0}]} 1558s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1558s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1558s git-debrebase = Packaging {"Parents" => [{"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32,"Ix" => 0}],"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","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"} 1558s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1558s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1558s git-debrebase = Packaging {"Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Type" => "Packaging","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}]} 1558s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1558s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1558s 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","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog"} 1558s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1558s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1558s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"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"} 1558s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1558s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1558s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1558s 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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1558s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1558s ' 1558s + bwtip=Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 1558s + anal=../anal 1558s + t-git-debrebase analyse HEAD 1558s + local gdr=git-debrebase 1558s + : ' 1558s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1558s + git-debrebase --dgit=dgit -D analyse HEAD 1559s git-debrebase *** WALK 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1 *main::STDOUT 1559s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1559s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1559s 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","Parents" => [{"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Ix" => 0,"Differs" => 2}],"Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1559s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1559s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1559s 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" => [{"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Ix" => 0,"Differs" => 2}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2"} 1559s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1559s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1559s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42"}],"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","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec"} 1559s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1559s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1559s 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" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42"} 1559s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1559s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1559s git-debrebase = Upstream {"Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198"}],"Type" => "Upstream"} 1559s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1559s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1559s git-debrebase = 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"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Type" => "Upstream"} 1559s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1559s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1559s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Differs" => 2,"Ix" => 0}],"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","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b"} 1559s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1559s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1559s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c"}],"Type" => "Packaging"} 1559s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1559s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1559s git-debrebase = Packaging {"Parents" => [{"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Ix" => 0,"Differs" => 32}],"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","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Type" => "Packaging"} 1559s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1559s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1559s git-debrebase = Packaging {"Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","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","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0"}],"Type" => "Packaging"} 1559s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1559s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1559s git-debrebase = Packaging {"Type" => "Packaging","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"}],"Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n"} 1559s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1559s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1559s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n"} 1559s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1559s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1559s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog"} 1559s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1559s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1559s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1559s git-debrebase = Anchor {"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","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","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1559s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1559s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1559s ' 1559s ++ git rev-parse HEAD 1559s + expect=7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1559s + exec 1559s + local cid ctype info nparents 1559s + read cid ctype info 1559s + : ===== 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb Upstream ===== 1559s + test 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb = 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1559s + local cetype=Upstream 1559s + '[' xUpstream = xUpstream ']' 1559s + cetype=SAME 1559s ++ git log -n1 --pretty=format:%P 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1559s + local parents=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1559s + expect=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1559s + enparents=1 1559s + : Upstream/SAME 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s ++ printf %s 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1559s ++ wc -w 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ for f in $parents 1559s ++ echo 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1559s ++ wc -w 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 Upstream ===== 1559s + test 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 = 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1559s + local cetype=Upstream 1559s + '[' xUpstream = xUpstream ']' 1559s + cetype=SAME 1559s ++ git log -n1 --pretty=format:%P 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1559s + local parents=439c17a177f0446ce30950b9b8e91f43c101cc23 1559s + expect=439c17a177f0446ce30950b9b8e91f43c101cc23 1559s + enparents=1 1559s + : Upstream/SAME 439c17a177f0446ce30950b9b8e91f43c101cc23 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s ++ printf %s 439c17a177f0446ce30950b9b8e91f43c101cc23 1559s ++ wc -w 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ for f in $parents 1559s ++ echo 439c17a177f0446ce30950b9b8e91f43c101cc23 1559s ++ wc -w 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== 439c17a177f0446ce30950b9b8e91f43c101cc23 Upstream ===== 1559s + test 439c17a177f0446ce30950b9b8e91f43c101cc23 = 439c17a177f0446ce30950b9b8e91f43c101cc23 1559s + local cetype=Upstream 1559s + '[' xUpstream = xUpstream ']' 1559s + cetype=SAME 1559s ++ git log -n1 --pretty=format:%P 439c17a177f0446ce30950b9b8e91f43c101cc23 1559s + local parents=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1559s + expect=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1559s + enparents=1 1559s + : Upstream/SAME 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s ++ printf %s 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1559s ++ wc -w 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ for f in $parents 1559s ++ echo 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1559s ++ wc -w 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 Upstream ===== 1559s + test 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 = 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1559s + local cetype=Upstream 1559s + '[' xUpstream = xUpstream ']' 1559s + cetype=SAME 1559s ++ git log -n1 --pretty=format:%P 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1559s + local parents=f96b8ee9c829c22ea92f8e82e2048017db012c8a 1559s + expect=f96b8ee9c829c22ea92f8e82e2048017db012c8a 1559s + enparents=1 1559s + : Upstream/SAME f96b8ee9c829c22ea92f8e82e2048017db012c8a 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s ++ printf %s f96b8ee9c829c22ea92f8e82e2048017db012c8a 1559s ++ wc -w 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ for f in $parents 1559s ++ echo f96b8ee9c829c22ea92f8e82e2048017db012c8a 1559s ++ wc -w 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== f96b8ee9c829c22ea92f8e82e2048017db012c8a Upstream ===== 1559s + test f96b8ee9c829c22ea92f8e82e2048017db012c8a = f96b8ee9c829c22ea92f8e82e2048017db012c8a 1559s + local cetype=Upstream 1559s + '[' xUpstream = xUpstream ']' 1559s + cetype=SAME 1559s ++ git log -n1 --pretty=format:%P f96b8ee9c829c22ea92f8e82e2048017db012c8a 1559s + local parents=e143304e38e5e9a822f93056dad834788c62e198 1559s + expect=e143304e38e5e9a822f93056dad834788c62e198 1559s + enparents=1 1559s + : Upstream/SAME e143304e38e5e9a822f93056dad834788c62e198 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s ++ printf %s e143304e38e5e9a822f93056dad834788c62e198 1559s ++ wc -w 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ for f in $parents 1559s ++ echo e143304e38e5e9a822f93056dad834788c62e198 1559s ++ wc -w 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== e143304e38e5e9a822f93056dad834788c62e198 Upstream ===== 1559s + test e143304e38e5e9a822f93056dad834788c62e198 = e143304e38e5e9a822f93056dad834788c62e198 1559s + local cetype=Upstream 1559s + '[' xUpstream = xUpstream ']' 1559s + cetype=SAME 1559s ++ git log -n1 --pretty=format:%P e143304e38e5e9a822f93056dad834788c62e198 1559s + local parents=195f145753880dd4e5c1ff65136bb523cb2940c4 1559s + expect=195f145753880dd4e5c1ff65136bb523cb2940c4 1559s + enparents=1 1559s + : Upstream/SAME 195f145753880dd4e5c1ff65136bb523cb2940c4 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s ++ printf %s 195f145753880dd4e5c1ff65136bb523cb2940c4 1559s ++ wc -w 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ for f in $parents 1559s ++ echo 195f145753880dd4e5c1ff65136bb523cb2940c4 1559s ++ wc -w 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== 195f145753880dd4e5c1ff65136bb523cb2940c4 Upstream ===== 1559s + test 195f145753880dd4e5c1ff65136bb523cb2940c4 = 195f145753880dd4e5c1ff65136bb523cb2940c4 1559s + local cetype=Upstream 1559s + '[' xUpstream = xUpstream ']' 1559s + cetype=SAME 1559s ++ git log -n1 --pretty=format:%P 195f145753880dd4e5c1ff65136bb523cb2940c4 1559s + local parents=72e35041bfbd2d841ef8d4b4bf24616be30909ce 1559s + expect=72e35041bfbd2d841ef8d4b4bf24616be30909ce 1559s + enparents=1 1559s + : Upstream/SAME 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s ++ printf %s 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1559s ++ wc -w 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ for f in $parents 1559s ++ echo 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1559s ++ wc -w 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== 72e35041bfbd2d841ef8d4b4bf24616be30909ce Packaging ===== 1559s + test 72e35041bfbd2d841ef8d4b4bf24616be30909ce = 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1559s + local cetype=Upstream 1559s + '[' xPackaging = xUpstream ']' 1559s ++ git log -n1 --pretty=format:%P 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1559s + local parents=7c13e61bd6887af7ef124f8331a541ae7431bc7c 1559s + expect=7c13e61bd6887af7ef124f8331a541ae7431bc7c 1559s + enparents=1 1559s + : Packaging/Upstream 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + '[' xY:72e35041bfbd2d841ef8d4b4bf24616be30909ce '!=' x ']' 1559s + test Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce = Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 1559s + bwtip= 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :. ':!debian' 1559s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :debian/patches 1559s + etypes=Packaging 1559s ++ printf %s 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1559s ++ wc -w 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ wc -w 1559s ++ for f in $parents 1559s ++ echo 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== 7c13e61bd6887af7ef124f8331a541ae7431bc7c Packaging ===== 1559s + test 7c13e61bd6887af7ef124f8331a541ae7431bc7c = 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1559s + local cetype=Packaging 1559s + '[' xPackaging = xPackaging ']' 1559s + cetype=SAME 1559s ++ git log -n1 --pretty=format:%P 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1559s + local parents=63bb83776dc0439e7e1f38011cc3230347a1f3a0 1559s + expect=63bb83776dc0439e7e1f38011cc3230347a1f3a0 1559s + enparents=1 1559s + : Packaging/SAME 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :. ':!debian' 1559s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :debian/patches 1559s + etypes=Packaging 1559s ++ wc -w 1559s ++ printf %s 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ wc -w 1559s ++ for f in $parents 1559s ++ echo 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== 63bb83776dc0439e7e1f38011cc3230347a1f3a0 Packaging ===== 1559s + test 63bb83776dc0439e7e1f38011cc3230347a1f3a0 = 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1559s + local cetype=Packaging 1559s + '[' xPackaging = xPackaging ']' 1559s + cetype=SAME 1559s ++ git log -n1 --pretty=format:%P 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1559s + local parents=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1559s + expect=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1559s + enparents=1 1559s + : Packaging/SAME 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :. ':!debian' 1559s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :debian/patches 1559s + etypes=Packaging 1559s ++ wc -w 1559s ++ printf %s 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ wc -w 1559s ++ for f in $parents 1559s ++ echo 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 Packaging ===== 1559s + test 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 = 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1559s + local cetype=Packaging 1559s + '[' xPackaging = xPackaging ']' 1559s + cetype=SAME 1559s ++ git log -n1 --pretty=format:%P 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1559s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 1559s + expect=809643e5389def220ea36d61f2d3dd504603e95a 1559s + enparents=1 1559s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :. ':!debian' 1559s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :debian/patches 1559s + etypes=Packaging 1559s ++ wc -w 1559s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ wc -w 1559s ++ for f in $parents 1559s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 1559s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 1559s + local cetype=Packaging 1559s + '[' xChangelog = xPackaging ']' 1559s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 1559s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 1559s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 1559s + enparents=1 1559s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 1559s + etypes=Packaging 1559s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 1559s ++ wc -w 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ for f in $parents 1559s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 1559s ++ wc -w 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 1559s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 1559s + local cetype=Packaging 1559s + '[' xChangelog = xPackaging ']' 1559s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 1559s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1559s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1559s + enparents=1 1559s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 1559s + etypes=Packaging 1559s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1559s ++ wc -w 1559s + local cnparents=1 1559s + test 1 = 1 1559s ++ for f in $parents 1559s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1559s ++ wc -w 1559s ++ t-sort -u 1559s ++ LC_COLLATE=C 1559s ++ sort -u 1559s + local cndparents=1 1559s + test 1 = 1 1559s + case "$parents" in 1559s + case "$ctype" in 1559s + read cid ctype info 1559s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1559s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1559s + local cetype=Packaging 1559s + '[' xAnchor = xPackaging ']' 1559s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1559s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1559s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1559s + enparents=1 1559s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1559s + case "$ctype/$cetype" in 1559s + case "$ctype/$etypes" in 1559s + case "$cetype" in 1559s + case "$ctype" in 1559s + break 1559s + checkletters= 1559s + '[' x '!=' x ']' 1559s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1559s + work=work--raw-converted-from-gbp 1559s + : '---------- raw-converted-from-gbp ----------' 1559s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 1559s + git update-ref --stdin 1559s + sed s/raw-converted-from-gbp/work--raw-converted-from-gbp/ 1559s + git checkout work--raw-converted-from-gbp 1559s Switched to branch 'work--raw-converted-from-gbp' 1559s + checkletters=nU 1559s + shift 1559s + before=before-work--raw-converted-from-gbp 1559s + git branch before-work--raw-converted-from-gbp 1559s + local xopts= 1559s + case "$checkletters" in 1559s + case "$checkletters" in 1559s + case "$checkletters" in 1559s + case "$checkletters" in 1559s + t-git-debrebase 1559s + local gdr=git-debrebase 1559s + : ' 1559s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1559s + git-debrebase --dgit=dgit -D 1559s git-debrebase ffq_prev_branchinfo branch current refs/heads/work--raw-converted-from-gbp 1559s git-debrebase ffq check_specs * 1559s git-debrebase *** WALK 178896af44c5b02e05a3442df6c33233b6acb807 0 - 1559s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1559s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1559s git-debrebase = Upstream {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Type" => "Upstream","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1559s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1559s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1559s 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","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0,"Differs" => 2}],"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Type" => "Upstream"} 1559s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1559s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1559s git-debrebase = Upstream {"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","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"} 1559s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1559s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1559s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1559s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "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","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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1559s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw -1 upp 2 proc 3 pm -1 1559s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1559s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1559s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 4 1559s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1559s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1559s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=0) 1559s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=0) 1559s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=0) 1559s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1559s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 = 0 1559s git-debrebase *** WALK RETURN 178896af44c5b02e05a3442df6c33233b6acb807 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1559s git-debrebase: laundered (head was 178896af44c5b02e05a3442df6c33233b6acb807) 1559s git-debrebase >= update refs/ffq-prev/heads/work--raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 0000000000000000000000000000000000000000 1559s git-debrebase >= delete refs/debrebase-last/heads/work--raw-converted-from-gbp 1559s git-debrebase >= update HEAD 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 1559s git-debrebase >$ 1559s Recorded previous head for preservation 1559s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1559s ' 1559s + peel=peel--raw-converted-from-gbp 1559s + git checkout -b peel--raw-converted-from-gbp 1559s Switched to a new branch 'peel--raw-converted-from-gbp' 1559s + t-clean-on-branch peel--raw-converted-from-gbp 1559s + t-output '## peel--raw-converted-from-gbp' git status -b --porcelain 1559s + printf '%s\n' '## peel--raw-converted-from-gbp' 1559s + shift 1559s + git status -b --porcelain 1559s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1559s + : '---------- raw-converted-from-gbp nU ----------' 1559s + '[' xnU '!=' x ']' 1559s + : '---- raw-converted-from-gbp ...nU ----' 1559s + make_check nU 1559s + case "$1" in 1559s + t-refs-same-start 1559s + unset t_ref_val 1559s + t_ref_names=() 1559s + t-refs-same refs/heads/before-work--raw-converted-from-gbp refs/heads/peel--raw-converted-from-gbp 1559s + local g 1559s + for g in $* 1559s + t-ref-same refs/heads/before-work--raw-converted-from-gbp 1559s + local name=refs/heads/before-work--raw-converted-from-gbp 1559s + local val 1559s ++ t-git-get-ref refs/heads/before-work--raw-converted-from-gbp 1559s ++ local ref=refs/heads/before-work--raw-converted-from-gbp 1559s ++ case "$ref" in 1559s ++ git show-ref -d refs/heads/before-work--raw-converted-from-gbp 1559s ++ perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/heads/before-work--raw-converted-from-gbp\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s + val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + t-ref-same-val refs/heads/before-work--raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1559s + local name=refs/heads/before-work--raw-converted-from-gbp 1559s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + case "${t_ref_val-unset}" in 1559s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + t_ref_names+=("$name") 1559s + for g in $* 1559s + t-ref-same refs/heads/peel--raw-converted-from-gbp 1559s + local name=refs/heads/peel--raw-converted-from-gbp 1559s + local val 1559s ++ t-git-get-ref refs/heads/peel--raw-converted-from-gbp 1559s ++ local ref=refs/heads/peel--raw-converted-from-gbp 1559s ++ case "$ref" in 1559s ++ git show-ref -d refs/heads/peel--raw-converted-from-gbp 1559s ++ perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/heads/peel--raw-converted-from-gbp\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s + val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + t-ref-same-val refs/heads/peel--raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1559s + local name=refs/heads/peel--raw-converted-from-gbp 1559s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + case "${t_ref_val-unset}" in 1559s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + t_ref_names+=("$name") 1559s + checkletters=U 1559s + '[' xU '!=' x ']' 1559s + : '---- raw-converted-from-gbp ...U ----' 1559s + make_check U 1559s + case "$1" in 1559s + t-refs-same-start 1559s + unset t_ref_val 1559s + t_ref_names=() 1559s + t-refs-same refs/heads/before-work--raw-converted-from-gbp refs/ffq-prev/heads/work--raw-converted-from-gbp 1559s + local g 1559s + for g in $* 1559s + t-ref-same refs/heads/before-work--raw-converted-from-gbp 1559s + local name=refs/heads/before-work--raw-converted-from-gbp 1559s + local val 1559s ++ t-git-get-ref refs/heads/before-work--raw-converted-from-gbp 1559s ++ local ref=refs/heads/before-work--raw-converted-from-gbp 1559s ++ case "$ref" in 1559s ++ git show-ref -d refs/heads/before-work--raw-converted-from-gbp 1559s ++ perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/heads/before-work--raw-converted-from-gbp\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s + val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + t-ref-same-val refs/heads/before-work--raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1559s + local name=refs/heads/before-work--raw-converted-from-gbp 1559s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + case "${t_ref_val-unset}" in 1559s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + t_ref_names+=("$name") 1559s + for g in $* 1559s + t-ref-same refs/ffq-prev/heads/work--raw-converted-from-gbp 1559s + local name=refs/ffq-prev/heads/work--raw-converted-from-gbp 1559s + local val 1559s ++ t-git-get-ref refs/ffq-prev/heads/work--raw-converted-from-gbp 1559s ++ local ref=refs/ffq-prev/heads/work--raw-converted-from-gbp 1559s ++ case "$ref" in 1559s ++ git show-ref -d refs/ffq-prev/heads/work--raw-converted-from-gbp 1559s ++ perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--raw-converted-from-gbp\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s + val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + t-ref-same-val refs/ffq-prev/heads/work--raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1559s + local name=refs/ffq-prev/heads/work--raw-converted-from-gbp 1559s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + case "${t_ref_val-unset}" in 1559s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1559s + t_ref_names+=("$name") 1559s + make_check u 1559s + case "$1" in 1559s + t-git-get-ref refs/ffq-prev/heads/work--raw-converted-from-gbp 1559s + local ref=refs/ffq-prev/heads/work--raw-converted-from-gbp 1559s + case "$ref" in 1559s + perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--raw-converted-from-gbp\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s + git show-ref -d refs/ffq-prev/heads/work--raw-converted-from-gbp 1559s 178896af44c5b02e05a3442df6c33233b6acb807 1559s + t-refs-notexist refs/debrebase-last/heads/work--raw-converted-from-gbp 1559s + local val 1559s + for g in $* 1559s ++ t-git-get-ref refs/debrebase-last/heads/work--raw-converted-from-gbp 1559s ++ local ref=refs/debrebase-last/heads/work--raw-converted-from-gbp 1559s ++ case "$ref" in 1559s ++ perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work--raw-converted-from-gbp\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s ++ git show-ref -d refs/debrebase-last/heads/work--raw-converted-from-gbp 1559s ++ test 1 = 1 1559s + val= 1559s + '[' x '!=' x ']' 1559s + checkletters= 1559s + '[' x '!=' x ']' 1559s + subcmd stitch Ns Nu Sltf Stf Ns 1559s + local subcmd=stitch 1559s + shift 1559s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1559s + work=work-stitch-stitched-laundered 1559s + : '---------- stitch stitched-laundered ----------' 1559s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 1559s + git update-ref --stdin 1559s + sed s/stitched-laundered/work-stitch-stitched-laundered/ 1559s + git checkout work-stitch-stitched-laundered 1559s Switched to branch 'work-stitch-stitched-laundered' 1559s + checkletters=Ns 1559s + shift 1559s + before=before-work-stitch-stitched-laundered 1559s + git branch before-work-stitch-stitched-laundered 1559s + local xopts= 1559s + case "$checkletters" in 1559s + case "$checkletters" in 1559s + case "$checkletters" in 1559s + t-expect-fail E:. t-git-debrebase stitch 1559s + local mpat=E:. 1559s + shift 1559s + set +o pipefail 1559s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1559s + LC_MESSAGES=C 1559s + LANGUAGE=C 1559s + t-git-debrebase stitch 1559s + local gdr=git-debrebase 1559s + : ' 1559s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1559s + git-debrebase --dgit=dgit -D stitch 1559s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-laundered 1559s 1559s git-debrebase: error: No ffq-prev to stitch. 1559s + local 'ps=255 0' 1559s + set -o pipefail 1559s + case $ps in 1559s + t-grep-mpat E:. /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1559s + local mpat=E:. 1559s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1559s + local grepper=fgrep 1559s + case "$mpat" in 1559s + case "$mpat" in 1559s + grepper=egrep 1559s + mpat=. 1559s + egrep -e . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1559s + local gdr=git-debrebase 1559s + : ' 1559s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1559s + git-debrebase --dgit=dgit -D stitch 1559s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-laundered 1559s git-debrebase: error: No ffq-prev to stitch. 1559s + xopts+=' --noop-ok' 1559s + next_checkletter 1559s + checkletters=s 1559s + case "$checkletters" in 1559s + t-git-debrebase --noop-ok stitch 1559s + local gdr=git-debrebase 1559s + : ' 1559s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1559s + git-debrebase --dgit=dgit -D --noop-ok stitch 1559s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-laundered 1559s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1559s ' 1559s + peel=peel-stitch-stitched-laundered 1559s + git checkout -b peel-stitch-stitched-laundered 1559s Switched to a new branch 'peel-stitch-stitched-laundered' 1559s + t-clean-on-branch peel-stitch-stitched-laundered 1559s + t-output '## peel-stitch-stitched-laundered' git status -b --porcelain 1559s + printf '%s\n' '## peel-stitch-stitched-laundered' 1559s + shift 1559s + git status -b --porcelain 1559s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1559s + : '---------- stitch stitched-laundered s ----------' 1559s + '[' xs '!=' x ']' 1559s + : '---- stitch stitched-laundered ...s ----' 1559s + make_check s 1559s + case "$1" in 1559s + t-refs-notexist refs/ffq-prev/heads/work-stitch-stitched-laundered 1559s + local val 1559s + for g in $* 1559s ++ t-git-get-ref refs/ffq-prev/heads/work-stitch-stitched-laundered 1559s ++ local ref=refs/ffq-prev/heads/work-stitch-stitched-laundered 1559s ++ case "$ref" in 1559s ++ git show-ref -d refs/ffq-prev/heads/work-stitch-stitched-laundered 1559s ++ perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-stitch-stitched-laundered\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s ++ test 1 = 1 1559s + val= 1559s + '[' x '!=' x ']' 1559s + t-refs-same-start 1559s + unset t_ref_val 1559s + t_ref_names=() 1559s + t-refs-same refs/debrebase-last/heads/work-stitch-stitched-laundered refs/debrebase-last/heads/stitched-laundered 1559s + local g 1559s + for g in $* 1559s + t-ref-same refs/debrebase-last/heads/work-stitch-stitched-laundered 1559s + local name=refs/debrebase-last/heads/work-stitch-stitched-laundered 1559s + local val 1559s ++ t-git-get-ref refs/debrebase-last/heads/work-stitch-stitched-laundered 1559s ++ local ref=refs/debrebase-last/heads/work-stitch-stitched-laundered 1559s ++ case "$ref" in 1559s ++ perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-stitch-stitched-laundered\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s ++ git show-ref -d refs/debrebase-last/heads/work-stitch-stitched-laundered 1559s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + t-ref-same-val refs/debrebase-last/heads/work-stitch-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + local name=refs/debrebase-last/heads/work-stitch-stitched-laundered 1559s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + case "${t_ref_val-unset}" in 1559s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + t_ref_names+=("$name") 1559s + for g in $* 1559s + t-ref-same refs/debrebase-last/heads/stitched-laundered 1559s + local name=refs/debrebase-last/heads/stitched-laundered 1559s + local val 1559s ++ t-git-get-ref refs/debrebase-last/heads/stitched-laundered 1559s ++ local ref=refs/debrebase-last/heads/stitched-laundered 1559s ++ case "$ref" in 1559s ++ perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-laundered\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s ++ git show-ref -d refs/debrebase-last/heads/stitched-laundered 1559s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + t-ref-same-val refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + local name=refs/debrebase-last/heads/stitched-laundered 1559s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + case "${t_ref_val-unset}" in 1559s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + t_ref_names+=("$name") 1559s + t-has-ancestor HEAD refs/debrebase-last/heads/work-stitch-stitched-laundered 1559s + local now 1559s ++ git rev-parse HEAD 1559s + now=64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + local ancestor 1559s ++ git rev-parse 'HEAD^{}' 1559s + ancestor=64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + local mbase 1559s ++ t-git-merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s ++ git merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + mbase=64d2fdf7628f675981360f0dce3aaaa227b0676a 1559s + '[' x64d2fdf7628f675981360f0dce3aaaa227b0676a '!=' x64d2fdf7628f675981360f0dce3aaaa227b0676a ']' 1559s + checkletters= 1559s + '[' x '!=' x ']' 1559s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1559s + work=work-stitch-stitched-mixed 1559s + : '---------- stitch stitched-mixed ----------' 1559s + git update-ref --stdin 1559s + sed s/stitched-mixed/work-stitch-stitched-mixed/ 1559s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 1559s + git checkout work-stitch-stitched-mixed 1559s Switched to branch 'work-stitch-stitched-mixed' 1559s + checkletters=Nu 1559s + shift 1559s + before=before-work-stitch-stitched-mixed 1559s + git branch before-work-stitch-stitched-mixed 1559s + local xopts= 1559s + case "$checkletters" in 1559s + case "$checkletters" in 1559s + case "$checkletters" in 1559s + t-expect-fail E:. t-git-debrebase stitch 1559s + local mpat=E:. 1559s + shift 1559s + set +o pipefail 1559s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1559s + LC_MESSAGES=C 1559s + LANGUAGE=C 1559s + t-git-debrebase stitch 1559s + local gdr=git-debrebase 1559s + : ' 1559s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1559s + git-debrebase --dgit=dgit -D stitch 1559s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-mixed 1559s 1559s git-debrebase: error: No ffq-prev to stitch. 1559s + local 'ps=255 0' 1559s + set -o pipefail 1559s + case $ps in 1559s + t-grep-mpat E:. /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1559s + local mpat=E:. 1559s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1559s + local grepper=fgrep 1559s + case "$mpat" in 1559s + case "$mpat" in 1559s + grepper=egrep 1559s + mpat=. 1559s + egrep -e . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1559s + local gdr=git-debrebase 1559s + : ' 1559s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1559s + git-debrebase --dgit=dgit -D stitch 1559s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-mixed 1559s git-debrebase: error: No ffq-prev to stitch. 1559s + xopts+=' --noop-ok' 1559s + next_checkletter 1559s + checkletters=u 1559s + case "$checkletters" in 1559s + t-git-debrebase --noop-ok stitch 1559s + local gdr=git-debrebase 1559s + : ' 1559s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1559s + git-debrebase --dgit=dgit -D --noop-ok stitch 1559s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-mixed 1559s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1559s ' 1559s + peel=peel-stitch-stitched-mixed 1559s + git checkout -b peel-stitch-stitched-mixed 1559s Switched to a new branch 'peel-stitch-stitched-mixed' 1559s + t-clean-on-branch peel-stitch-stitched-mixed 1559s + t-output '## peel-stitch-stitched-mixed' git status -b --porcelain 1559s + printf '%s\n' '## peel-stitch-stitched-mixed' 1559s + shift 1559s + git status -b --porcelain 1559s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1559s + : '---------- stitch stitched-mixed u ----------' 1559s + '[' xu '!=' x ']' 1559s + : '---- stitch stitched-mixed ...u ----' 1559s + make_check u 1559s + case "$1" in 1559s + t-git-get-ref refs/ffq-prev/heads/work-stitch-stitched-mixed 1559s + local ref=refs/ffq-prev/heads/work-stitch-stitched-mixed 1559s + case "$ref" in 1559s + git show-ref -d refs/ffq-prev/heads/work-stitch-stitched-mixed 1559s + perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-stitch-stitched-mixed\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s + test 1 = 1 1559s + t-refs-notexist refs/debrebase-last/heads/work-stitch-stitched-mixed 1559s + local val 1559s + for g in $* 1559s ++ t-git-get-ref refs/debrebase-last/heads/work-stitch-stitched-mixed 1559s ++ local ref=refs/debrebase-last/heads/work-stitch-stitched-mixed 1559s ++ case "$ref" in 1559s ++ git show-ref -d refs/debrebase-last/heads/work-stitch-stitched-mixed 1559s ++ perl -ne ' 1559s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-stitch-stitched-mixed\E(?:\^\{\})?$#; 1559s END { print "$x\n" if length $x; } 1559s ' 1559s ++ test 1 = 1 1559s + val= 1559s + '[' x '!=' x ']' 1559s + checkletters= 1559s + '[' x '!=' x ']' 1559s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1559s + work=work-stitch-unstitched-laundered 1559s + : '---------- stitch unstitched-laundered ----------' 1559s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 1559s + git update-ref --stdin 1559s + sed s/unstitched-laundered/work-stitch-unstitched-laundered/ 1559s + git checkout work-stitch-unstitched-laundered 1559s Switched to branch 'work-stitch-unstitched-laundered' 1559s + checkletters=Sltf 1559s + shift 1559s + before=before-work-stitch-unstitched-laundered 1559s + git branch before-work-stitch-unstitched-laundered 1559s + local xopts= 1559s + case "$checkletters" in 1559s + case "$checkletters" in 1559s + case "$checkletters" in 1559s + case "$checkletters" in 1559s + t-git-debrebase stitch 1559s + local gdr=git-debrebase 1559s + : ' 1559s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1559s + git-debrebase --dgit=dgit -D stitch 1560s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-unstitched-laundered 1560s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1560s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1560s 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","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1560s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1560s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1560s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}],"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 1560s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1560s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1560s 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","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" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}]} 1560s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1560s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1560s git-debrebase = Upstream {"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2,"Ix" => 0}],"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Upstream"} 1560s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1560s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1560s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"} 1560s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1560s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1560s git-debrebase = Upstream {"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","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1560s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1560s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1560s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","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"} 1560s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1560s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1560s git-debrebase = Packaging {"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"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"} 1560s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1560s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1560s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1560s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1560s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1560s git-debrebase = Packaging {"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0,"Differs" => 32}],"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"} 1560s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1560s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1560s git-debrebase = Packaging {"Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}],"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","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"} 1560s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1560s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1560s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","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" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}]} 1560s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1560s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1560s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1560s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1560s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1560s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1560s git-debrebase = Anchor {"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" => [{"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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1560s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1560s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1560s git-debrebase >= delete refs/ffq-prev/heads/work-stitch-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 1560s git-debrebase >= update refs/debrebase-last/heads/work-stitch-unstitched-laundered 16d24eb7d6910efcc861bf07c151b5dcfed7e640 0000000000000000000000000000000000000000 1560s git-debrebase >= update HEAD 16d24eb7d6910efcc861bf07c151b5dcfed7e640 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1560s git-debrebase >$ 1560s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1560s ' 1560s + peel=peel-stitch-unstitched-laundered 1560s + git checkout -b peel-stitch-unstitched-laundered 1560s Switched to a new branch 'peel-stitch-unstitched-laundered' 1560s + t-clean-on-branch peel-stitch-unstitched-laundered 1560s + t-output '## peel-stitch-unstitched-laundered' git status -b --porcelain 1560s + printf '%s\n' '## peel-stitch-unstitched-laundered' 1560s + shift 1560s + git status -b --porcelain 1560s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1560s + : '---------- stitch unstitched-laundered Sltf ----------' 1560s + '[' xSltf '!=' x ']' 1560s + : '---- stitch unstitched-laundered ...Sltf ----' 1560s + make_check Sltf 1560s + case "$1" in 1560s + t-refs-notexist refs/ffq-prev/heads/work-stitch-unstitched-laundered 1560s + local val 1560s + for g in $* 1560s ++ t-git-get-ref refs/ffq-prev/heads/work-stitch-unstitched-laundered 1560s ++ local ref=refs/ffq-prev/heads/work-stitch-unstitched-laundered 1560s ++ case "$ref" in 1560s ++ perl -ne ' 1560s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-stitch-unstitched-laundered\E(?:\^\{\})?$#; 1560s END { print "$x\n" if length $x; } 1560s ' 1560s ++ git show-ref -d refs/ffq-prev/heads/work-stitch-unstitched-laundered 1560s ++ test 1 = 1 1560s + val= 1560s + '[' x '!=' x ']' 1560s + t-refs-same-start refs/debrebase-last/heads/work-stitch-unstitched-laundered 1560s + unset t_ref_val 1560s + t_ref_names=() 1560s + t-ref-head 1560s + local val 1560s ++ git rev-parse HEAD 1560s + val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 1560s + t-ref-same-val HEAD 16d24eb7d6910efcc861bf07c151b5dcfed7e640 1560s + local name=HEAD 1560s + local val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 1560s + case "${t_ref_val-unset}" in 1560s + t_ref_val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 1560s + t_ref_names+=("$name") 1560s + git diff --quiet 'HEAD^1' 1560s + grep unstitched-laundered 1560s + git diff 'HEAD^2' 1560s -Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 1560s - // upstream subcommands refs/heads/unstitched-laundered 1 1560s -+// both! subcommands refs/heads/unstitched-laundered 1 1560s -Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 1560s -+// upstream subcommands refs/heads/unstitched-laundered 1 1560s + git reset --hard 'HEAD^1' 1560s HEAD is now at 5472c89 MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 1560s + checkletters=ltf 1560s + '[' xltf '!=' x ']' 1560s + : '---- stitch unstitched-laundered ...ltf ----' 1560s + make_check ltf 1560s + case "$1" in 1560s + git diff --quiet HEAD refs/heads/before-work-stitch-unstitched-laundered -- :. ':!debian/patches' 1560s + t-gdr-good laundered 1560s + local state=laundered 1560s + local beforetag= 1560s + case $state in 1560s + git diff --quiet -- :. ':!debian/patches' 1560s + LC_MESSAGES=C 1560s + t-git-debrebase status 1560s + local gdr=git-debrebase 1560s + : ' 1560s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1560s + git-debrebase --dgit=dgit -D status 1560s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1560s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1560s git-debrebase = Upstream {"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","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","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b"} 1560s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1560s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1560s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Upstream","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}]} 1560s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1560s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1560s git-debrebase = Upstream {"Type" => "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"} 1560s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1560s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1560s git-debrebase = Upstream {"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","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","Type" => "Upstream","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n"} 1560s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1560s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1560s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2,"Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777"} 1560s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1560s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1560s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2,"Ix" => 0}]} 1560s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1560s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1560s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Type" => "Upstream","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2}],"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"} 1560s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1560s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1560s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","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"} 1560s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1560s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1560s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0}],"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"} 1560s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1560s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1560s git-debrebase = Packaging {"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","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","Type" => "Packaging","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1560s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1560s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1560s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 1560s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1560s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1560s git-debrebase = 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,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}],"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1560s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1560s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1560s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1560s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1560s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1560s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1560s 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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 1560s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-stitch-unstitched-laundered 1560s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1560s ' 1560s + case $state in 1560s + egrep '^ *branch is laundered' ../status.check 1560s branch is laundered 1560s + t-gdr-good-analyse HEAD laundered 1560s + local head=HEAD 1560s + local state=laundered 1560s + local wsfx= 1560s + local etypes bwtip 1560s + case $state in 1560s + etypes=Upstream 1560s ++ t-git-debrebase breakwater 1560s ++ local gdr=git-debrebase 1560s ++ : ' 1560s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1560s ++ git-debrebase --dgit=dgit -D breakwater 1560s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1560s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1560s git-debrebase = Upstream {"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","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"} 1560s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1560s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1560s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}],"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 1560s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1560s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1560s 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","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}]} 1560s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1560s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1560s 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","Parents" => [{"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 1560s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1560s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1560s git-debrebase = Upstream {"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","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 1560s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1560s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1560s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Parents" => [{"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0}],"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","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"} 1560s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1560s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1560s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Parents" => [{"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2}],"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 1560s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1560s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1560s 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","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}],"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Type" => "Packaging"} 1560s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1560s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1560s 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","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Packaging"} 1560s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1560s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1560s 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","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}],"Type" => "Packaging"} 1560s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1560s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1560s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Parents" => [{"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32}],"Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging"} 1560s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1560s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1560s git-debrebase = Changelog {"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}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n","Type" => "Changelog"} 1560s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1560s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1560s 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","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Type" => "Changelog"} 1560s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1560s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1560s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1560s git-debrebase = Anchor {"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","OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1560s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1560s ' 1560s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1560s + anal=../anal 1560s + t-git-debrebase analyse HEAD 1560s + local gdr=git-debrebase 1560s + : ' 1560s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1560s + git-debrebase --dgit=dgit -D analyse HEAD 1560s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 1560s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1560s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1560s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Type" => "Upstream","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"} 1560s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1560s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1560s git-debrebase = Upstream {"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Upstream","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}]} 1560s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1560s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1560s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0}],"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","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","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"} 1560s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1560s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1560s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0}],"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","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 1560s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1560s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1560s 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","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}],"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777"} 1560s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1560s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1560s git-debrebase = Upstream {"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","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","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 1560s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1560s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1560s git-debrebase = Upstream {"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0,"Differs" => 2}],"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"} 1560s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1560s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1560s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 1560s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1560s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1560s git-debrebase = Packaging {"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","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"} 1560s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1560s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1560s 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","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"}],"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89"} 1560s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1560s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1560s git-debrebase = Packaging {"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","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","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}]} 1560s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1560s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1560s 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","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1560s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1560s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1560s git-debrebase = 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 1530000022 +0100\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 1560s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1560s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1560s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1560s git-debrebase = Anchor {"Type" => "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","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1560s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1560s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1560s ' 1560s ++ git rev-parse HEAD 1560s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1560s + exec 1560s + local cid ctype info nparents 1560s + read cid ctype info 1560s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 1560s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1560s + local cetype=Upstream 1560s + '[' xUpstream = xUpstream ']' 1560s + cetype=SAME 1560s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1560s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1560s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1560s + enparents=1 1560s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 1560s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 1560s + local cetype=Upstream 1560s + '[' xUpstream = xUpstream ']' 1560s + cetype=SAME 1560s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 1560s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1560s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1560s + enparents=1 1560s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 1560s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1560s + local cetype=Upstream 1560s + '[' xUpstream = xUpstream ']' 1560s + cetype=SAME 1560s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1560s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 1560s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 1560s + enparents=1 1560s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 1560s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 1560s + local cetype=Upstream 1560s + '[' xUpstream = xUpstream ']' 1560s + cetype=SAME 1560s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 1560s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 1560s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 1560s + enparents=1 1560s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 1560s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 1560s + local cetype=Upstream 1560s + '[' xUpstream = xUpstream ']' 1560s + cetype=SAME 1560s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 1560s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1560s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1560s + enparents=1 1560s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 1560s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1560s + local cetype=Upstream 1560s + '[' xUpstream = xUpstream ']' 1560s + cetype=SAME 1560s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1560s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1560s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1560s + enparents=1 1560s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 1560s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1560s + local cetype=Upstream 1560s + '[' xUpstream = xUpstream ']' 1560s + cetype=SAME 1560s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1560s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 1560s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 1560s + enparents=1 1560s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 1560s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 1560s + local cetype=Upstream 1560s + '[' xPackaging = xUpstream ']' 1560s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 1560s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1560s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1560s + enparents=1 1560s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 1560s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1560s + bwtip= 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 1560s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 1560s + etypes=Packaging 1560s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 1560s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1560s + local cetype=Packaging 1560s + '[' xPackaging = xPackaging ']' 1560s + cetype=SAME 1560s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1560s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1560s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1560s + enparents=1 1560s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 1560s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 1560s + etypes=Packaging 1560s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 1560s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1560s + local cetype=Packaging 1560s + '[' xPackaging = xPackaging ']' 1560s + cetype=SAME 1560s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1560s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 1560s + expect=515e62b8d591fcc68597383b955d898db71abc6c 1560s + enparents=1 1560s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 1560s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 1560s + etypes=Packaging 1560s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 1560s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 1560s + local cetype=Packaging 1560s + '[' xPackaging = xPackaging ']' 1560s + cetype=SAME 1560s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 1560s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 1560s + expect=809643e5389def220ea36d61f2d3dd504603e95a 1560s + enparents=1 1560s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 1560s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 1560s + etypes=Packaging 1560s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 1560s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 1560s + local cetype=Packaging 1560s + '[' xChangelog = xPackaging ']' 1560s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 1560s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 1560s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 1560s + enparents=1 1560s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 1560s + etypes=Packaging 1560s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 1560s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 1560s + local cetype=Packaging 1560s + '[' xChangelog = xPackaging ']' 1560s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 1560s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1560s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1560s + enparents=1 1560s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 1560s + etypes=Packaging 1560s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1560s ++ wc -w 1560s + local cnparents=1 1560s + test 1 = 1 1560s ++ for f in $parents 1560s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1560s ++ wc -w 1560s ++ t-sort -u 1560s ++ LC_COLLATE=C 1560s ++ sort -u 1560s + local cndparents=1 1560s + test 1 = 1 1560s + case "$parents" in 1560s + case "$ctype" in 1560s + read cid ctype info 1560s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1560s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1560s + local cetype=Packaging 1560s + '[' xAnchor = xPackaging ']' 1560s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1560s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1560s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1560s + enparents=1 1560s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1560s + case "$ctype/$cetype" in 1560s + case "$ctype/$etypes" in 1560s + case "$cetype" in 1560s + case "$ctype" in 1560s + break 1560s + checkletters=tf 1560s + '[' xtf '!=' x ']' 1560s + : '---- stitch unstitched-laundered ...tf ----' 1560s + make_check tf 1560s + case "$1" in 1560s + git diff --quiet HEAD refs/heads/before-work-stitch-unstitched-laundered 1560s + checkletters=f 1560s + '[' xf '!=' x ']' 1560s + : '---- stitch unstitched-laundered ...f ----' 1560s + make_check f 1560s + case "$1" in 1560s + t-has-ancestor HEAD refs/heads/before-work-stitch-unstitched-laundered 1560s + local now 1560s ++ git rev-parse HEAD 1560s + now=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1560s + local ancestor 1560s ++ git rev-parse 'HEAD^{}' 1560s + ancestor=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1560s + local mbase 1560s ++ t-git-merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1560s ++ git merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1560s + mbase=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1560s + '[' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f '!=' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f ']' 1560s + checkletters= 1560s + '[' x '!=' x ']' 1560s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1560s + work=work-stitch-unstitched-mixed 1560s + : '---------- stitch unstitched-mixed ----------' 1560s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 1560s + git update-ref --stdin 1561s + sed s/unstitched-mixed/work-stitch-unstitched-mixed/ 1561s + git checkout work-stitch-unstitched-mixed 1561s Switched to branch 'work-stitch-unstitched-mixed' 1561s + checkletters=Stf 1561s + shift 1561s + before=before-work-stitch-unstitched-mixed 1561s + git branch before-work-stitch-unstitched-mixed 1561s + local xopts= 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + t-git-debrebase stitch 1561s + local gdr=git-debrebase 1561s + : ' 1561s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1561s + git-debrebase --dgit=dgit -D stitch 1561s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-unstitched-mixed 1561s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 1561s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 1561s 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","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367"}]} 1561s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 1561s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 1561s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e"}],"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Type" => "Upstream","Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Hdr" => "tree cd4c1550c7da8a4cd81ed765f7a91f2c58843a39\nparent 5360dd228488e99ffa3d55e906ddc0de1c111c4e\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n"} 1561s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 1561s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 1561s git-debrebase = Packaging {"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Type" => "Packaging","Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","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","Parents" => [{"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Differs" => 32,"Ix" => 0}]} 1561s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 1561s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 1561s git-debrebase = AddPatches {"Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84"}],"Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Type" => "AddPatches","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","Hdr" => "tree e6c6c599f5b52414c68918fbedd2a0a4abe68178\nparent 6e00b9cbfb2ac78131496aadb210310e5b4b6a84\nauthor dgit test git user 1530000025 +0100\ncommitter dgit test git user 1530000025 +0100\n","CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386"} 1561s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 1561s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 1561s git-debrebase = Mixed {"Type" => "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","Ix" => 0,"Differs" => 34}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n"} 1561s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 1561s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 1561s 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","Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Parents" => [{"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Ix" => 0,"Differs" => 2}]} 1561s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 1561s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 1561s git-debrebase = Packaging {"Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","Type" => "Packaging","Hdr" => "tree 1b9dba384382fd10423f44e82b75e4a495de36dc\nparent 9f40936eece8f6452df026cc64200db82005a166\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Parents" => [{"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n"} 1561s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1561s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 1561s git-debrebase = Upstream {"Parents" => [{"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Ix" => 0,"Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "9f40936eece8f6452df026cc64200db82005a166"} 1561s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1561s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 1561s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Differs" => 2,"Ix" => 0}],"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Type" => "Upstream","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 1561s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1561s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 1561s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 2}],"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c"} 1561s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1561s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1561s git-debrebase = Changelog {"Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"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","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 1561s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1561s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1561s 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","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1561s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1561s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1561s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1561s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$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","Type" => "Anchor"} 1561s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1561s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1561s git-debrebase >= delete refs/ffq-prev/heads/work-stitch-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1561s git-debrebase >= update refs/debrebase-last/heads/work-stitch-unstitched-mixed bfd2f4c9441a5910931482e80f181720b01f12a3 0000000000000000000000000000000000000000 1561s git-debrebase >= update HEAD bfd2f4c9441a5910931482e80f181720b01f12a3 9b56b9c2600dc10b9eec97d535d89870476de971 1561s git-debrebase >$ 1561s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1561s ' 1561s + peel=peel-stitch-unstitched-mixed 1561s + git checkout -b peel-stitch-unstitched-mixed 1561s Switched to a new branch 'peel-stitch-unstitched-mixed' 1561s + t-clean-on-branch peel-stitch-unstitched-mixed 1561s + t-output '## peel-stitch-unstitched-mixed' git status -b --porcelain 1561s + printf '%s\n' '## peel-stitch-unstitched-mixed' 1561s + shift 1561s + git status -b --porcelain 1561s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1561s + : '---------- stitch unstitched-mixed Stf ----------' 1561s + '[' xStf '!=' x ']' 1561s + : '---- stitch unstitched-mixed ...Stf ----' 1561s + make_check Stf 1561s + case "$1" in 1561s + t-refs-notexist refs/ffq-prev/heads/work-stitch-unstitched-mixed 1561s + local val 1561s + for g in $* 1561s ++ t-git-get-ref refs/ffq-prev/heads/work-stitch-unstitched-mixed 1561s ++ local ref=refs/ffq-prev/heads/work-stitch-unstitched-mixed 1561s ++ case "$ref" in 1561s ++ git show-ref -d refs/ffq-prev/heads/work-stitch-unstitched-mixed 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-stitch-unstitched-mixed\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s ++ test 1 = 1 1561s + val= 1561s + '[' x '!=' x ']' 1561s + t-refs-same-start refs/debrebase-last/heads/work-stitch-unstitched-mixed 1561s + unset t_ref_val 1561s + t_ref_names=() 1561s + t-ref-head 1561s + local val 1561s ++ git rev-parse HEAD 1561s + val=bfd2f4c9441a5910931482e80f181720b01f12a3 1561s + t-ref-same-val HEAD bfd2f4c9441a5910931482e80f181720b01f12a3 1561s + local name=HEAD 1561s + local val=bfd2f4c9441a5910931482e80f181720b01f12a3 1561s + case "${t_ref_val-unset}" in 1561s + t_ref_val=bfd2f4c9441a5910931482e80f181720b01f12a3 1561s + t_ref_names+=("$name") 1561s + git diff --quiet 'HEAD^1' 1561s + git diff 'HEAD^2' 1561s + grep unstitched-mixed 1561s +Subject: MIXED add both() (subcommands refs/heads/unstitched-mixed 1) 1561s + // upstream subcommands refs/heads/unstitched-mixed 1 1561s ++// both! subcommands refs/heads/unstitched-mixed 1 1561s +Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1) 1561s ++// upstream subcommands refs/heads/unstitched-mixed 1 1561s +// debian subcommands refs/heads/unstitched-mixed 1 1561s +// both! subcommands refs/heads/unstitched-mixed 1 1561s +// debian subcommands refs/heads/unstitched-mixed 2 1561s +// both! subcommands refs/heads/unstitched-mixed 2 1561s +// upstream subcommands refs/heads/unstitched-mixed 1 1561s +// both! subcommands refs/heads/unstitched-mixed 1 1561s +// upstream subcommands refs/heads/unstitched-mixed 2 1561s +// both! subcommands refs/heads/unstitched-mixed 2 1561s + git reset --hard 'HEAD^1' 1561s HEAD is now at 9b56b9c MIXED add both() (subcommands refs/heads/unstitched-mixed 2) 1561s + checkletters=tf 1561s + '[' xtf '!=' x ']' 1561s + : '---- stitch unstitched-mixed ...tf ----' 1561s + make_check tf 1561s + case "$1" in 1561s + git diff --quiet HEAD refs/heads/before-work-stitch-unstitched-mixed 1561s + checkletters=f 1561s + '[' xf '!=' x ']' 1561s + : '---- stitch unstitched-mixed ...f ----' 1561s + make_check f 1561s + case "$1" in 1561s + t-has-ancestor HEAD refs/heads/before-work-stitch-unstitched-mixed 1561s + local now 1561s ++ git rev-parse HEAD 1561s + now=9b56b9c2600dc10b9eec97d535d89870476de971 1561s + local ancestor 1561s ++ git rev-parse 'HEAD^{}' 1561s + ancestor=9b56b9c2600dc10b9eec97d535d89870476de971 1561s + local mbase 1561s ++ t-git-merge-base 9b56b9c2600dc10b9eec97d535d89870476de971 9b56b9c2600dc10b9eec97d535d89870476de971 1561s ++ git merge-base 9b56b9c2600dc10b9eec97d535d89870476de971 9b56b9c2600dc10b9eec97d535d89870476de971 1561s + mbase=9b56b9c2600dc10b9eec97d535d89870476de971 1561s + '[' x9b56b9c2600dc10b9eec97d535d89870476de971 '!=' x9b56b9c2600dc10b9eec97d535d89870476de971 ']' 1561s + checkletters= 1561s + '[' x '!=' x ']' 1561s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1561s + work=work-stitch-raw-converted-from-gbp 1561s + : '---------- stitch raw-converted-from-gbp ----------' 1561s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 1561s + git update-ref --stdin 1561s + sed s/raw-converted-from-gbp/work-stitch-raw-converted-from-gbp/ 1561s + git checkout work-stitch-raw-converted-from-gbp 1561s Switched to branch 'work-stitch-raw-converted-from-gbp' 1561s + checkletters=Ns 1561s + shift 1561s + before=before-work-stitch-raw-converted-from-gbp 1561s + git branch before-work-stitch-raw-converted-from-gbp 1561s + local xopts= 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + t-expect-fail E:. t-git-debrebase stitch 1561s + local mpat=E:. 1561s + shift 1561s + set +o pipefail 1561s + LC_MESSAGES=C 1561s + LANGUAGE=C 1561s + t-git-debrebase stitch 1561s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1561s + local gdr=git-debrebase 1561s + : ' 1561s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1561s + git-debrebase --dgit=dgit -D stitch 1561s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-raw-converted-from-gbp 1561s 1561s git-debrebase: error: No ffq-prev to stitch. 1561s + local 'ps=255 0' 1561s + set -o pipefail 1561s + case $ps in 1561s + t-grep-mpat E:. /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1561s + local mpat=E:. 1561s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1561s + local grepper=fgrep 1561s + case "$mpat" in 1561s + case "$mpat" in 1561s + grepper=egrep 1561s + mpat=. 1561s + egrep -e . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1561s + local gdr=git-debrebase 1561s + : ' 1561s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1561s + git-debrebase --dgit=dgit -D stitch 1561s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-raw-converted-from-gbp 1561s git-debrebase: error: No ffq-prev to stitch. 1561s + xopts+=' --noop-ok' 1561s + next_checkletter 1561s + checkletters=s 1561s + case "$checkletters" in 1561s + t-git-debrebase --noop-ok stitch 1561s + local gdr=git-debrebase 1561s + : ' 1561s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1561s + git-debrebase --dgit=dgit -D --noop-ok stitch 1561s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-raw-converted-from-gbp 1561s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1561s ' 1561s + peel=peel-stitch-raw-converted-from-gbp 1561s + git checkout -b peel-stitch-raw-converted-from-gbp 1561s Switched to a new branch 'peel-stitch-raw-converted-from-gbp' 1561s + t-clean-on-branch peel-stitch-raw-converted-from-gbp 1561s + t-output '## peel-stitch-raw-converted-from-gbp' git status -b --porcelain 1561s + printf '%s\n' '## peel-stitch-raw-converted-from-gbp' 1561s + shift 1561s + git status -b --porcelain 1561s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1561s + : '---------- stitch raw-converted-from-gbp s ----------' 1561s + '[' xs '!=' x ']' 1561s + : '---- stitch raw-converted-from-gbp ...s ----' 1561s + make_check s 1561s + case "$1" in 1561s + t-refs-notexist refs/ffq-prev/heads/work-stitch-raw-converted-from-gbp 1561s + local val 1561s + for g in $* 1561s ++ t-git-get-ref refs/ffq-prev/heads/work-stitch-raw-converted-from-gbp 1561s ++ local ref=refs/ffq-prev/heads/work-stitch-raw-converted-from-gbp 1561s ++ case "$ref" in 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-stitch-raw-converted-from-gbp\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s ++ git show-ref -d refs/ffq-prev/heads/work-stitch-raw-converted-from-gbp 1561s ++ test 1 = 1 1561s + val= 1561s + '[' x '!=' x ']' 1561s + t-refs-same-start 1561s + unset t_ref_val 1561s + t_ref_names=() 1561s + t-refs-same refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp refs/debrebase-last/heads/raw-converted-from-gbp 1561s + local g 1561s + for g in $* 1561s + t-ref-same refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 1561s + local name=refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 1561s + local val 1561s ++ t-git-get-ref refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 1561s ++ local ref=refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 1561s ++ case "$ref" in 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-stitch-raw-converted-from-gbp\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s ++ git show-ref -d refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 1561s ++ test 1 = 1 1561s + val= 1561s + t-ref-same-val refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 1561s + local name=refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 1561s + local val= 1561s + case "${t_ref_val-unset}" in 1561s + t_ref_val= 1561s + t_ref_names+=("$name") 1561s + for g in $* 1561s + t-ref-same refs/debrebase-last/heads/raw-converted-from-gbp 1561s + local name=refs/debrebase-last/heads/raw-converted-from-gbp 1561s + local val 1561s ++ t-git-get-ref refs/debrebase-last/heads/raw-converted-from-gbp 1561s ++ local ref=refs/debrebase-last/heads/raw-converted-from-gbp 1561s ++ case "$ref" in 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/raw-converted-from-gbp\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s ++ git show-ref -d refs/debrebase-last/heads/raw-converted-from-gbp 1561s ++ test 1 = 1 1561s + val= 1561s + t-ref-same-val refs/debrebase-last/heads/raw-converted-from-gbp 1561s + local name=refs/debrebase-last/heads/raw-converted-from-gbp 1561s + local val= 1561s + case "${t_ref_val-unset}" in 1561s + t_ref_val= 1561s + t_ref_names+=("$name") 1561s + t-has-ancestor HEAD refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 1561s + local now 1561s ++ git rev-parse HEAD 1561s + now=178896af44c5b02e05a3442df6c33233b6acb807 1561s + local ancestor 1561s ++ git rev-parse 'HEAD^{}' 1561s + ancestor=178896af44c5b02e05a3442df6c33233b6acb807 1561s + local mbase 1561s ++ t-git-merge-base 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 1561s ++ git merge-base 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 1561s + mbase=178896af44c5b02e05a3442df6c33233b6acb807 1561s + '[' x178896af44c5b02e05a3442df6c33233b6acb807 '!=' x178896af44c5b02e05a3442df6c33233b6acb807 ']' 1561s + checkletters= 1561s + '[' x '!=' x ']' 1561s + subcmd prepush ns nu Sltf Stf ns 1561s + local subcmd=prepush 1561s + shift 1561s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1561s + work=work-prepush-stitched-laundered 1561s + : '---------- prepush stitched-laundered ----------' 1561s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 1561s + git update-ref --stdin 1561s + sed s/stitched-laundered/work-prepush-stitched-laundered/ 1561s + git checkout work-prepush-stitched-laundered 1561s Switched to branch 'work-prepush-stitched-laundered' 1561s + checkletters=ns 1561s + shift 1561s + before=before-work-prepush-stitched-laundered 1561s + git branch before-work-prepush-stitched-laundered 1561s + local xopts= 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + t-git-debrebase prepush 1561s + local gdr=git-debrebase 1561s + : ' 1561s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1561s + git-debrebase --dgit=dgit -D prepush 1561s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-prepush-stitched-laundered 1561s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1561s ' 1561s + peel=peel-prepush-stitched-laundered 1561s + git checkout -b peel-prepush-stitched-laundered 1561s Switched to a new branch 'peel-prepush-stitched-laundered' 1561s + t-clean-on-branch peel-prepush-stitched-laundered 1561s + t-output '## peel-prepush-stitched-laundered' git status -b --porcelain 1561s + printf '%s\n' '## peel-prepush-stitched-laundered' 1561s + shift 1561s + git status -b --porcelain 1561s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1561s + : '---------- prepush stitched-laundered ns ----------' 1561s + '[' xns '!=' x ']' 1561s + : '---- prepush stitched-laundered ...ns ----' 1561s + make_check ns 1561s + case "$1" in 1561s + t-refs-same-start 1561s + unset t_ref_val 1561s + t_ref_names=() 1561s + t-refs-same refs/heads/before-work-prepush-stitched-laundered refs/heads/peel-prepush-stitched-laundered 1561s + local g 1561s + for g in $* 1561s + t-ref-same refs/heads/before-work-prepush-stitched-laundered 1561s + local name=refs/heads/before-work-prepush-stitched-laundered 1561s + local val 1561s ++ t-git-get-ref refs/heads/before-work-prepush-stitched-laundered 1561s ++ local ref=refs/heads/before-work-prepush-stitched-laundered 1561s ++ case "$ref" in 1561s ++ git show-ref -d refs/heads/before-work-prepush-stitched-laundered 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-prepush-stitched-laundered\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + t-ref-same-val refs/heads/before-work-prepush-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + local name=refs/heads/before-work-prepush-stitched-laundered 1561s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + case "${t_ref_val-unset}" in 1561s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + t_ref_names+=("$name") 1561s + for g in $* 1561s + t-ref-same refs/heads/peel-prepush-stitched-laundered 1561s + local name=refs/heads/peel-prepush-stitched-laundered 1561s + local val 1561s ++ t-git-get-ref refs/heads/peel-prepush-stitched-laundered 1561s ++ local ref=refs/heads/peel-prepush-stitched-laundered 1561s ++ case "$ref" in 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/heads/peel-prepush-stitched-laundered\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s ++ git show-ref -d refs/heads/peel-prepush-stitched-laundered 1561s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + t-ref-same-val refs/heads/peel-prepush-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + local name=refs/heads/peel-prepush-stitched-laundered 1561s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + case "${t_ref_val-unset}" in 1561s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + t_ref_names+=("$name") 1561s + checkletters=s 1561s + '[' xs '!=' x ']' 1561s + : '---- prepush stitched-laundered ...s ----' 1561s + make_check s 1561s + case "$1" in 1561s + t-refs-notexist refs/ffq-prev/heads/work-prepush-stitched-laundered 1561s + local val 1561s + for g in $* 1561s ++ t-git-get-ref refs/ffq-prev/heads/work-prepush-stitched-laundered 1561s ++ local ref=refs/ffq-prev/heads/work-prepush-stitched-laundered 1561s ++ case "$ref" in 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-prepush-stitched-laundered\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s ++ git show-ref -d refs/ffq-prev/heads/work-prepush-stitched-laundered 1561s ++ test 1 = 1 1561s + val= 1561s + '[' x '!=' x ']' 1561s + t-refs-same-start 1561s + unset t_ref_val 1561s + t_ref_names=() 1561s + t-refs-same refs/debrebase-last/heads/work-prepush-stitched-laundered refs/debrebase-last/heads/stitched-laundered 1561s + local g 1561s + for g in $* 1561s + t-ref-same refs/debrebase-last/heads/work-prepush-stitched-laundered 1561s + local name=refs/debrebase-last/heads/work-prepush-stitched-laundered 1561s + local val 1561s ++ t-git-get-ref refs/debrebase-last/heads/work-prepush-stitched-laundered 1561s ++ local ref=refs/debrebase-last/heads/work-prepush-stitched-laundered 1561s ++ case "$ref" in 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-prepush-stitched-laundered\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s ++ git show-ref -d refs/debrebase-last/heads/work-prepush-stitched-laundered 1561s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + t-ref-same-val refs/debrebase-last/heads/work-prepush-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + local name=refs/debrebase-last/heads/work-prepush-stitched-laundered 1561s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + case "${t_ref_val-unset}" in 1561s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + t_ref_names+=("$name") 1561s + for g in $* 1561s + t-ref-same refs/debrebase-last/heads/stitched-laundered 1561s + local name=refs/debrebase-last/heads/stitched-laundered 1561s + local val 1561s ++ t-git-get-ref refs/debrebase-last/heads/stitched-laundered 1561s ++ local ref=refs/debrebase-last/heads/stitched-laundered 1561s ++ case "$ref" in 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-laundered\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s ++ git show-ref -d refs/debrebase-last/heads/stitched-laundered 1561s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + t-ref-same-val refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + local name=refs/debrebase-last/heads/stitched-laundered 1561s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + case "${t_ref_val-unset}" in 1561s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + t_ref_names+=("$name") 1561s + t-has-ancestor HEAD refs/debrebase-last/heads/work-prepush-stitched-laundered 1561s + local now 1561s ++ git rev-parse HEAD 1561s + now=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + local ancestor 1561s ++ git rev-parse 'HEAD^{}' 1561s + ancestor=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + local mbase 1561s ++ t-git-merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s ++ git merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + mbase=64d2fdf7628f675981360f0dce3aaaa227b0676a 1561s + '[' x64d2fdf7628f675981360f0dce3aaaa227b0676a '!=' x64d2fdf7628f675981360f0dce3aaaa227b0676a ']' 1561s + checkletters= 1561s + '[' x '!=' x ']' 1561s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1561s + work=work-prepush-stitched-mixed 1561s + : '---------- prepush stitched-mixed ----------' 1561s + git update-ref --stdin 1561s + sed s/stitched-mixed/work-prepush-stitched-mixed/ 1561s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 1561s + git checkout work-prepush-stitched-mixed 1561s Switched to branch 'work-prepush-stitched-mixed' 1561s + checkletters=nu 1561s + shift 1561s + before=before-work-prepush-stitched-mixed 1561s + git branch before-work-prepush-stitched-mixed 1561s + local xopts= 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + t-git-debrebase prepush 1561s + local gdr=git-debrebase 1561s + : ' 1561s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1561s + git-debrebase --dgit=dgit -D prepush 1561s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-prepush-stitched-mixed 1561s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1561s ' 1561s + peel=peel-prepush-stitched-mixed 1561s + git checkout -b peel-prepush-stitched-mixed 1561s Switched to a new branch 'peel-prepush-stitched-mixed' 1561s + t-clean-on-branch peel-prepush-stitched-mixed 1561s + t-output '## peel-prepush-stitched-mixed' git status -b --porcelain 1561s + printf '%s\n' '## peel-prepush-stitched-mixed' 1561s + shift 1561s + git status -b --porcelain 1561s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1561s + : '---------- prepush stitched-mixed nu ----------' 1561s + '[' xnu '!=' x ']' 1561s + : '---- prepush stitched-mixed ...nu ----' 1561s + make_check nu 1561s + case "$1" in 1561s + t-refs-same-start 1561s + unset t_ref_val 1561s + t_ref_names=() 1561s + t-refs-same refs/heads/before-work-prepush-stitched-mixed refs/heads/peel-prepush-stitched-mixed 1561s + local g 1561s + for g in $* 1561s + t-ref-same refs/heads/before-work-prepush-stitched-mixed 1561s + local name=refs/heads/before-work-prepush-stitched-mixed 1561s + local val 1561s ++ t-git-get-ref refs/heads/before-work-prepush-stitched-mixed 1561s ++ local ref=refs/heads/before-work-prepush-stitched-mixed 1561s ++ case "$ref" in 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-prepush-stitched-mixed\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s ++ git show-ref -d refs/heads/before-work-prepush-stitched-mixed 1561s + val=5e0bf3cea3c715230b96aca41156852390014b98 1561s + t-ref-same-val refs/heads/before-work-prepush-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 1561s + local name=refs/heads/before-work-prepush-stitched-mixed 1561s + local val=5e0bf3cea3c715230b96aca41156852390014b98 1561s + case "${t_ref_val-unset}" in 1561s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 1561s + t_ref_names+=("$name") 1561s + for g in $* 1561s + t-ref-same refs/heads/peel-prepush-stitched-mixed 1561s + local name=refs/heads/peel-prepush-stitched-mixed 1561s + local val 1561s ++ t-git-get-ref refs/heads/peel-prepush-stitched-mixed 1561s ++ local ref=refs/heads/peel-prepush-stitched-mixed 1561s ++ case "$ref" in 1561s ++ git show-ref -d refs/heads/peel-prepush-stitched-mixed 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/heads/peel-prepush-stitched-mixed\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s + val=5e0bf3cea3c715230b96aca41156852390014b98 1561s + t-ref-same-val refs/heads/peel-prepush-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 1561s + local name=refs/heads/peel-prepush-stitched-mixed 1561s + local val=5e0bf3cea3c715230b96aca41156852390014b98 1561s + case "${t_ref_val-unset}" in 1561s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 1561s + t_ref_names+=("$name") 1561s + checkletters=u 1561s + '[' xu '!=' x ']' 1561s + : '---- prepush stitched-mixed ...u ----' 1561s + make_check u 1561s + case "$1" in 1561s + t-git-get-ref refs/ffq-prev/heads/work-prepush-stitched-mixed 1561s + local ref=refs/ffq-prev/heads/work-prepush-stitched-mixed 1561s + case "$ref" in 1561s + perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-prepush-stitched-mixed\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s + git show-ref -d refs/ffq-prev/heads/work-prepush-stitched-mixed 1561s + test 1 = 1 1561s + t-refs-notexist refs/debrebase-last/heads/work-prepush-stitched-mixed 1561s + local val 1561s + for g in $* 1561s ++ t-git-get-ref refs/debrebase-last/heads/work-prepush-stitched-mixed 1561s ++ local ref=refs/debrebase-last/heads/work-prepush-stitched-mixed 1561s ++ case "$ref" in 1561s ++ perl -ne ' 1561s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-prepush-stitched-mixed\E(?:\^\{\})?$#; 1561s END { print "$x\n" if length $x; } 1561s ' 1561s ++ git show-ref -d refs/debrebase-last/heads/work-prepush-stitched-mixed 1561s ++ test 1 = 1 1561s + val= 1561s + '[' x '!=' x ']' 1561s + checkletters= 1561s + '[' x '!=' x ']' 1561s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1561s + work=work-prepush-unstitched-laundered 1561s + : '---------- prepush unstitched-laundered ----------' 1561s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 1561s + git update-ref --stdin 1561s + sed s/unstitched-laundered/work-prepush-unstitched-laundered/ 1561s + git checkout work-prepush-unstitched-laundered 1561s Switched to branch 'work-prepush-unstitched-laundered' 1561s + checkletters=Sltf 1561s + shift 1561s + before=before-work-prepush-unstitched-laundered 1561s + git branch before-work-prepush-unstitched-laundered 1561s + local xopts= 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + case "$checkletters" in 1561s + t-git-debrebase prepush 1561s + local gdr=git-debrebase 1561s + : ' 1561s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1561s + git-debrebase --dgit=dgit -D prepush 1562s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-prepush-unstitched-laundered 1562s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1562s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1562s 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","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","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b"} 1562s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1562s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1562s git-debrebase = Upstream {"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" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}],"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 1562s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1562s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1562s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Parents" => [{"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2}],"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"} 1562s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1562s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1562s git-debrebase = Upstream {"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Type" => "Upstream","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","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n"} 1562s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1562s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1562s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","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}],"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777"} 1562s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1562s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1562s 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"} 1562s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1562s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1562s git-debrebase = Upstream {"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"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"} 1562s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1562s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1562s git-debrebase = Packaging {"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","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}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1562s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1562s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1562s git-debrebase = Packaging {"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","Parents" => [{"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 1562s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1562s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1562s 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","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}],"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging"} 1562s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1562s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1562s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f"} 1562s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1562s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1562s git-debrebase = Changelog {"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","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n"} 1562s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1562s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1562s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1562s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1562s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1562s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1562s 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" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1562s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1562s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1562s git-debrebase >= delete refs/ffq-prev/heads/work-prepush-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 1562s git-debrebase >= update refs/debrebase-last/heads/work-prepush-unstitched-laundered 16d24eb7d6910efcc861bf07c151b5dcfed7e640 0000000000000000000000000000000000000000 1562s git-debrebase >= update HEAD 16d24eb7d6910efcc861bf07c151b5dcfed7e640 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1562s git-debrebase >$ 1562s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1562s ' 1562s + peel=peel-prepush-unstitched-laundered 1562s + git checkout -b peel-prepush-unstitched-laundered 1562s Switched to a new branch 'peel-prepush-unstitched-laundered' 1562s + t-clean-on-branch peel-prepush-unstitched-laundered 1562s + t-output '## peel-prepush-unstitched-laundered' git status -b --porcelain 1562s + printf '%s\n' '## peel-prepush-unstitched-laundered' 1562s + shift 1562s + git status -b --porcelain 1562s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1562s + : '---------- prepush unstitched-laundered Sltf ----------' 1562s + '[' xSltf '!=' x ']' 1562s + : '---- prepush unstitched-laundered ...Sltf ----' 1562s + make_check Sltf 1562s + case "$1" in 1562s + t-refs-notexist refs/ffq-prev/heads/work-prepush-unstitched-laundered 1562s + local val 1562s + for g in $* 1562s ++ t-git-get-ref refs/ffq-prev/heads/work-prepush-unstitched-laundered 1562s ++ local ref=refs/ffq-prev/heads/work-prepush-unstitched-laundered 1562s ++ case "$ref" in 1562s ++ git show-ref -d refs/ffq-prev/heads/work-prepush-unstitched-laundered 1562s ++ perl -ne ' 1562s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-prepush-unstitched-laundered\E(?:\^\{\})?$#; 1562s END { print "$x\n" if length $x; } 1562s ' 1562s ++ test 1 = 1 1562s + val= 1562s + '[' x '!=' x ']' 1562s + t-refs-same-start refs/debrebase-last/heads/work-prepush-unstitched-laundered 1562s + unset t_ref_val 1562s + t_ref_names=() 1562s + t-ref-head 1562s + local val 1562s ++ git rev-parse HEAD 1562s + val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 1562s + t-ref-same-val HEAD 16d24eb7d6910efcc861bf07c151b5dcfed7e640 1562s + local name=HEAD 1562s + local val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 1562s + case "${t_ref_val-unset}" in 1562s + t_ref_val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 1562s + t_ref_names+=("$name") 1562s + git diff --quiet 'HEAD^1' 1562s + git diff 'HEAD^2' 1562s + grep unstitched-laundered 1562s -Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 1562s - // upstream subcommands refs/heads/unstitched-laundered 1 1562s -+// both! subcommands refs/heads/unstitched-laundered 1 1562s -Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 1562s -+// upstream subcommands refs/heads/unstitched-laundered 1 1562s + git reset --hard 'HEAD^1' 1562s HEAD is now at 5472c89 MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 1562s + checkletters=ltf 1562s + '[' xltf '!=' x ']' 1562s + : '---- prepush unstitched-laundered ...ltf ----' 1562s + make_check ltf 1562s + case "$1" in 1562s + git diff --quiet HEAD refs/heads/before-work-prepush-unstitched-laundered -- :. ':!debian/patches' 1562s + t-gdr-good laundered 1562s + local state=laundered 1562s + local beforetag= 1562s + case $state in 1562s + git diff --quiet -- :. ':!debian/patches' 1562s + LC_MESSAGES=C 1562s + t-git-debrebase status 1562s + local gdr=git-debrebase 1562s + : ' 1562s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1562s + git-debrebase --dgit=dgit -D status 1562s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1562s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1562s git-debrebase = Upstream {"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Type" => "Upstream","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1562s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1562s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1562s git-debrebase = Upstream {"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Type" => "Upstream","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2,"Ix" => 0}],"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"} 1562s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1562s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1562s git-debrebase = Upstream {"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","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Type" => "Upstream"} 1562s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1562s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1562s git-debrebase = Upstream {"Type" => "Upstream","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","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2,"Ix" => 0}]} 1562s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1562s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1562s git-debrebase = Upstream {"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}],"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"} 1562s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1562s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1562s git-debrebase = Upstream {"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Type" => "Upstream","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 1562s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1562s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1562s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","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"} 1562s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1562s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1562s git-debrebase = Packaging {"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","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Type" => "Packaging","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"} 1562s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1562s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1562s git-debrebase = Packaging {"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Type" => "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"} 1562s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1562s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1562s git-debrebase = 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","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}],"Type" => "Packaging","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"} 1562s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1562s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1562s git-debrebase = 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","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Type" => "Packaging","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"} 1562s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1562s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1562s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","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","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16,"Ix" => 0}]} 1562s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1562s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1562s 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","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1562s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1562s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1562s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1562s 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"},{"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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1562s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-prepush-unstitched-laundered 1562s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1562s ' 1562s + case $state in 1562s + egrep '^ *branch is laundered' ../status.check 1562s branch is laundered 1562s + t-gdr-good-analyse HEAD laundered 1562s + local head=HEAD 1562s + local state=laundered 1562s + local wsfx= 1562s + local etypes bwtip 1562s + case $state in 1562s + etypes=Upstream 1562s ++ t-git-debrebase breakwater 1562s ++ local gdr=git-debrebase 1562s ++ : ' 1562s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1562s ++ git-debrebase --dgit=dgit -D breakwater 1562s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1562s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1562s git-debrebase = Upstream {"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Type" => "Upstream","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","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1562s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1562s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1562s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}],"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","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "Upstream"} 1562s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1562s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1562s git-debrebase = Upstream {"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,"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1562s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1562s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1562s 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","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"Type" => "Upstream","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 1562s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1562s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1562s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}],"Type" => "Upstream","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"} 1562s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1562s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1562s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Type" => "Upstream"} 1562s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1562s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1562s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","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"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1562s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1562s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1562s git-debrebase = Packaging {"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","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}]} 1562s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1562s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1562s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 1562s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1562s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1562s git-debrebase = Packaging {"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","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}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"} 1562s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1562s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1562s git-debrebase = Packaging {"Type" => "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","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 1562s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1562s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1562s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Type" => "Changelog","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","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1562s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1562s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1562s 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" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 1562s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1562s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1562s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1562s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"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","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1562s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1562s ' 1562s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1562s + anal=../anal 1562s + t-git-debrebase analyse HEAD 1562s + local gdr=git-debrebase 1562s + : ' 1562s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1562s + git-debrebase --dgit=dgit -D analyse HEAD 1562s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 1562s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1562s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1562s git-debrebase = Upstream {"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2}],"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","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Type" => "Upstream"} 1562s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1562s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1562s git-debrebase = Upstream {"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "Upstream","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}],"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"} 1562s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1562s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1562s git-debrebase = Upstream {"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Type" => "Upstream","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0,"Differs" => 2}],"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"} 1562s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1562s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1562s git-debrebase = Upstream {"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","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","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Parents" => [{"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0}]} 1562s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1562s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1562s git-debrebase = Upstream {"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}],"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","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Type" => "Upstream"} 1562s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1562s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1562s git-debrebase = Upstream {"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","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","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Type" => "Upstream"} 1562s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1562s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1562s 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" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"} 1562s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1562s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1562s git-debrebase = Packaging {"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Parents" => [{"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0}],"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","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Type" => "Packaging"} 1562s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1562s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1562s git-debrebase = 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","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Type" => "Packaging"} 1562s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1562s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1562s git-debrebase = Packaging {"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","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","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging"} 1562s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1562s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1562s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","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","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging"} 1562s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1562s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1562s git-debrebase = 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","Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 1562s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1562s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1562s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"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","Type" => "Changelog"} 1562s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1562s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1562s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1562s 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" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1562s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1562s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1562s ' 1562s ++ git rev-parse HEAD 1562s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1562s + exec 1562s + local cid ctype info nparents 1562s + read cid ctype info 1562s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 1562s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1562s + local cetype=Upstream 1562s + '[' xUpstream = xUpstream ']' 1562s + cetype=SAME 1562s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1562s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1562s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1562s + enparents=1 1562s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s ++ wc -w 1562s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 1562s + local cnparents=1 1562s + test 1 = 1 1562s ++ wc -w 1562s ++ for f in $parents 1562s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 1562s ++ t-sort -u 1562s ++ LC_COLLATE=C 1562s ++ sort -u 1562s + local cndparents=1 1562s + test 1 = 1 1562s + case "$parents" in 1562s + case "$ctype" in 1562s + read cid ctype info 1562s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 1562s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 1562s + local cetype=Upstream 1562s + '[' xUpstream = xUpstream ']' 1562s + cetype=SAME 1562s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 1562s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1562s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1562s + enparents=1 1562s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s ++ wc -w 1562s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1562s + local cnparents=1 1562s + test 1 = 1 1562s ++ for f in $parents 1562s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1562s ++ wc -w 1562s ++ t-sort -u 1562s ++ LC_COLLATE=C 1562s ++ sort -u 1562s + local cndparents=1 1562s + test 1 = 1 1562s + case "$parents" in 1562s + case "$ctype" in 1562s + read cid ctype info 1562s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 1562s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1562s + local cetype=Upstream 1562s + '[' xUpstream = xUpstream ']' 1562s + cetype=SAME 1562s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1562s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 1562s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 1562s + enparents=1 1562s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s ++ wc -w 1562s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 1562s + local cnparents=1 1562s + test 1 = 1 1562s ++ wc -w 1562s ++ for f in $parents 1562s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 1562s ++ t-sort -u 1562s ++ LC_COLLATE=C 1562s ++ sort -u 1562s + local cndparents=1 1562s + test 1 = 1 1562s + case "$parents" in 1562s + case "$ctype" in 1562s + read cid ctype info 1562s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 1562s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 1562s + local cetype=Upstream 1562s + '[' xUpstream = xUpstream ']' 1562s + cetype=SAME 1562s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 1562s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 1562s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 1562s + enparents=1 1562s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s ++ wc -w 1562s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 1562s + local cnparents=1 1562s + test 1 = 1 1562s ++ for f in $parents 1562s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 1562s ++ wc -w 1562s ++ t-sort -u 1562s ++ LC_COLLATE=C 1562s ++ sort -u 1562s + local cndparents=1 1562s + test 1 = 1 1562s + case "$parents" in 1562s + case "$ctype" in 1562s + read cid ctype info 1562s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 1562s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 1562s + local cetype=Upstream 1562s + '[' xUpstream = xUpstream ']' 1562s + cetype=SAME 1562s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 1562s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1562s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1562s + enparents=1 1562s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s ++ wc -w 1562s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1562s + local cnparents=1 1562s + test 1 = 1 1562s ++ for f in $parents 1562s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1562s ++ t-sort -u 1562s ++ LC_COLLATE=C 1562s ++ wc -w 1562s ++ sort -u 1562s + local cndparents=1 1562s + test 1 = 1 1562s + case "$parents" in 1562s + case "$ctype" in 1562s + read cid ctype info 1562s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 1562s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1562s + local cetype=Upstream 1562s + '[' xUpstream = xUpstream ']' 1562s + cetype=SAME 1562s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1562s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1562s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1562s + enparents=1 1562s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1562s ++ wc -w 1562s + local cnparents=1 1562s + test 1 = 1 1562s ++ for f in $parents 1562s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1562s ++ t-sort -u 1562s ++ wc -w 1562s ++ LC_COLLATE=C 1562s ++ sort -u 1562s + local cndparents=1 1562s + test 1 = 1 1562s + case "$parents" in 1562s + case "$ctype" in 1562s + read cid ctype info 1562s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 1562s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1562s + local cetype=Upstream 1562s + '[' xUpstream = xUpstream ']' 1562s + cetype=SAME 1562s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1562s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 1562s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 1562s + enparents=1 1562s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 1562s ++ wc -w 1562s + local cnparents=1 1562s + test 1 = 1 1562s ++ for f in $parents 1562s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 1562s ++ wc -w 1562s ++ t-sort -u 1562s ++ LC_COLLATE=C 1562s ++ sort -u 1562s + local cndparents=1 1562s + test 1 = 1 1562s + case "$parents" in 1562s + case "$ctype" in 1562s + read cid ctype info 1562s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 1562s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 1562s + local cetype=Upstream 1562s + '[' xPackaging = xUpstream ']' 1562s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 1562s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1562s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1562s + enparents=1 1562s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 1562s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1562s + bwtip= 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 1562s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 1562s + etypes=Packaging 1562s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1562s ++ wc -w 1562s + local cnparents=1 1562s + test 1 = 1 1562s ++ for f in $parents 1562s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1562s ++ wc -w 1562s ++ t-sort -u 1562s ++ LC_COLLATE=C 1562s ++ sort -u 1562s + local cndparents=1 1562s + test 1 = 1 1562s + case "$parents" in 1562s + case "$ctype" in 1562s + read cid ctype info 1562s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 1562s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1562s + local cetype=Packaging 1562s + '[' xPackaging = xPackaging ']' 1562s + cetype=SAME 1562s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1562s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1562s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1562s + enparents=1 1562s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 1562s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 1562s + etypes=Packaging 1562s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1562s ++ wc -w 1562s + local cnparents=1 1562s + test 1 = 1 1562s ++ for f in $parents 1562s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1562s ++ wc -w 1562s ++ t-sort -u 1562s ++ LC_COLLATE=C 1562s ++ sort -u 1562s + local cndparents=1 1562s + test 1 = 1 1562s + case "$parents" in 1562s + case "$ctype" in 1562s + read cid ctype info 1562s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 1562s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1562s + local cetype=Packaging 1562s + '[' xPackaging = xPackaging ']' 1562s + cetype=SAME 1562s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1562s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 1562s + expect=515e62b8d591fcc68597383b955d898db71abc6c 1562s + enparents=1 1562s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 1562s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 1562s + etypes=Packaging 1562s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 1562s ++ wc -w 1562s + local cnparents=1 1562s + test 1 = 1 1562s ++ for f in $parents 1562s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 1562s ++ wc -w 1562s ++ t-sort -u 1562s ++ LC_COLLATE=C 1562s ++ sort -u 1562s + local cndparents=1 1562s + test 1 = 1 1562s + case "$parents" in 1562s + case "$ctype" in 1562s + read cid ctype info 1562s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 1562s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 1562s + local cetype=Packaging 1562s + '[' xPackaging = xPackaging ']' 1562s + cetype=SAME 1562s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 1562s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 1562s + expect=809643e5389def220ea36d61f2d3dd504603e95a 1562s + enparents=1 1562s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 1562s + case "$ctype/$cetype" in 1562s + case "$ctype/$etypes" in 1562s + case "$cetype" in 1562s + case "$ctype" in 1562s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 1563s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 1563s + etypes=Packaging 1563s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 1563s ++ wc -w 1563s + local cnparents=1 1563s + test 1 = 1 1563s ++ for f in $parents 1563s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 1563s ++ wc -w 1563s ++ t-sort -u 1563s ++ LC_COLLATE=C 1563s ++ sort -u 1563s + local cndparents=1 1563s + test 1 = 1 1563s + case "$parents" in 1563s + case "$ctype" in 1563s + read cid ctype info 1563s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 1563s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 1563s + local cetype=Packaging 1563s + '[' xChangelog = xPackaging ']' 1563s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 1563s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 1563s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 1563s + enparents=1 1563s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 1563s + case "$ctype/$cetype" in 1563s + case "$ctype/$etypes" in 1563s + case "$cetype" in 1563s + case "$ctype" in 1563s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 1563s + etypes=Packaging 1563s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 1563s ++ wc -w 1563s + local cnparents=1 1563s + test 1 = 1 1563s ++ for f in $parents 1563s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 1563s ++ wc -w 1563s ++ t-sort -u 1563s ++ LC_COLLATE=C 1563s ++ sort -u 1563s + local cndparents=1 1563s + test 1 = 1 1563s + case "$parents" in 1563s + case "$ctype" in 1563s + read cid ctype info 1563s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 1563s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 1563s + local cetype=Packaging 1563s + '[' xChangelog = xPackaging ']' 1563s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 1563s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1563s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1563s + enparents=1 1563s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1563s + case "$ctype/$cetype" in 1563s + case "$ctype/$etypes" in 1563s + case "$cetype" in 1563s + case "$ctype" in 1563s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 1563s + etypes=Packaging 1563s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1563s ++ wc -w 1563s + local cnparents=1 1563s + test 1 = 1 1563s ++ for f in $parents 1563s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1563s ++ wc -w 1563s ++ t-sort -u 1563s ++ LC_COLLATE=C 1563s ++ sort -u 1563s + local cndparents=1 1563s + test 1 = 1 1563s + case "$parents" in 1563s + case "$ctype" in 1563s + read cid ctype info 1563s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1563s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1563s + local cetype=Packaging 1563s + '[' xAnchor = xPackaging ']' 1563s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1563s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1563s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1563s + enparents=1 1563s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1563s + case "$ctype/$cetype" in 1563s + case "$ctype/$etypes" in 1563s + case "$cetype" in 1563s + case "$ctype" in 1563s + break 1563s + checkletters=tf 1563s + '[' xtf '!=' x ']' 1563s + : '---- prepush unstitched-laundered ...tf ----' 1563s + make_check tf 1563s + case "$1" in 1563s + git diff --quiet HEAD refs/heads/before-work-prepush-unstitched-laundered 1563s + checkletters=f 1563s + '[' xf '!=' x ']' 1563s + : '---- prepush unstitched-laundered ...f ----' 1563s + make_check f 1563s + case "$1" in 1563s + t-has-ancestor HEAD refs/heads/before-work-prepush-unstitched-laundered 1563s + local now 1563s ++ git rev-parse HEAD 1563s + now=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1563s + local ancestor 1563s ++ git rev-parse 'HEAD^{}' 1563s + ancestor=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1563s + local mbase 1563s ++ t-git-merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1563s ++ git merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1563s + mbase=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1563s + '[' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f '!=' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f ']' 1563s + checkletters= 1563s + '[' x '!=' x ']' 1563s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1563s + work=work-prepush-unstitched-mixed 1563s + : '---------- prepush unstitched-mixed ----------' 1563s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 1563s + git update-ref --stdin 1563s + sed s/unstitched-mixed/work-prepush-unstitched-mixed/ 1563s + git checkout work-prepush-unstitched-mixed 1563s Switched to branch 'work-prepush-unstitched-mixed' 1563s + checkletters=Stf 1563s + shift 1563s + before=before-work-prepush-unstitched-mixed 1563s + git branch before-work-prepush-unstitched-mixed 1563s + local xopts= 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + t-git-debrebase prepush 1563s + local gdr=git-debrebase 1563s + : ' 1563s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1563s + git-debrebase --dgit=dgit -D prepush 1563s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-prepush-unstitched-mixed 1563s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 1563s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 1563s git-debrebase = Mixed {"Type" => "Mixed","Parents" => [{"Ix" => 0,"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Differs" => 34}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971","Hdr" => "tree bec3a99f595d6254a65c51aa0160db363a70a9f9\nparent 5668ce44fba4db3f42ac837f0104a9335a819367\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9"} 1563s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 1563s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 1563s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Differs" => 2}],"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","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","Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Type" => "Upstream"} 1563s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 1563s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 1563s git-debrebase = Packaging {"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","CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Parents" => [{"Ix" => 0,"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Differs" => 32}],"Type" => "Packaging"} 1563s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 1563s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 1563s git-debrebase = AddPatches {"Type" => "AddPatches","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","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","Parents" => [{"Ix" => 0,"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Differs" => 4}]} 1563s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 1563s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 1563s git-debrebase = Mixed {"Type" => "Mixed","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c"}],"Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449","CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","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"} 1563s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 1563s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 1563s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f"} 1563s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 1563s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 1563s git-debrebase = 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","Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","Parents" => [{"Ix" => 0,"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Differs" => 32}],"Type" => "Packaging"} 1563s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1563s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 1563s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\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","CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b"}]} 1563s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1563s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 1563s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Differs" => 2}],"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","CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Type" => "Upstream"} 1563s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1563s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 1563s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1563s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1563s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1563s 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","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Type" => "Changelog"} 1563s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1563s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1563s 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","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Type" => "Changelog"} 1563s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1563s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1563s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1563s 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","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},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]]} 1563s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1563s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1563s git-debrebase >= delete refs/ffq-prev/heads/work-prepush-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1563s git-debrebase >= update refs/debrebase-last/heads/work-prepush-unstitched-mixed bfd2f4c9441a5910931482e80f181720b01f12a3 0000000000000000000000000000000000000000 1563s git-debrebase >= update HEAD bfd2f4c9441a5910931482e80f181720b01f12a3 9b56b9c2600dc10b9eec97d535d89870476de971 1563s git-debrebase >$ 1563s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1563s ' 1563s + peel=peel-prepush-unstitched-mixed 1563s + git checkout -b peel-prepush-unstitched-mixed 1563s Switched to a new branch 'peel-prepush-unstitched-mixed' 1563s + t-clean-on-branch peel-prepush-unstitched-mixed 1563s + t-output '## peel-prepush-unstitched-mixed' git status -b --porcelain 1563s + printf '%s\n' '## peel-prepush-unstitched-mixed' 1563s + shift 1563s + git status -b --porcelain 1563s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1563s + : '---------- prepush unstitched-mixed Stf ----------' 1563s + '[' xStf '!=' x ']' 1563s + : '---- prepush unstitched-mixed ...Stf ----' 1563s + make_check Stf 1563s + case "$1" in 1563s + t-refs-notexist refs/ffq-prev/heads/work-prepush-unstitched-mixed 1563s + local val 1563s + for g in $* 1563s ++ t-git-get-ref refs/ffq-prev/heads/work-prepush-unstitched-mixed 1563s ++ local ref=refs/ffq-prev/heads/work-prepush-unstitched-mixed 1563s ++ case "$ref" in 1563s ++ git show-ref -d refs/ffq-prev/heads/work-prepush-unstitched-mixed 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-prepush-unstitched-mixed\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s ++ test 1 = 1 1563s + val= 1563s + '[' x '!=' x ']' 1563s + t-refs-same-start refs/debrebase-last/heads/work-prepush-unstitched-mixed 1563s + unset t_ref_val 1563s + t_ref_names=() 1563s + t-ref-head 1563s + local val 1563s ++ git rev-parse HEAD 1563s + val=bfd2f4c9441a5910931482e80f181720b01f12a3 1563s + t-ref-same-val HEAD bfd2f4c9441a5910931482e80f181720b01f12a3 1563s + local name=HEAD 1563s + local val=bfd2f4c9441a5910931482e80f181720b01f12a3 1563s + case "${t_ref_val-unset}" in 1563s + t_ref_val=bfd2f4c9441a5910931482e80f181720b01f12a3 1563s + t_ref_names+=("$name") 1563s + git diff --quiet 'HEAD^1' 1563s + grep unstitched-mixed 1563s + git diff 'HEAD^2' 1563s +Subject: MIXED add both() (subcommands refs/heads/unstitched-mixed 1) 1563s + // upstream subcommands refs/heads/unstitched-mixed 1 1563s ++// both! subcommands refs/heads/unstitched-mixed 1 1563s +Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1) 1563s ++// upstream subcommands refs/heads/unstitched-mixed 1 1563s +// debian subcommands refs/heads/unstitched-mixed 1 1563s +// both! subcommands refs/heads/unstitched-mixed 1 1563s +// debian subcommands refs/heads/unstitched-mixed 2 1563s +// both! subcommands refs/heads/unstitched-mixed 2 1563s +// upstream subcommands refs/heads/unstitched-mixed 1 1563s +// both! subcommands refs/heads/unstitched-mixed 1 1563s +// upstream subcommands refs/heads/unstitched-mixed 2 1563s +// both! subcommands refs/heads/unstitched-mixed 2 1563s + git reset --hard 'HEAD^1' 1563s HEAD is now at 9b56b9c MIXED add both() (subcommands refs/heads/unstitched-mixed 2) 1563s + checkletters=tf 1563s + '[' xtf '!=' x ']' 1563s + : '---- prepush unstitched-mixed ...tf ----' 1563s + make_check tf 1563s + case "$1" in 1563s + git diff --quiet HEAD refs/heads/before-work-prepush-unstitched-mixed 1563s + checkletters=f 1563s + '[' xf '!=' x ']' 1563s + : '---- prepush unstitched-mixed ...f ----' 1563s + make_check f 1563s + case "$1" in 1563s + t-has-ancestor HEAD refs/heads/before-work-prepush-unstitched-mixed 1563s + local now 1563s ++ git rev-parse HEAD 1563s + now=9b56b9c2600dc10b9eec97d535d89870476de971 1563s + local ancestor 1563s ++ git rev-parse 'HEAD^{}' 1563s + ancestor=9b56b9c2600dc10b9eec97d535d89870476de971 1563s + local mbase 1563s ++ t-git-merge-base 9b56b9c2600dc10b9eec97d535d89870476de971 9b56b9c2600dc10b9eec97d535d89870476de971 1563s ++ git merge-base 9b56b9c2600dc10b9eec97d535d89870476de971 9b56b9c2600dc10b9eec97d535d89870476de971 1563s + mbase=9b56b9c2600dc10b9eec97d535d89870476de971 1563s + '[' x9b56b9c2600dc10b9eec97d535d89870476de971 '!=' x9b56b9c2600dc10b9eec97d535d89870476de971 ']' 1563s + checkletters= 1563s + '[' x '!=' x ']' 1563s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1563s + work=work-prepush-raw-converted-from-gbp 1563s + : '---------- prepush raw-converted-from-gbp ----------' 1563s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 1563s + git update-ref --stdin 1563s + sed s/raw-converted-from-gbp/work-prepush-raw-converted-from-gbp/ 1563s + git checkout work-prepush-raw-converted-from-gbp 1563s Switched to branch 'work-prepush-raw-converted-from-gbp' 1563s + checkletters=ns 1563s + shift 1563s + before=before-work-prepush-raw-converted-from-gbp 1563s + git branch before-work-prepush-raw-converted-from-gbp 1563s + local xopts= 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + t-git-debrebase prepush 1563s + local gdr=git-debrebase 1563s + : ' 1563s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1563s + git-debrebase --dgit=dgit -D prepush 1563s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-prepush-raw-converted-from-gbp 1563s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1563s ' 1563s + peel=peel-prepush-raw-converted-from-gbp 1563s + git checkout -b peel-prepush-raw-converted-from-gbp 1563s Switched to a new branch 'peel-prepush-raw-converted-from-gbp' 1563s + t-clean-on-branch peel-prepush-raw-converted-from-gbp 1563s + t-output '## peel-prepush-raw-converted-from-gbp' git status -b --porcelain 1563s + printf '%s\n' '## peel-prepush-raw-converted-from-gbp' 1563s + shift 1563s + git status -b --porcelain 1563s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1563s + : '---------- prepush raw-converted-from-gbp ns ----------' 1563s + '[' xns '!=' x ']' 1563s + : '---- prepush raw-converted-from-gbp ...ns ----' 1563s + make_check ns 1563s + case "$1" in 1563s + t-refs-same-start 1563s + unset t_ref_val 1563s + t_ref_names=() 1563s + t-refs-same refs/heads/before-work-prepush-raw-converted-from-gbp refs/heads/peel-prepush-raw-converted-from-gbp 1563s + local g 1563s + for g in $* 1563s + t-ref-same refs/heads/before-work-prepush-raw-converted-from-gbp 1563s + local name=refs/heads/before-work-prepush-raw-converted-from-gbp 1563s + local val 1563s ++ t-git-get-ref refs/heads/before-work-prepush-raw-converted-from-gbp 1563s ++ local ref=refs/heads/before-work-prepush-raw-converted-from-gbp 1563s ++ case "$ref" in 1563s ++ git show-ref -d refs/heads/before-work-prepush-raw-converted-from-gbp 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-prepush-raw-converted-from-gbp\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s + val=178896af44c5b02e05a3442df6c33233b6acb807 1563s + t-ref-same-val refs/heads/before-work-prepush-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1563s + local name=refs/heads/before-work-prepush-raw-converted-from-gbp 1563s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1563s + case "${t_ref_val-unset}" in 1563s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1563s + t_ref_names+=("$name") 1563s + for g in $* 1563s + t-ref-same refs/heads/peel-prepush-raw-converted-from-gbp 1563s + local name=refs/heads/peel-prepush-raw-converted-from-gbp 1563s + local val 1563s ++ t-git-get-ref refs/heads/peel-prepush-raw-converted-from-gbp 1563s ++ local ref=refs/heads/peel-prepush-raw-converted-from-gbp 1563s ++ case "$ref" in 1563s ++ git show-ref -d refs/heads/peel-prepush-raw-converted-from-gbp 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/heads/peel-prepush-raw-converted-from-gbp\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s + val=178896af44c5b02e05a3442df6c33233b6acb807 1563s + t-ref-same-val refs/heads/peel-prepush-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1563s + local name=refs/heads/peel-prepush-raw-converted-from-gbp 1563s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1563s + case "${t_ref_val-unset}" in 1563s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1563s + t_ref_names+=("$name") 1563s + checkletters=s 1563s + '[' xs '!=' x ']' 1563s + : '---- prepush raw-converted-from-gbp ...s ----' 1563s + make_check s 1563s + case "$1" in 1563s + t-refs-notexist refs/ffq-prev/heads/work-prepush-raw-converted-from-gbp 1563s + local val 1563s + for g in $* 1563s ++ t-git-get-ref refs/ffq-prev/heads/work-prepush-raw-converted-from-gbp 1563s ++ local ref=refs/ffq-prev/heads/work-prepush-raw-converted-from-gbp 1563s ++ case "$ref" in 1563s ++ git show-ref -d refs/ffq-prev/heads/work-prepush-raw-converted-from-gbp 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-prepush-raw-converted-from-gbp\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s ++ test 1 = 1 1563s + val= 1563s + '[' x '!=' x ']' 1563s + t-refs-same-start 1563s + unset t_ref_val 1563s + t_ref_names=() 1563s + t-refs-same refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp refs/debrebase-last/heads/raw-converted-from-gbp 1563s + local g 1563s + for g in $* 1563s + t-ref-same refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 1563s + local name=refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 1563s + local val 1563s ++ t-git-get-ref refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 1563s ++ local ref=refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 1563s ++ case "$ref" in 1563s ++ git show-ref -d refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-prepush-raw-converted-from-gbp\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s ++ test 1 = 1 1563s + val= 1563s + t-ref-same-val refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 1563s + local name=refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 1563s + local val= 1563s + case "${t_ref_val-unset}" in 1563s + t_ref_val= 1563s + t_ref_names+=("$name") 1563s + for g in $* 1563s + t-ref-same refs/debrebase-last/heads/raw-converted-from-gbp 1563s + local name=refs/debrebase-last/heads/raw-converted-from-gbp 1563s + local val 1563s ++ t-git-get-ref refs/debrebase-last/heads/raw-converted-from-gbp 1563s ++ local ref=refs/debrebase-last/heads/raw-converted-from-gbp 1563s ++ case "$ref" in 1563s ++ git show-ref -d refs/debrebase-last/heads/raw-converted-from-gbp 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/raw-converted-from-gbp\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s ++ test 1 = 1 1563s + val= 1563s + t-ref-same-val refs/debrebase-last/heads/raw-converted-from-gbp 1563s + local name=refs/debrebase-last/heads/raw-converted-from-gbp 1563s + local val= 1563s + case "${t_ref_val-unset}" in 1563s + t_ref_val= 1563s + t_ref_names+=("$name") 1563s + t-has-ancestor HEAD refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 1563s + local now 1563s ++ git rev-parse HEAD 1563s + now=178896af44c5b02e05a3442df6c33233b6acb807 1563s + local ancestor 1563s ++ git rev-parse 'HEAD^{}' 1563s + ancestor=178896af44c5b02e05a3442df6c33233b6acb807 1563s + local mbase 1563s ++ t-git-merge-base 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 1563s ++ git merge-base 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 1563s + mbase=178896af44c5b02e05a3442df6c33233b6acb807 1563s + '[' x178896af44c5b02e05a3442df6c33233b6acb807 '!=' x178896af44c5b02e05a3442df6c33233b6acb807 ']' 1563s + checkletters= 1563s + '[' x '!=' x ']' 1563s + subcmd quick ns Sl Sltf Sl n 1563s + local subcmd=quick 1563s + shift 1563s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1563s + work=work-quick-stitched-laundered 1563s + : '---------- quick stitched-laundered ----------' 1563s + sed s/stitched-laundered/work-quick-stitched-laundered/ 1563s + git update-ref --stdin 1563s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 1563s + git checkout work-quick-stitched-laundered 1563s Switched to branch 'work-quick-stitched-laundered' 1563s + checkletters=ns 1563s + shift 1563s + before=before-work-quick-stitched-laundered 1563s + git branch before-work-quick-stitched-laundered 1563s + local xopts= 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + t-git-debrebase quick 1563s + local gdr=git-debrebase 1563s + : ' 1563s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1563s + git-debrebase --dgit=dgit -D quick 1563s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-stitched-laundered 1563s git-debrebase ffq check_specs * 1563s git-debrebase *** WALK 64d2fdf7628f675981360f0dce3aaaa227b0676a 0 - 1563s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 1563s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 1563s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 1563s git-debrebase = Pseudomerge {"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Type" => "Pseudomerge","Overwritten" => [{"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" => {"Ix" => 0,"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Differs" => 0},"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a"} 1563s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1563s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1563s git-debrebase = Upstream {"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Parents" => [{"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1563s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1563s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1563s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","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","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"} 1563s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1563s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1563s git-debrebase = Upstream {"Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","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","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391"} 1563s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1563s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1563s git-debrebase = Upstream {"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745"} 1563s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1563s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1563s git-debrebase = Upstream {"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","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","Parents" => [{"Ix" => 0,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Differs" => 2}],"Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Type" => "Upstream"} 1563s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1563s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1563s git-debrebase = Upstream {"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Differs" => 2}],"Type" => "Upstream"} 1563s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1563s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1563s git-debrebase = Upstream {"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 1563s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1563s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1563s git-debrebase = Packaging {"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","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}],"Type" => "Packaging"} 1563s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1563s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1563s git-debrebase = Packaging {"Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Parents" => [{"Ix" => 0,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Differs" => 32}],"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48"} 1563s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1563s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1563s git-debrebase = Packaging {"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Parents" => [{"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Differs" => 32,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1563s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1563s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1563s git-debrebase = Packaging {"Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Parents" => [{"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"} 1563s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1563s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1563s git-debrebase = Changelog {"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 1563s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1563s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1563s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2"} 1563s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1563s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1563s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1563s 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","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"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]]} 1563s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 15 pm 0 1563s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1563s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1563s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 1563s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1563s git-debrebase WALK BUILD bef5ccd302033398655e3e4e8896fba41691d0b2 Debian (rewriting=0) 1563s git-debrebase WALK BUILD 6b98ac2fc854dc69f9cabc904a8e43328f649f41 Debian (rewriting=0) 1563s git-debrebase WALK BUILD 6184b930def645d1f8da8cb6a91475445cbb817d Debian (rewriting=0) 1563s git-debrebase WALK BUILD 4926fc77fd0b974ce5a2892ad46669ed4ec14edb Debian (rewriting=0) 1563s git-debrebase WALK BUILD 420fa3b34303353709bcfbcf88ccc4e272f5ee48 Debian (rewriting=0) 1563s git-debrebase WALK BUILD 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 Debian (rewriting=0) 1563s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1563s git-debrebase WALK BUILD 64efa6cded3fc4da385f8ed4bd8c72164c1c914d Upstream (rewriting=0) 1563s git-debrebase WALK BUILD b0291461cc529ff9fa4060b3e41ebff6cb563c49 Upstream (rewriting=0) 1563s git-debrebase WALK BUILD 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 Upstream (rewriting=0) 1563s git-debrebase WALK BUILD cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 Upstream (rewriting=0) 1563s git-debrebase WALK BUILD 3025551c1e030f25c60bdabaab789745e585f391 Upstream (rewriting=0) 1563s git-debrebase WALK BUILD 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 Upstream (rewriting=0) 1563s git-debrebase WALK BUILD dab3cc0fcfead932f6714305cfb670067c157804 Upstream (rewriting=0) 1563s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1563s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1563s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a = 0 1563s git-debrebase *** WALK RETURN dab3cc0fcfead932f6714305cfb670067c157804 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1563s git-debrebase: laundered (head was 64d2fdf7628f675981360f0dce3aaaa227b0676a) 1563s git-debrebase >= update refs/ffq-prev/heads/work-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 0000000000000000000000000000000000000000 1563s git-debrebase >= delete refs/debrebase-last/heads/work-quick-stitched-laundered 1563s git-debrebase >= update HEAD dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s git-debrebase >$ 1563s Recorded previous head for preservation 1563s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-stitched-laundered 1563s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1563s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1563s 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","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Parents" => [{"Differs" => 2,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Ix" => 0}],"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804"} 1563s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1563s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1563s git-debrebase = Upstream {"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","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"} 1563s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1563s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1563s 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","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"}],"Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555"} 1563s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1563s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1563s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Type" => "Upstream","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"} 1563s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1563s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1563s git-debrebase = Upstream {"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"}],"Type" => "Upstream"} 1563s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1563s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1563s git-debrebase = Upstream {"Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","Parents" => [{"Differs" => 2,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"} 1563s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1563s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1563s git-debrebase = Upstream {"Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Ix" => 0}],"Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d"} 1563s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1563s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1563s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"} 1563s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1563s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1563s git-debrebase = Packaging {"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Ix" => 0}],"Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n"} 1563s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1563s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1563s git-debrebase = Packaging {"Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"} 1563s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1563s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1563s git-debrebase = 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","Parents" => [{"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Packaging"} 1563s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1563s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1563s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Ix" => 0}],"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","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"} 1563s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1563s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1563s 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","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 1563s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1563s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1563s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1563s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"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","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]]} 1563s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a = 0 1563s git-debrebase >= delete refs/ffq-prev/heads/work-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s git-debrebase >= update refs/debrebase-last/heads/work-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 0000000000000000000000000000000000000000 1563s git-debrebase >= update HEAD 64d2fdf7628f675981360f0dce3aaaa227b0676a dab3cc0fcfead932f6714305cfb670067c157804 1563s git-debrebase >$ 1563s HEAD is now at 64d2fdf Declare fast forward / record previous work 1563s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1563s ' 1563s + peel=peel-quick-stitched-laundered 1563s + git checkout -b peel-quick-stitched-laundered 1563s Switched to a new branch 'peel-quick-stitched-laundered' 1563s + t-clean-on-branch peel-quick-stitched-laundered 1563s + t-output '## peel-quick-stitched-laundered' git status -b --porcelain 1563s + printf '%s\n' '## peel-quick-stitched-laundered' 1563s + shift 1563s + git status -b --porcelain 1563s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1563s + : '---------- quick stitched-laundered ns ----------' 1563s + '[' xns '!=' x ']' 1563s + : '---- quick stitched-laundered ...ns ----' 1563s + make_check ns 1563s + case "$1" in 1563s + t-refs-same-start 1563s + unset t_ref_val 1563s + t_ref_names=() 1563s + t-refs-same refs/heads/before-work-quick-stitched-laundered refs/heads/peel-quick-stitched-laundered 1563s + local g 1563s + for g in $* 1563s + t-ref-same refs/heads/before-work-quick-stitched-laundered 1563s + local name=refs/heads/before-work-quick-stitched-laundered 1563s + local val 1563s ++ t-git-get-ref refs/heads/before-work-quick-stitched-laundered 1563s ++ local ref=refs/heads/before-work-quick-stitched-laundered 1563s ++ case "$ref" in 1563s ++ git show-ref -d refs/heads/before-work-quick-stitched-laundered 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-quick-stitched-laundered\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + t-ref-same-val refs/heads/before-work-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + local name=refs/heads/before-work-quick-stitched-laundered 1563s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + case "${t_ref_val-unset}" in 1563s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + t_ref_names+=("$name") 1563s + for g in $* 1563s + t-ref-same refs/heads/peel-quick-stitched-laundered 1563s + local name=refs/heads/peel-quick-stitched-laundered 1563s + local val 1563s ++ t-git-get-ref refs/heads/peel-quick-stitched-laundered 1563s ++ local ref=refs/heads/peel-quick-stitched-laundered 1563s ++ case "$ref" in 1563s ++ git show-ref -d refs/heads/peel-quick-stitched-laundered 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/heads/peel-quick-stitched-laundered\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + t-ref-same-val refs/heads/peel-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + local name=refs/heads/peel-quick-stitched-laundered 1563s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + case "${t_ref_val-unset}" in 1563s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + t_ref_names+=("$name") 1563s + checkletters=s 1563s + '[' xs '!=' x ']' 1563s + : '---- quick stitched-laundered ...s ----' 1563s + make_check s 1563s + case "$1" in 1563s + t-refs-notexist refs/ffq-prev/heads/work-quick-stitched-laundered 1563s + local val 1563s + for g in $* 1563s ++ t-git-get-ref refs/ffq-prev/heads/work-quick-stitched-laundered 1563s ++ local ref=refs/ffq-prev/heads/work-quick-stitched-laundered 1563s ++ case "$ref" in 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-quick-stitched-laundered\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s ++ git show-ref -d refs/ffq-prev/heads/work-quick-stitched-laundered 1563s ++ test 1 = 1 1563s + val= 1563s + '[' x '!=' x ']' 1563s + t-refs-same-start 1563s + unset t_ref_val 1563s + t_ref_names=() 1563s + t-refs-same refs/debrebase-last/heads/work-quick-stitched-laundered refs/debrebase-last/heads/stitched-laundered 1563s + local g 1563s + for g in $* 1563s + t-ref-same refs/debrebase-last/heads/work-quick-stitched-laundered 1563s + local name=refs/debrebase-last/heads/work-quick-stitched-laundered 1563s + local val 1563s ++ t-git-get-ref refs/debrebase-last/heads/work-quick-stitched-laundered 1563s ++ local ref=refs/debrebase-last/heads/work-quick-stitched-laundered 1563s ++ case "$ref" in 1563s ++ git show-ref -d refs/debrebase-last/heads/work-quick-stitched-laundered 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-quick-stitched-laundered\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + t-ref-same-val refs/debrebase-last/heads/work-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + local name=refs/debrebase-last/heads/work-quick-stitched-laundered 1563s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + case "${t_ref_val-unset}" in 1563s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + t_ref_names+=("$name") 1563s + for g in $* 1563s + t-ref-same refs/debrebase-last/heads/stitched-laundered 1563s + local name=refs/debrebase-last/heads/stitched-laundered 1563s + local val 1563s ++ t-git-get-ref refs/debrebase-last/heads/stitched-laundered 1563s ++ local ref=refs/debrebase-last/heads/stitched-laundered 1563s ++ case "$ref" in 1563s ++ git show-ref -d refs/debrebase-last/heads/stitched-laundered 1563s ++ perl -ne ' 1563s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-laundered\E(?:\^\{\})?$#; 1563s END { print "$x\n" if length $x; } 1563s ' 1563s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + t-ref-same-val refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + local name=refs/debrebase-last/heads/stitched-laundered 1563s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + case "${t_ref_val-unset}" in 1563s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + t_ref_names+=("$name") 1563s + t-has-ancestor HEAD refs/debrebase-last/heads/work-quick-stitched-laundered 1563s + local now 1563s ++ git rev-parse HEAD 1563s + now=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + local ancestor 1563s ++ git rev-parse 'HEAD^{}' 1563s + ancestor=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + local mbase 1563s ++ t-git-merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s ++ git merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + mbase=64d2fdf7628f675981360f0dce3aaaa227b0676a 1563s + '[' x64d2fdf7628f675981360f0dce3aaaa227b0676a '!=' x64d2fdf7628f675981360f0dce3aaaa227b0676a ']' 1563s + checkletters= 1563s + '[' x '!=' x ']' 1563s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1563s + work=work-quick-stitched-mixed 1563s + : '---------- quick stitched-mixed ----------' 1563s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 1563s + git update-ref --stdin 1563s + sed s/stitched-mixed/work-quick-stitched-mixed/ 1563s + git checkout work-quick-stitched-mixed 1563s Switched to branch 'work-quick-stitched-mixed' 1563s + checkletters=Sl 1563s + shift 1563s + before=before-work-quick-stitched-mixed 1563s + git branch before-work-quick-stitched-mixed 1563s + local xopts= 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + case "$checkletters" in 1563s + t-git-debrebase quick 1563s + local gdr=git-debrebase 1563s + : ' 1563s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1563s + git-debrebase --dgit=dgit -D quick 1563s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-stitched-mixed 1563s git-debrebase ffq check_specs * 1563s git-debrebase *** WALK 5e0bf3cea3c715230b96aca41156852390014b98 0 - 1563s git-debrebase get_differs 7091adece516711371505e702f87d9973010f25b 50e48c643e8c0e3794bbfe42b45ab72549dda504 = 0x22 1563s git-debrebase classify 5e0bf3cea3c715230b96aca41156852390014b98 $t=50e48c643e8c0e3794bbfe42b45ab72549dda504 @p 7091adece516711371505e702f87d9973010f25b/0x22 1563s git-debrebase = 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","Parents" => [{"CommitId" => "7091adece516711371505e702f87d9973010f25b","Ix" => 0,"Differs" => 34}],"Type" => "Mixed","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n"} 1563s git-debrebase get_differs 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 6066466a7bfccd9539954883312605a59c5b4502 = 0x2 1563s git-debrebase classify 7091adece516711371505e702f87d9973010f25b $t=6066466a7bfccd9539954883312605a59c5b4502 @p 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1/0x2 1563s git-debrebase = Upstream {"Tree" => "6066466a7bfccd9539954883312605a59c5b4502","CommitId" => "7091adece516711371505e702f87d9973010f25b","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","Parents" => [{"CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1563s git-debrebase get_differs a5e2aaa2551f9e331d30511eb4356a22c939e752 0cbb6dcc737dae60cb32b3675f13a2dbfc737647 = 0x20 1563s git-debrebase classify 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 $t=0cbb6dcc737dae60cb32b3675f13a2dbfc737647 @p a5e2aaa2551f9e331d30511eb4356a22c939e752/0x20 1563s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752"}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1","Tree" => "0cbb6dcc737dae60cb32b3675f13a2dbfc737647","Hdr" => "tree 0cbb6dcc737dae60cb32b3675f13a2dbfc737647\nparent a5e2aaa2551f9e331d30511eb4356a22c939e752\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 1563s git-debrebase get_differs 0a3febb41892833b131ed8ca6958d68efc7f925f 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 = 0x4 1563s git-debrebase classify a5e2aaa2551f9e331d30511eb4356a22c939e752 $t=0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 @p 0a3febb41892833b131ed8ca6958d68efc7f925f/0x4 1563s git-debrebase = AddPatches {"Tree" => "0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3","CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752","Hdr" => "tree 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3\nparent 0a3febb41892833b131ed8ca6958d68efc7f925f\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Parents" => [{"CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Differs" => 4,"Ix" => 0}],"Type" => "AddPatches"} 1563s git-debrebase get_differs c848bc784454d4635b6a71ea59b65b373615e8e4 cb27fe0206f700a55e3ec45caa3b80b9d71ed691 = 0x22 1563s git-debrebase classify 0a3febb41892833b131ed8ca6958d68efc7f925f $t=cb27fe0206f700a55e3ec45caa3b80b9d71ed691 @p c848bc784454d4635b6a71ea59b65b373615e8e4/0x22 1563s git-debrebase = Mixed {"Type" => "Mixed","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4"}],"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","Tree" => "cb27fe0206f700a55e3ec45caa3b80b9d71ed691","CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f"} 1563s git-debrebase get_differs 772b2a1d3dacffb5498a61b7c9518d57d439e1ca af40286d15dcd54aed3b8586be973b89dfad2ee8 = 0x2 1563s git-debrebase classify c848bc784454d4635b6a71ea59b65b373615e8e4 $t=af40286d15dcd54aed3b8586be973b89dfad2ee8 @p 772b2a1d3dacffb5498a61b7c9518d57d439e1ca/0x2 1563s git-debrebase = Upstream {"CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Tree" => "af40286d15dcd54aed3b8586be973b89dfad2ee8","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","Parents" => [{"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1563s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf eadc003377c95410215ba90c8b32bc80c122ce2b = 0x20 1564s git-debrebase classify 772b2a1d3dacffb5498a61b7c9518d57d439e1ca $t=eadc003377c95410215ba90c8b32bc80c122ce2b @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 1564s git-debrebase = Packaging {"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Tree" => "eadc003377c95410215ba90c8b32bc80c122ce2b","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"}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n"} 1564s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1564s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1564s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Type" => "AddPatches","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"} 1564s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1564s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1564s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0,"Differs" => 16}],"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","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"} 1564s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1564s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1564s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Ix" => 0,"Differs" => 16}],"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","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"} 1564s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1564s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1564s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1564s git-debrebase = Pseudomerge {"Contributor" => {"Differs" => 0,"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"},"Type" => "Pseudomerge","Parents" => [$VAR1->{"Contributor"},{"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8,"Ix" => 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","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Overwritten" => [$VAR1->{"Parents"}[1]],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"} 1564s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1564s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1564s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 1564s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1564s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1564s git-debrebase = Upstream {"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1564s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1564s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1564s 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}],"Type" => "Upstream","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1564s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1564s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1564s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1564s 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","Type" => "Anchor","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1564s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 1564s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1564s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1564s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 20 1564s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1564s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1564s git-debrebase WALK REWRITING NOW cl=HASH(0x25380e32fe0) procd=HASH(0x25380e3c8e8) 1564s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1564s git-debrebase WALK BUILD 772b2a1d3dacffb5498a61b7c9518d57d439e1ca Debian (rewriting=1) 1564s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1564s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Debian (rewriting=1) 1564s git-debrebase WALK BUILD 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 Debian (rewriting=1) 1564s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1564s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Debian (rewriting=1) 1564s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1564s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1564s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1564s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1564s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1564s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1564s git-debrebase WALK BUILD c848bc784454d4635b6a71ea59b65b373615e8e4 Upstream (rewriting=1) 1564s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Upstream (rewriting=1) 1564s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1564s git-debrebase WALK BUILD 7091adece516711371505e702f87d9973010f25b Upstream (rewriting=1) 1564s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Upstream (rewriting=1) 1564s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1564s git-debrebase get_differs 97a91c40026ff6a52a5cc7d020dda82048f2e77d 5e0bf3cea3c715230b96aca41156852390014b98 = 0x4 1564s git-debrebase *** WALK RETURN 97a91c40026ff6a52a5cc7d020dda82048f2e77d e7d45cf6ecfa83b4fd6418de6b88f8471799e588 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1564s git-debrebase: laundered (head was 5e0bf3cea3c715230b96aca41156852390014b98) 1564s git-debrebase >= update refs/ffq-prev/heads/work-quick-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 0000000000000000000000000000000000000000 1564s git-debrebase >= delete refs/debrebase-last/heads/work-quick-stitched-mixed 1564s git-debrebase >= update HEAD 97a91c40026ff6a52a5cc7d020dda82048f2e77d 5e0bf3cea3c715230b96aca41156852390014b98 1564s git-debrebase >$ 1564s Recorded previous head for preservation 1564s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-stitched-mixed 1564s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 1564s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 1564s git-debrebase = Upstream {"Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","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" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557"}]} 1564s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 1564s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 1564s git-debrebase = Upstream {"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"}],"Type" => "Upstream"} 1564s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 1564s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 1564s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Differs" => 2,"Ix" => 0}],"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","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"} 1564s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 1564s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 1564s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc"}],"Type" => "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"} 1564s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 1564s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 1564s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4"}],"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","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8"} 1564s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 1564s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 1564s git-debrebase = Upstream {"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","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","Parents" => [{"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 1564s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 1564s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 1564s git-debrebase = Upstream {"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588"}],"Type" => "Upstream"} 1564s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 1564s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 1564s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e"}],"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","CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e"} 1564s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 1564s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 1564s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Packaging","Parents" => [{"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5"} 1564s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 1564s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 1564s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1564s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 1564s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 1564s 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","CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n"} 1564s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1564s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 1564s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "60728ea4003218c146a7f595c4ff746760566965"}]} 1564s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1564s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1564s git-debrebase = Changelog {"Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1564s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1564s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1564s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1564s git-debrebase = Anchor {"Type" => "Anchor","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1564s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1564s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1564s git-debrebase >= delete refs/ffq-prev/heads/work-quick-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 1564s git-debrebase >= update refs/debrebase-last/heads/work-quick-stitched-mixed 12058514a4b2f01cf9dda0673ddfa15f68ecc55b 0000000000000000000000000000000000000000 1564s git-debrebase >= update HEAD 12058514a4b2f01cf9dda0673ddfa15f68ecc55b 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1564s git-debrebase >$ 1564s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1564s ' 1564s + peel=peel-quick-stitched-mixed 1564s + git checkout -b peel-quick-stitched-mixed 1564s Switched to a new branch 'peel-quick-stitched-mixed' 1564s + t-clean-on-branch peel-quick-stitched-mixed 1564s + t-output '## peel-quick-stitched-mixed' git status -b --porcelain 1564s + printf '%s\n' '## peel-quick-stitched-mixed' 1564s + shift 1564s + git status -b --porcelain 1564s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1564s + : '---------- quick stitched-mixed Sl ----------' 1564s + '[' xSl '!=' x ']' 1564s + : '---- quick stitched-mixed ...Sl ----' 1564s + make_check Sl 1564s + case "$1" in 1564s + t-refs-notexist refs/ffq-prev/heads/work-quick-stitched-mixed 1564s + local val 1564s + for g in $* 1564s ++ t-git-get-ref refs/ffq-prev/heads/work-quick-stitched-mixed 1564s ++ local ref=refs/ffq-prev/heads/work-quick-stitched-mixed 1564s ++ case "$ref" in 1564s ++ git show-ref -d refs/ffq-prev/heads/work-quick-stitched-mixed 1564s ++ perl -ne ' 1564s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-quick-stitched-mixed\E(?:\^\{\})?$#; 1564s END { print "$x\n" if length $x; } 1564s ' 1564s ++ test 1 = 1 1564s + val= 1564s + '[' x '!=' x ']' 1564s + t-refs-same-start refs/debrebase-last/heads/work-quick-stitched-mixed 1564s + unset t_ref_val 1564s + t_ref_names=() 1564s + t-ref-head 1564s + local val 1564s ++ git rev-parse HEAD 1564s + val=12058514a4b2f01cf9dda0673ddfa15f68ecc55b 1564s + t-ref-same-val HEAD 12058514a4b2f01cf9dda0673ddfa15f68ecc55b 1564s + local name=HEAD 1564s + local val=12058514a4b2f01cf9dda0673ddfa15f68ecc55b 1564s + case "${t_ref_val-unset}" in 1564s + t_ref_val=12058514a4b2f01cf9dda0673ddfa15f68ecc55b 1564s + t_ref_names+=("$name") 1564s + git diff --quiet 'HEAD^1' 1564s + git diff 'HEAD^2' 1564s + grep stitched-mixed 1564s -Subject: MIXED add both() (subcommands refs/heads/stitched-mixed 1) 1564s - // upstream subcommands refs/heads/stitched-mixed 1 1564s -+// both! subcommands refs/heads/stitched-mixed 1 1564s -Subject: UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1) 1564s -+// upstream subcommands refs/heads/stitched-mixed 1 1564s + git reset --hard 'HEAD^1' 1564s HEAD is now at 97a91c4 MIXED add both() (subcommands refs/heads/stitched-mixed 2) 1564s + checkletters=l 1564s + '[' xl '!=' x ']' 1564s + : '---- quick stitched-mixed ...l ----' 1564s + make_check l 1564s + case "$1" in 1564s + git diff --quiet HEAD refs/heads/before-work-quick-stitched-mixed -- :. ':!debian/patches' 1564s + t-gdr-good laundered 1564s + local state=laundered 1564s + local beforetag= 1564s + case $state in 1564s + git diff --quiet -- :. ':!debian/patches' 1564s + LC_MESSAGES=C 1564s + t-git-debrebase status 1564s + local gdr=git-debrebase 1564s + : ' 1564s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1564s + git-debrebase --dgit=dgit -D status 1564s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 1564s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 1564s git-debrebase = Upstream {"Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","Parents" => [{"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Ix" => 0,"Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","Type" => "Upstream"} 1564s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 1564s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 1564s git-debrebase = Upstream {"Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Parents" => [{"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Differs" => 2}],"Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Upstream"} 1564s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 1564s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 1564s 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","Type" => "Upstream","Parents" => [{"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"} 1564s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 1564s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 1564s git-debrebase = Upstream {"Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc"}]} 1564s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 1564s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 1564s 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","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Ix" => 0}]} 1564s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 1564s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 1564s git-debrebase = Upstream {"Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","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","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4"} 1564s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 1564s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 1564s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Differs" => 2}],"Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5"} 1564s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 1564s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 1564s git-debrebase = Packaging {"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" => [{"Ix" => 0,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Differs" => 32}],"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1564s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 1564s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 1564s 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","Parents" => [{"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n"} 1564s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 1564s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 1564s git-debrebase = Packaging {"Parents" => [{"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1564s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 1564s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 1564s git-debrebase = Packaging {"Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Ix" => 0}],"Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "5052af319e257b8c20174a42da76f055391029f3"} 1564s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1564s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 1564s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Parents" => [{"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Ix" => 0,"Differs" => 16}]} 1564s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1564s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1564s 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","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}]} 1564s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1564s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1564s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1564s git-debrebase = Anchor {"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]]} 1564s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-quick-stitched-mixed 1564s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1564s ' 1564s + case $state in 1564s + egrep '^ *branch is laundered' ../status.check 1564s branch is laundered 1564s + t-gdr-good-analyse HEAD laundered 1564s + local head=HEAD 1564s + local state=laundered 1564s + local wsfx= 1564s + local etypes bwtip 1564s + case $state in 1564s + etypes=Upstream 1564s ++ t-git-debrebase breakwater 1564s ++ local gdr=git-debrebase 1564s ++ : ' 1564s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1564s ++ git-debrebase --dgit=dgit -D breakwater 1564s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 1564s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 1564s 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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c"} 1564s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 1564s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 1564s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"}],"Type" => "Upstream","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53"} 1564s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 1564s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 1564s git-debrebase = Upstream {"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\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: upstream part]\n","Type" => "Upstream","Parents" => [{"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Differs" => 2,"Ix" => 0}],"Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c"} 1564s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 1564s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 1564s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f"} 1564s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 1564s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 1564s git-debrebase = Upstream {"Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc"} 1564s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 1564s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 1564s git-debrebase = Upstream {"Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee"} 1564s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 1564s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 1564s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Parents" => [{"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Ix" => 0,"Differs" => 2}],"Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9"} 1564s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 1564s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 1564s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e"}],"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e"} 1564s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 1564s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 1564s git-debrebase = Packaging {"Parents" => [{"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5"} 1564s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 1564s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 1564s git-debrebase = Packaging {"Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","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","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "5052af319e257b8c20174a42da76f055391029f3"}],"Type" => "Packaging"} 1564s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 1564s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 1564s git-debrebase = Packaging {"Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Type" => "Packaging","Parents" => [{"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Ix" => 0,"Differs" => 32}],"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1564s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1564s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 1564s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Parents" => [{"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Ix" => 0,"Differs" => 16}],"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"} 1564s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1564s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1564s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "60728ea4003218c146a7f595c4ff746760566965","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","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 1564s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1564s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1564s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1564s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"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" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","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"} 1564s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1564s ' 1564s + bwtip=Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1564s + anal=../anal 1564s + t-git-debrebase analyse HEAD 1564s + local gdr=git-debrebase 1564s + : ' 1564s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1564s + git-debrebase --dgit=dgit -D analyse HEAD 1564s git-debrebase *** WALK 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1 *main::STDOUT 1564s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 1564s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 1564s git-debrebase = Upstream {"Type" => "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","Parents" => [{"Ix" => 0,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1564s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 1564s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 1564s git-debrebase = Upstream {"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" => [{"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Ix" => 0,"Differs" => 2}],"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n"} 1564s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 1564s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 1564s 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","Parents" => [{"Ix" => 0,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Differs" => 2}],"Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","Type" => "Upstream","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1564s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 1564s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 1564s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Parents" => [{"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Ix" => 0,"Differs" => 2}],"Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Type" => "Upstream","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1564s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 1564s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 1564s git-debrebase = Upstream {"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","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Parents" => [{"Differs" => 2,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Ix" => 0}]} 1565s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 1565s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 1565s git-debrebase = Upstream {"Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","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" => [{"Differs" => 2,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Ix" => 0}],"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4"} 1565s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 1565s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 1565s git-debrebase = Upstream {"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Parents" => [{"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Ix" => 0,"Differs" => 2}],"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","Type" => "Upstream","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9"} 1565s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 1565s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 1565s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0,"Differs" => 32}],"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging"} 1565s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 1565s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 1565s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Parents" => [{"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Ix" => 0,"Differs" => 32}],"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"} 1565s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 1565s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 1565s git-debrebase = Packaging {"Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Type" => "Packaging","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","Parents" => [{"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Ix" => 0,"Differs" => 32}],"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a"} 1565s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 1565s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 1565s git-debrebase = Packaging {"Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Type" => "Packaging","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","CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Parents" => [{"Differs" => 32,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Ix" => 0}]} 1565s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1565s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 1565s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","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","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "60728ea4003218c146a7f595c4ff746760566965"}],"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"} 1565s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1565s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1565s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","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","CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}]} 1565s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1565s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1565s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1565s 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}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]],"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"} 1565s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1565s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1565s ' 1565s ++ git rev-parse HEAD 1565s + expect=97a91c40026ff6a52a5cc7d020dda82048f2e77d 1565s + exec 1565s + local cid ctype info nparents 1565s + read cid ctype info 1565s + : ===== 97a91c40026ff6a52a5cc7d020dda82048f2e77d Upstream ===== 1565s + test 97a91c40026ff6a52a5cc7d020dda82048f2e77d = 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1565s + local cetype=Upstream 1565s + '[' xUpstream = xUpstream ']' 1565s + cetype=SAME 1565s ++ git log -n1 --pretty=format:%P 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1565s + local parents=2f5a428eb6044c48a90076bcad0c49753a477557 1565s + expect=2f5a428eb6044c48a90076bcad0c49753a477557 1565s + enparents=1 1565s + : Upstream/SAME 2f5a428eb6044c48a90076bcad0c49753a477557 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s ++ printf %s 2f5a428eb6044c48a90076bcad0c49753a477557 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo 2f5a428eb6044c48a90076bcad0c49753a477557 1565s ++ wc -w 1565s ++ t-sort -u 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== 2f5a428eb6044c48a90076bcad0c49753a477557 Upstream ===== 1565s + test 2f5a428eb6044c48a90076bcad0c49753a477557 = 2f5a428eb6044c48a90076bcad0c49753a477557 1565s + local cetype=Upstream 1565s + '[' xUpstream = xUpstream ']' 1565s + cetype=SAME 1565s ++ git log -n1 --pretty=format:%P 2f5a428eb6044c48a90076bcad0c49753a477557 1565s + local parents=dbe44ad09874a6a4cc7cc047c096dd541f833180 1565s + expect=dbe44ad09874a6a4cc7cc047c096dd541f833180 1565s + enparents=1 1565s + : Upstream/SAME dbe44ad09874a6a4cc7cc047c096dd541f833180 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s ++ printf %s dbe44ad09874a6a4cc7cc047c096dd541f833180 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo dbe44ad09874a6a4cc7cc047c096dd541f833180 1565s ++ t-sort -u 1565s ++ wc -w 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== dbe44ad09874a6a4cc7cc047c096dd541f833180 Upstream ===== 1565s + test dbe44ad09874a6a4cc7cc047c096dd541f833180 = dbe44ad09874a6a4cc7cc047c096dd541f833180 1565s + local cetype=Upstream 1565s + '[' xUpstream = xUpstream ']' 1565s + cetype=SAME 1565s ++ git log -n1 --pretty=format:%P dbe44ad09874a6a4cc7cc047c096dd541f833180 1565s + local parents=2f5c652341e9f1508c8539185075ac0deb3ad68a 1565s + expect=2f5c652341e9f1508c8539185075ac0deb3ad68a 1565s + enparents=1 1565s + : Upstream/SAME 2f5c652341e9f1508c8539185075ac0deb3ad68a 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s ++ printf %s 2f5c652341e9f1508c8539185075ac0deb3ad68a 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo 2f5c652341e9f1508c8539185075ac0deb3ad68a 1565s ++ t-sort -u 1565s ++ wc -w 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== 2f5c652341e9f1508c8539185075ac0deb3ad68a Upstream ===== 1565s + test 2f5c652341e9f1508c8539185075ac0deb3ad68a = 2f5c652341e9f1508c8539185075ac0deb3ad68a 1565s + local cetype=Upstream 1565s + '[' xUpstream = xUpstream ']' 1565s + cetype=SAME 1565s ++ git log -n1 --pretty=format:%P 2f5c652341e9f1508c8539185075ac0deb3ad68a 1565s + local parents=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1565s + expect=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1565s + enparents=1 1565s + : Upstream/SAME 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s ++ printf %s 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1565s ++ t-sort -u 1565s ++ wc -w 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc Upstream ===== 1565s + test 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc = 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1565s + local cetype=Upstream 1565s + '[' xUpstream = xUpstream ']' 1565s + cetype=SAME 1565s ++ git log -n1 --pretty=format:%P 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 1565s + local parents=53c89ace547b642d3714cc2f5cc74a4fc0922af4 1565s + expect=53c89ace547b642d3714cc2f5cc74a4fc0922af4 1565s + enparents=1 1565s + : Upstream/SAME 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s ++ printf %s 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1565s ++ t-sort -u 1565s ++ wc -w 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== 53c89ace547b642d3714cc2f5cc74a4fc0922af4 Upstream ===== 1565s + test 53c89ace547b642d3714cc2f5cc74a4fc0922af4 = 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1565s + local cetype=Upstream 1565s + '[' xUpstream = xUpstream ']' 1565s + cetype=SAME 1565s ++ git log -n1 --pretty=format:%P 53c89ace547b642d3714cc2f5cc74a4fc0922af4 1565s + local parents=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1565s + expect=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1565s + enparents=1 1565s + : Upstream/SAME 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s ++ printf %s 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1565s ++ wc -w 1565s ++ t-sort -u 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 Upstream ===== 1565s + test 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 = 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1565s + local cetype=Upstream 1565s + '[' xUpstream = xUpstream ']' 1565s + cetype=SAME 1565s ++ git log -n1 --pretty=format:%P 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 1565s + local parents=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1565s + expect=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1565s + enparents=1 1565s + : Upstream/SAME e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s ++ printf %s e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1565s ++ t-sort -u 1565s ++ wc -w 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== e7d45cf6ecfa83b4fd6418de6b88f8471799e588 Packaging ===== 1565s + test e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1565s + local cetype=Upstream 1565s + '[' xPackaging = xUpstream ']' 1565s ++ git log -n1 --pretty=format:%P e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1565s + local parents=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1565s + expect=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1565s + enparents=1 1565s + : Packaging/Upstream ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + '[' xY:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 '!=' x ']' 1565s + test Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 1565s + bwtip= 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :. ':!debian' 1565s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :debian/patches 1565s + etypes=Packaging 1565s ++ printf %s ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1565s ++ t-sort -u 1565s ++ wc -w 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== ef1a3b6b02c3b4091eea7c3218709c1aa84c299e Packaging ===== 1565s + test ef1a3b6b02c3b4091eea7c3218709c1aa84c299e = ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1565s + local cetype=Packaging 1565s + '[' xPackaging = xPackaging ']' 1565s + cetype=SAME 1565s ++ git log -n1 --pretty=format:%P ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 1565s + local parents=906c70d0be27939a63e478000e80b0914705ad3a 1565s + expect=906c70d0be27939a63e478000e80b0914705ad3a 1565s + enparents=1 1565s + : Packaging/SAME 906c70d0be27939a63e478000e80b0914705ad3a 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :. ':!debian' 1565s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :debian/patches 1565s + etypes=Packaging 1565s ++ printf %s 906c70d0be27939a63e478000e80b0914705ad3a 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo 906c70d0be27939a63e478000e80b0914705ad3a 1565s ++ wc -w 1565s ++ t-sort -u 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== 906c70d0be27939a63e478000e80b0914705ad3a Packaging ===== 1565s + test 906c70d0be27939a63e478000e80b0914705ad3a = 906c70d0be27939a63e478000e80b0914705ad3a 1565s + local cetype=Packaging 1565s + '[' xPackaging = xPackaging ']' 1565s + cetype=SAME 1565s ++ git log -n1 --pretty=format:%P 906c70d0be27939a63e478000e80b0914705ad3a 1565s + local parents=5052af319e257b8c20174a42da76f055391029f3 1565s + expect=5052af319e257b8c20174a42da76f055391029f3 1565s + enparents=1 1565s + : Packaging/SAME 5052af319e257b8c20174a42da76f055391029f3 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :. ':!debian' 1565s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :debian/patches 1565s + etypes=Packaging 1565s ++ printf %s 5052af319e257b8c20174a42da76f055391029f3 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo 5052af319e257b8c20174a42da76f055391029f3 1565s ++ t-sort -u 1565s ++ wc -w 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== 5052af319e257b8c20174a42da76f055391029f3 Packaging ===== 1565s + test 5052af319e257b8c20174a42da76f055391029f3 = 5052af319e257b8c20174a42da76f055391029f3 1565s + local cetype=Packaging 1565s + '[' xPackaging = xPackaging ']' 1565s + cetype=SAME 1565s ++ git log -n1 --pretty=format:%P 5052af319e257b8c20174a42da76f055391029f3 1565s + local parents=1aefa2934a527f1fa4ddaf809508b879f5086949 1565s + expect=1aefa2934a527f1fa4ddaf809508b879f5086949 1565s + enparents=1 1565s + : Packaging/SAME 1aefa2934a527f1fa4ddaf809508b879f5086949 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :. ':!debian' 1565s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :debian/patches 1565s + etypes=Packaging 1565s ++ printf %s 1aefa2934a527f1fa4ddaf809508b879f5086949 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo 1aefa2934a527f1fa4ddaf809508b879f5086949 1565s ++ t-sort -u 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s ++ wc -w 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== 1aefa2934a527f1fa4ddaf809508b879f5086949 Changelog ===== 1565s + test 1aefa2934a527f1fa4ddaf809508b879f5086949 = 1aefa2934a527f1fa4ddaf809508b879f5086949 1565s + local cetype=Packaging 1565s + '[' xChangelog = xPackaging ']' 1565s ++ git log -n1 --pretty=format:%P 1aefa2934a527f1fa4ddaf809508b879f5086949 1565s + local parents=60728ea4003218c146a7f595c4ff746760566965 1565s + expect=60728ea4003218c146a7f595c4ff746760566965 1565s + enparents=1 1565s + : Changelog/Packaging 60728ea4003218c146a7f595c4ff746760566965 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s + git diff --quiet 60728ea4003218c146a7f595c4ff746760566965..1aefa2934a527f1fa4ddaf809508b879f5086949 -- :. ':!debian/changelog' 1565s + etypes=Packaging 1565s ++ printf %s 60728ea4003218c146a7f595c4ff746760566965 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo 60728ea4003218c146a7f595c4ff746760566965 1565s ++ wc -w 1565s ++ t-sort -u 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== 60728ea4003218c146a7f595c4ff746760566965 Changelog ===== 1565s + test 60728ea4003218c146a7f595c4ff746760566965 = 60728ea4003218c146a7f595c4ff746760566965 1565s + local cetype=Packaging 1565s + '[' xChangelog = xPackaging ']' 1565s ++ git log -n1 --pretty=format:%P 60728ea4003218c146a7f595c4ff746760566965 1565s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1565s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1565s + enparents=1 1565s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..60728ea4003218c146a7f595c4ff746760566965 -- :. ':!debian/changelog' 1565s + etypes=Packaging 1565s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1565s ++ wc -w 1565s + local cnparents=1 1565s + test 1 = 1 1565s ++ for f in $parents 1565s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1565s ++ t-sort -u 1565s ++ wc -w 1565s ++ LC_COLLATE=C 1565s ++ sort -u 1565s + local cndparents=1 1565s + test 1 = 1 1565s + case "$parents" in 1565s + case "$ctype" in 1565s + read cid ctype info 1565s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1565s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1565s + local cetype=Packaging 1565s + '[' xAnchor = xPackaging ']' 1565s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1565s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1565s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1565s + enparents=1 1565s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1565s + case "$ctype/$cetype" in 1565s + case "$ctype/$etypes" in 1565s + case "$cetype" in 1565s + case "$ctype" in 1565s + break 1565s + checkletters= 1565s + '[' x '!=' x ']' 1565s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1565s + work=work-quick-unstitched-laundered 1565s + : '---------- quick unstitched-laundered ----------' 1565s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 1565s + git update-ref --stdin 1565s + sed s/unstitched-laundered/work-quick-unstitched-laundered/ 1565s + git checkout work-quick-unstitched-laundered 1565s Switched to branch 'work-quick-unstitched-laundered' 1565s + checkletters=Sltf 1565s + shift 1565s + before=before-work-quick-unstitched-laundered 1565s + git branch before-work-quick-unstitched-laundered 1565s + local xopts= 1565s + case "$checkletters" in 1565s + case "$checkletters" in 1565s + case "$checkletters" in 1565s + case "$checkletters" in 1565s + t-git-debrebase quick 1565s + local gdr=git-debrebase 1565s + : ' 1565s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1565s + git-debrebase --dgit=dgit -D quick 1565s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-unstitched-laundered 1565s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 0 - 1565s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1565s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1565s git-debrebase = Upstream {"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 1565s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1565s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1565s git-debrebase = Upstream {"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","Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}]} 1565s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1565s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1565s git-debrebase = Upstream {"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Type" => "Upstream","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"} 1565s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1565s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1565s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Type" => "Upstream"} 1565s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1565s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1565s 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"} 1565s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1565s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1565s 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","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2}]} 1565s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1565s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1565s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}]} 1565s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1565s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1565s 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","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"Type" => "Packaging","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 1565s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1565s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1565s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Parents" => [{"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32}],"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"} 1565s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1565s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1565s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","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","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}]} 1565s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1565s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1565s 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" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 1565s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1565s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1565s 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"} 1565s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1565s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1565s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1565s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1565s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1565s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1565s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","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" => "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"} 1565s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1565s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1565s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1565s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 14 1565s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1565s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 1565s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 1565s git-debrebase WALK BUILD 515e62b8d591fcc68597383b955d898db71abc6c Debian (rewriting=0) 1565s git-debrebase WALK BUILD 301cc9756d79fc379acfed35ff33c0785f2e1b7d Debian (rewriting=0) 1565s git-debrebase WALK BUILD f2db5dc7e25f34f0f34d04d0160f912a76b3667d Debian (rewriting=0) 1565s git-debrebase WALK BUILD 86248dea3770451139d1a57015bd9b36aa1ed39c Debian (rewriting=0) 1565s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1565s git-debrebase WALK BUILD 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream (rewriting=0) 1565s git-debrebase WALK BUILD e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream (rewriting=0) 1565s git-debrebase WALK BUILD 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream (rewriting=0) 1565s git-debrebase WALK BUILD b79d513107e3cff19d401deb87cc3e6c4809966e Upstream (rewriting=0) 1565s git-debrebase WALK BUILD eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream (rewriting=0) 1565s git-debrebase WALK BUILD fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream (rewriting=0) 1565s git-debrebase WALK BUILD 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream (rewriting=0) 1565s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1565s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 0 1565s git-debrebase *** WALK RETURN 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 86248dea3770451139d1a57015bd9b36aa1ed39c 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1565s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-unstitched-laundered 1565s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1565s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1565s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"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","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Type" => "Upstream"} 1565s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1565s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1565s git-debrebase = Upstream {"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "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" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}]} 1565s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1565s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1565s git-debrebase = Upstream {"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Type" => "Upstream","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","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1565s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1565s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1565s git-debrebase = 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}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Upstream","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 1565s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1565s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1565s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}],"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Type" => "Upstream"} 1565s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1565s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1565s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"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"} 1565s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1565s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1565s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","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","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 1565s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1565s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1565s git-debrebase = Packaging {"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Type" => "Packaging","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","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0,"Differs" => 32}]} 1565s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1565s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1565s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","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","Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21"} 1565s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1565s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1565s git-debrebase = Packaging {"Type" => "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","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}]} 1565s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1565s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1565s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","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","Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}]} 1565s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1565s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1565s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Type" => "Changelog"} 1565s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1565s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1565s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","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 1530000022 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}]} 1565s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1565s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1565s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1565s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 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","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]]} 1565s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1565s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1565s git-debrebase >= delete refs/ffq-prev/heads/work-quick-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 1565s git-debrebase >= update refs/debrebase-last/heads/work-quick-unstitched-laundered b35dc4c5ac9626e05811f857d83e42693da4c5ce 0000000000000000000000000000000000000000 1565s git-debrebase >= update HEAD b35dc4c5ac9626e05811f857d83e42693da4c5ce 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1565s git-debrebase >$ 1565s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1565s ' 1565s + peel=peel-quick-unstitched-laundered 1565s + git checkout -b peel-quick-unstitched-laundered 1565s Switched to a new branch 'peel-quick-unstitched-laundered' 1565s + t-clean-on-branch peel-quick-unstitched-laundered 1565s + t-output '## peel-quick-unstitched-laundered' git status -b --porcelain 1565s + printf '%s\n' '## peel-quick-unstitched-laundered' 1565s + shift 1565s + git status -b --porcelain 1565s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1565s + : '---------- quick unstitched-laundered Sltf ----------' 1565s + '[' xSltf '!=' x ']' 1565s + : '---- quick unstitched-laundered ...Sltf ----' 1565s + make_check Sltf 1565s + case "$1" in 1565s + t-refs-notexist refs/ffq-prev/heads/work-quick-unstitched-laundered 1565s + local val 1565s + for g in $* 1565s ++ t-git-get-ref refs/ffq-prev/heads/work-quick-unstitched-laundered 1565s ++ local ref=refs/ffq-prev/heads/work-quick-unstitched-laundered 1565s ++ case "$ref" in 1565s ++ perl -ne ' 1565s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-quick-unstitched-laundered\E(?:\^\{\})?$#; 1565s END { print "$x\n" if length $x; } 1565s ' 1565s ++ git show-ref -d refs/ffq-prev/heads/work-quick-unstitched-laundered 1565s ++ test 1 = 1 1565s + val= 1565s + '[' x '!=' x ']' 1565s + t-refs-same-start refs/debrebase-last/heads/work-quick-unstitched-laundered 1565s + unset t_ref_val 1565s + t_ref_names=() 1565s + t-ref-head 1565s + local val 1565s ++ git rev-parse HEAD 1565s + val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 1565s + t-ref-same-val HEAD b35dc4c5ac9626e05811f857d83e42693da4c5ce 1565s + local name=HEAD 1565s + local val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 1565s + case "${t_ref_val-unset}" in 1565s + t_ref_val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 1565s + t_ref_names+=("$name") 1565s + git diff --quiet 'HEAD^1' 1565s + git diff 'HEAD^2' 1565s + grep unstitched-laundered 1565s -Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 1565s - // upstream subcommands refs/heads/unstitched-laundered 1 1565s -+// both! subcommands refs/heads/unstitched-laundered 1 1565s -Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 1565s -+// upstream subcommands refs/heads/unstitched-laundered 1 1565s + git reset --hard 'HEAD^1' 1565s HEAD is now at 5472c89 MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 1565s + checkletters=ltf 1565s + '[' xltf '!=' x ']' 1565s + : '---- quick unstitched-laundered ...ltf ----' 1565s + make_check ltf 1565s + case "$1" in 1565s + git diff --quiet HEAD refs/heads/before-work-quick-unstitched-laundered -- :. ':!debian/patches' 1565s + t-gdr-good laundered 1565s + local state=laundered 1565s + local beforetag= 1565s + case $state in 1565s + git diff --quiet -- :. ':!debian/patches' 1565s + LC_MESSAGES=C 1565s + t-git-debrebase status 1565s + local gdr=git-debrebase 1565s + : ' 1565s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1565s + git-debrebase --dgit=dgit -D status 1565s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1565s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1565s 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","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1565s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1565s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1565s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}],"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Upstream","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1565s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1565s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1565s 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","Type" => "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,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0}]} 1565s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1565s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1565s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 1565s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1565s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1565s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}],"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1565s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1565s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1565s git-debrebase = Upstream {"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2}],"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 1565s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1565s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1565s 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" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2}],"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 1565s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1565s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1565s 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","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 1565s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1565s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1565s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Packaging","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1565s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1565s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1565s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1565s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1565s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1565s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Parents" => [{"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 1565s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1565s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1565s 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","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16,"Ix" => 0}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n"} 1565s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1565s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1565s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","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 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1565s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1565s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1565s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1565s 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","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1565s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-quick-unstitched-laundered 1565s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1565s ' 1565s + case $state in 1565s + egrep '^ *branch is laundered' ../status.check 1565s branch is laundered 1565s + t-gdr-good-analyse HEAD laundered 1565s + local head=HEAD 1565s + local state=laundered 1565s + local wsfx= 1565s + local etypes bwtip 1565s + case $state in 1565s + etypes=Upstream 1565s ++ t-git-debrebase breakwater 1565s ++ local gdr=git-debrebase 1565s ++ : ' 1565s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1565s ++ git-debrebase --dgit=dgit -D breakwater 1565s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1565s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1565s 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" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 1565s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1565s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1565s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Upstream","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","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"} 1565s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1565s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1565s 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","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1565s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1565s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1565s git-debrebase = Upstream {"Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2,"Ix" => 0}],"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","Type" => "Upstream"} 1565s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1565s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1565s git-debrebase = Upstream {"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","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","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 1565s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1565s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1565s 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","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}]} 1565s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1565s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1565s git-debrebase = Upstream {"Type" => "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","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0,"Differs" => 2}]} 1565s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1565s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1565s 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","Differs" => 32,"Ix" => 0}],"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1565s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1565s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1565s git-debrebase = Packaging {"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32,"Ix" => 0}],"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","Type" => "Packaging"} 1565s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1565s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1565s 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","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32,"Ix" => 0}],"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"} 1565s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1565s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1565s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Packaging","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","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"} 1565s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1565s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1565s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Type" => "Changelog","Msg" => "dch -r -D unstable\n"} 1565s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1565s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1565s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"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"} 1565s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1565s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1565s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1565s git-debrebase = Anchor {"Type" => "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" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"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","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 1565s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1565s ' 1565s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1565s + anal=../anal 1565s + t-git-debrebase analyse HEAD 1565s + local gdr=git-debrebase 1565s + : ' 1565s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1565s + git-debrebase --dgit=dgit -D analyse HEAD 1566s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 1566s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1566s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1566s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0,"Differs" => 2}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","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"} 1566s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1566s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1566s 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","Type" => "Upstream","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0,"Differs" => 2}],"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da"} 1566s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1566s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1566s git-debrebase = 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","Type" => "Upstream","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}],"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e"} 1566s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1566s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1566s git-debrebase = Upstream {"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","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"} 1566s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1566s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1566s 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","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}],"Type" => "Upstream","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"} 1566s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1566s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1566s git-debrebase = Upstream {"Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","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"} 1566s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1566s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1566s 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","Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150"} 1566s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1566s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1566s git-debrebase = Packaging {"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Type" => "Packaging","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","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1566s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1566s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1566s git-debrebase = Packaging {"Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","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"} 1566s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1566s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1566s git-debrebase = 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","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"} 1566s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1566s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1566s git-debrebase = Packaging {"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","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f"} 1566s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1566s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1566s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","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"} 1566s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1566s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1566s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"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"} 1566s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1566s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1566s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1566s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1566s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1566s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1566s ' 1566s ++ git rev-parse HEAD 1566s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1566s + exec 1566s + local cid ctype info nparents 1566s + read cid ctype info 1566s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 1566s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1566s + local cetype=Upstream 1566s + '[' xUpstream = xUpstream ']' 1566s + cetype=SAME 1566s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1566s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1566s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1566s + enparents=1 1566s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 1566s ++ wc -w 1566s ++ t-sort -u 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 1566s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 1566s + local cetype=Upstream 1566s + '[' xUpstream = xUpstream ']' 1566s + cetype=SAME 1566s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 1566s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1566s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1566s + enparents=1 1566s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1566s ++ wc -w 1566s ++ t-sort -u 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 1566s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1566s + local cetype=Upstream 1566s + '[' xUpstream = xUpstream ']' 1566s + cetype=SAME 1566s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1566s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 1566s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 1566s + enparents=1 1566s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 1566s ++ wc -w 1566s ++ t-sort -u 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 1566s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 1566s + local cetype=Upstream 1566s + '[' xUpstream = xUpstream ']' 1566s + cetype=SAME 1566s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 1566s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 1566s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 1566s + enparents=1 1566s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 1566s ++ wc -w 1566s ++ t-sort -u 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 1566s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 1566s + local cetype=Upstream 1566s + '[' xUpstream = xUpstream ']' 1566s + cetype=SAME 1566s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 1566s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1566s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1566s + enparents=1 1566s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1566s ++ t-sort -u 1566s ++ wc -w 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 1566s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1566s + local cetype=Upstream 1566s + '[' xUpstream = xUpstream ']' 1566s + cetype=SAME 1566s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1566s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1566s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1566s + enparents=1 1566s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1566s ++ t-sort -u 1566s ++ wc -w 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 1566s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1566s + local cetype=Upstream 1566s + '[' xUpstream = xUpstream ']' 1566s + cetype=SAME 1566s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1566s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 1566s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 1566s + enparents=1 1566s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 1566s ++ wc -w 1566s ++ t-sort -u 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 1566s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 1566s + local cetype=Upstream 1566s + '[' xPackaging = xUpstream ']' 1566s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 1566s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1566s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1566s + enparents=1 1566s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 1566s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1566s + bwtip= 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 1566s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 1566s + etypes=Packaging 1566s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1566s ++ wc -w 1566s ++ t-sort -u 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 1566s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1566s + local cetype=Packaging 1566s + '[' xPackaging = xPackaging ']' 1566s + cetype=SAME 1566s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1566s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1566s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1566s + enparents=1 1566s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 1566s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 1566s + etypes=Packaging 1566s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1566s ++ t-sort -u 1566s ++ wc -w 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 1566s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1566s + local cetype=Packaging 1566s + '[' xPackaging = xPackaging ']' 1566s + cetype=SAME 1566s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1566s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 1566s + expect=515e62b8d591fcc68597383b955d898db71abc6c 1566s + enparents=1 1566s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 1566s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 1566s + etypes=Packaging 1566s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 1566s ++ wc -w 1566s ++ t-sort -u 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 1566s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 1566s + local cetype=Packaging 1566s + '[' xPackaging = xPackaging ']' 1566s + cetype=SAME 1566s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 1566s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 1566s + expect=809643e5389def220ea36d61f2d3dd504603e95a 1566s + enparents=1 1566s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 1566s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 1566s + etypes=Packaging 1566s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 1566s ++ wc -w 1566s ++ t-sort -u 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 1566s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 1566s + local cetype=Packaging 1566s + '[' xChangelog = xPackaging ']' 1566s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 1566s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 1566s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 1566s + enparents=1 1566s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 1566s + etypes=Packaging 1566s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 1566s ++ t-sort -u 1566s ++ wc -w 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 1566s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 1566s + local cetype=Packaging 1566s + '[' xChangelog = xPackaging ']' 1566s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 1566s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1566s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1566s + enparents=1 1566s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 1566s + etypes=Packaging 1566s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1566s ++ wc -w 1566s + local cnparents=1 1566s + test 1 = 1 1566s ++ for f in $parents 1566s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1566s ++ wc -w 1566s ++ t-sort -u 1566s ++ LC_COLLATE=C 1566s ++ sort -u 1566s + local cndparents=1 1566s + test 1 = 1 1566s + case "$parents" in 1566s + case "$ctype" in 1566s + read cid ctype info 1566s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1566s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1566s + local cetype=Packaging 1566s + '[' xAnchor = xPackaging ']' 1566s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1566s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1566s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1566s + enparents=1 1566s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1566s + case "$ctype/$cetype" in 1566s + case "$ctype/$etypes" in 1566s + case "$cetype" in 1566s + case "$ctype" in 1566s + break 1566s + checkletters=tf 1566s + '[' xtf '!=' x ']' 1566s + : '---- quick unstitched-laundered ...tf ----' 1566s + make_check tf 1566s + case "$1" in 1566s + git diff --quiet HEAD refs/heads/before-work-quick-unstitched-laundered 1566s + checkletters=f 1566s + '[' xf '!=' x ']' 1566s + : '---- quick unstitched-laundered ...f ----' 1566s + make_check f 1566s + case "$1" in 1566s + t-has-ancestor HEAD refs/heads/before-work-quick-unstitched-laundered 1566s + local now 1566s ++ git rev-parse HEAD 1566s + now=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1566s + local ancestor 1566s ++ git rev-parse 'HEAD^{}' 1566s + ancestor=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1566s + local mbase 1566s ++ t-git-merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1566s ++ git merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1566s + mbase=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1566s + '[' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f '!=' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f ']' 1566s + checkletters= 1566s + '[' x '!=' x ']' 1566s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1566s + work=work-quick-unstitched-mixed 1566s + : '---------- quick unstitched-mixed ----------' 1566s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 1566s + git update-ref --stdin 1566s + sed s/unstitched-mixed/work-quick-unstitched-mixed/ 1566s + git checkout work-quick-unstitched-mixed 1566s Switched to branch 'work-quick-unstitched-mixed' 1566s + checkletters=Sl 1566s + shift 1566s + before=before-work-quick-unstitched-mixed 1566s + git branch before-work-quick-unstitched-mixed 1566s + local xopts= 1566s + case "$checkletters" in 1566s + case "$checkletters" in 1566s + case "$checkletters" in 1566s + case "$checkletters" in 1566s + t-git-debrebase quick 1566s + local gdr=git-debrebase 1566s + : ' 1566s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1566s + git-debrebase --dgit=dgit -D quick 1566s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-unstitched-mixed 1566s git-debrebase *** WALK 9b56b9c2600dc10b9eec97d535d89870476de971 0 - 1566s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 1566s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 1566s 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","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n","Type" => "Mixed","Parents" => [{"Ix" => 0,"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Differs" => 34}],"Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9"} 1566s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 1566s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 1566s 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","Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Ix" => 0}]} 1566s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 1566s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 1566s git-debrebase = Packaging {"Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386"}],"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","CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e"} 1566s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 1566s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 1566s git-debrebase = 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","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","Type" => "AddPatches","Parents" => [{"Ix" => 0,"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Differs" => 4}]} 1566s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 1566s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 1566s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n","CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Hdr" => "tree 4d870e59c3a21c2e6202b59474df673e46ef6449\nparent 5138bd8205d6eeb162d87a2d085746c0c305261c\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449","Type" => "Mixed","Parents" => [{"Ix" => 0,"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Differs" => 34}]} 1566s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 1566s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 1566s git-debrebase = 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","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433"}],"Type" => "Upstream"} 1566s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 1566s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 1566s git-debrebase = 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","CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Differs" => 32}]} 1566s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1566s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 1566s git-debrebase = Upstream {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Differs" => 2,"Ix" => 0}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 1566s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1566s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 1566s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Ix" => 0}]} 1566s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1566s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 1566s git-debrebase = Upstream {"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","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Type" => "Upstream","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 2,"Ix" => 0}]} 1566s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1566s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1566s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1566s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1566s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1566s git-debrebase = Changelog {"Type" => "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","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1566s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1566s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1566s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1566s git-debrebase = Anchor {"Type" => "Anchor","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1566s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 7 proc 15 pm -1 1566s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1566s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1566s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 1566s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1566s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 1566s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 1566s git-debrebase WALK BUILD a4efcc9f58a06f20c5de1258de24211048e99433 Debian (rewriting=0) 1566s git-debrebase WALK REWRITING NOW cl=HASH(0x882e0850250) procd=HASH(0x882e086f360) 1566s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1566s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Debian (rewriting=1) 1566s git-debrebase WALK BUILD 5360dd228488e99ffa3d55e906ddc0de1c111c4e Debian (rewriting=1) 1566s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1566s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Debian (rewriting=1) 1566s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1566s git-debrebase WALK BUILD eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 Upstream (rewriting=1) 1566s git-debrebase WALK BUILD ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b Upstream (rewriting=1) 1566s git-debrebase WALK BUILD 9f40936eece8f6452df026cc64200db82005a166 Upstream (rewriting=1) 1566s git-debrebase WALK BUILD 5138bd8205d6eeb162d87a2d085746c0c305261c Upstream (rewriting=1) 1566s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Upstream (rewriting=1) 1566s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1566s git-debrebase WALK BUILD 5668ce44fba4db3f42ac837f0104a9335a819367 Upstream (rewriting=1) 1566s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Upstream (rewriting=1) 1566s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1566s git-debrebase get_differs 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 = 0x4 1566s git-debrebase *** WALK RETURN 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 72e35041bfbd2d841ef8d4b4bf24616be30909ce 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1566s git-debrebase: laundered (head was 9b56b9c2600dc10b9eec97d535d89870476de971) 1566s git-debrebase >= update HEAD 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 1566s git-debrebase >$ 1566s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-unstitched-mixed 1566s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1566s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1566s git-debrebase = Upstream {"Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","Parents" => [{"Differs" => 2,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Ix" => 0}],"Type" => "Upstream","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","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb"} 1566s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1566s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1566s git-debrebase = Upstream {"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","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23"}]} 1566s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1566s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1566s git-debrebase = Upstream {"Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42"}],"Type" => "Upstream","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"} 1566s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1566s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1566s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Ix" => 0}],"Type" => "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","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n"} 1566s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1566s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1566s git-debrebase = 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","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198"}],"Type" => "Upstream"} 1566s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1566s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1566s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"}],"Type" => "Upstream","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","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"} 1566s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1566s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1566s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"}],"Type" => "Upstream","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1566s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1566s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1566s git-debrebase = Packaging {"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" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c"}],"Type" => "Packaging","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67"} 1566s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1566s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1566s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Differs" => 32}],"Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","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"} 1566s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1566s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1566s git-debrebase = Packaging {"Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Parents" => [{"Ix" => 0,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32}],"Type" => "Packaging","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","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0"} 1566s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1566s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1566s git-debrebase = 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","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Type" => "Packaging"} 1566s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1566s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1566s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"Differs" => 16,"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","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 1566s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1566s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1566s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Type" => "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","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1566s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1566s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1566s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1566s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [{"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","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]],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1566s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1566s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1566s git-debrebase >= delete refs/ffq-prev/heads/work-quick-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1566s git-debrebase >= update refs/debrebase-last/heads/work-quick-unstitched-mixed 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 0000000000000000000000000000000000000000 1566s git-debrebase >= update HEAD 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1566s git-debrebase >$ 1566s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1566s ' 1566s + peel=peel-quick-unstitched-mixed 1566s + git checkout -b peel-quick-unstitched-mixed 1566s Switched to a new branch 'peel-quick-unstitched-mixed' 1566s + t-clean-on-branch peel-quick-unstitched-mixed 1566s + t-output '## peel-quick-unstitched-mixed' git status -b --porcelain 1566s + printf '%s\n' '## peel-quick-unstitched-mixed' 1566s + shift 1566s + git status -b --porcelain 1566s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1566s + : '---------- quick unstitched-mixed Sl ----------' 1566s + '[' xSl '!=' x ']' 1566s + : '---- quick unstitched-mixed ...Sl ----' 1566s + make_check Sl 1566s + case "$1" in 1566s + t-refs-notexist refs/ffq-prev/heads/work-quick-unstitched-mixed 1566s + local val 1566s + for g in $* 1566s ++ t-git-get-ref refs/ffq-prev/heads/work-quick-unstitched-mixed 1566s ++ local ref=refs/ffq-prev/heads/work-quick-unstitched-mixed 1566s ++ case "$ref" in 1566s ++ git show-ref -d refs/ffq-prev/heads/work-quick-unstitched-mixed 1566s ++ perl -ne ' 1566s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-quick-unstitched-mixed\E(?:\^\{\})?$#; 1566s END { print "$x\n" if length $x; } 1566s ' 1566s ++ test 1 = 1 1566s + val= 1566s + '[' x '!=' x ']' 1566s + t-refs-same-start refs/debrebase-last/heads/work-quick-unstitched-mixed 1566s + unset t_ref_val 1566s + t_ref_names=() 1566s + t-ref-head 1566s + local val 1566s ++ git rev-parse HEAD 1566s + val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 1566s + t-ref-same-val HEAD 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 1566s + local name=HEAD 1566s + local val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 1566s + case "${t_ref_val-unset}" in 1566s + t_ref_val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 1566s + t_ref_names+=("$name") 1566s + git diff --quiet 'HEAD^1' 1566s + git diff 'HEAD^2' 1566s + grep unstitched-mixed 1566s +// debian subcommands refs/heads/unstitched-mixed 1 1566s +// both! subcommands refs/heads/unstitched-mixed 1 1566s +// debian subcommands refs/heads/unstitched-mixed 2 1566s +// both! subcommands refs/heads/unstitched-mixed 2 1566s +// upstream subcommands refs/heads/unstitched-mixed 1 1566s +// both! subcommands refs/heads/unstitched-mixed 1 1566s +// upstream subcommands refs/heads/unstitched-mixed 2 1566s +// both! subcommands refs/heads/unstitched-mixed 2 1566s + git reset --hard 'HEAD^1' 1566s HEAD is now at 7b7a1b7 MIXED add both() (subcommands refs/heads/unstitched-mixed 2) 1566s + checkletters=l 1566s + '[' xl '!=' x ']' 1566s + : '---- quick unstitched-mixed ...l ----' 1566s + make_check l 1566s + case "$1" in 1566s + git diff --quiet HEAD refs/heads/before-work-quick-unstitched-mixed -- :. ':!debian/patches' 1566s + t-gdr-good laundered 1566s + local state=laundered 1566s + local beforetag= 1566s + case $state in 1566s + git diff --quiet -- :. ':!debian/patches' 1566s + LC_MESSAGES=C 1566s + t-git-debrebase status 1566s + local gdr=git-debrebase 1566s + : ' 1566s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1566s + git-debrebase --dgit=dgit -D status 1566s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1566s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1566s 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}]} 1566s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1566s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1566s git-debrebase = Upstream {"Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Parents" => [{"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1566s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1566s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1566s git-debrebase = Upstream {"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Type" => "Upstream","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","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Parents" => [{"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Differs" => 2,"Ix" => 0}]} 1566s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1566s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1566s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","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" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a"}]} 1566s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1566s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1566s git-debrebase = Upstream {"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Type" => "Upstream","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","Parents" => [{"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2,"Ix" => 0}]} 1566s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1566s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1566s git-debrebase = Upstream {"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","Type" => "Upstream","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Parents" => [{"Ix" => 0,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Differs" => 2}],"Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8"} 1566s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1566s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1566s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"}],"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","Type" => "Upstream"} 1566s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1566s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1566s git-debrebase = Packaging {"Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Parents" => [{"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Differs" => 32,"Ix" => 0}],"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Type" => "Packaging","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"} 1566s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1566s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1566s git-debrebase = Packaging {"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","Type" => "Packaging","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Parents" => [{"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Differs" => 32,"Ix" => 0}],"Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578"} 1566s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1566s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1566s git-debrebase = Packaging {"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","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","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0"}]} 1566s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1566s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1566s git-debrebase = 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","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169"} 1566s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1566s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1566s 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","Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1566s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1566s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1566s git-debrebase = Changelog {"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","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}]} 1566s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1566s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1566s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1566s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor"} 1566s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-quick-unstitched-mixed 1566s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1566s ' 1566s + case $state in 1566s + egrep '^ *branch is laundered' ../status.check 1566s branch is laundered 1566s + t-gdr-good-analyse HEAD laundered 1566s + local head=HEAD 1566s + local state=laundered 1566s + local wsfx= 1566s + local etypes bwtip 1566s + case $state in 1566s + etypes=Upstream 1566s ++ t-git-debrebase breakwater 1566s ++ local gdr=git-debrebase 1566s ++ : ' 1566s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1566s ++ git-debrebase --dgit=dgit -D breakwater 1567s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1567s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1567s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45"}],"Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb"} 1567s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1567s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1567s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","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"} 1567s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1567s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1567s 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","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1567s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1567s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1567s git-debrebase = Upstream {"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","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"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Upstream"} 1567s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1567s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1567s git-debrebase = Upstream {"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 1567s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1567s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1567s git-debrebase = Upstream {"Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"}],"Type" => "Upstream"} 1567s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1567s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1567s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Ix" => 0,"Differs" => 2}]} 1567s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1567s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1567s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Ix" => 0,"Differs" => 32}],"Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67"} 1567s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1567s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1567s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0"}],"Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","Type" => "Packaging"} 1567s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1567s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1567s 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","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32,"Ix" => 0}],"Type" => "Packaging"} 1567s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1567s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1567s git-debrebase = Packaging {"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Packaging"} 1567s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1567s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1567s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","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"} 1567s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1567s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1567s 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","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Type" => "Changelog"} 1567s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1567s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1567s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1567s 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,"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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 1567s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1567s ' 1567s + bwtip=Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 1567s + anal=../anal 1567s + t-git-debrebase analyse HEAD 1567s + local gdr=git-debrebase 1567s + : ' 1567s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1567s + git-debrebase --dgit=dgit -D analyse HEAD 1567s git-debrebase *** WALK 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1 *main::STDOUT 1567s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1567s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1567s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Differs" => 2,"Ix" => 0}],"Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1567s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1567s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1567s git-debrebase = Upstream {"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23"}],"Type" => "Upstream","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2"} 1567s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1567s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1567s 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","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42"}],"Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1567s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1567s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1567s git-debrebase = Upstream {"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a"}],"Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1567s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1567s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1567s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198"}],"Type" => "Upstream"} 1567s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1567s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1567s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8"} 1567s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1567s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1567s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"}],"Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b"} 1567s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1567s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1567s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c"}],"Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1567s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1567s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1567s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0"}],"Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n"} 1567s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1567s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1567s git-debrebase = Packaging {"Parents" => [{"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1567s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1567s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1567s git-debrebase = Packaging {"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Type" => "Packaging","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"} 1567s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1567s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1567s 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","Type" => "Changelog","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"Msg" => "dch -r -D unstable\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 1567s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1567s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1567s 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","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 1567s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1567s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1567s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1567s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 1567s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1567s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1567s ' 1567s ++ git rev-parse HEAD 1567s + expect=7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1567s + exec 1567s + local cid ctype info nparents 1567s + read cid ctype info 1567s + : ===== 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb Upstream ===== 1567s + test 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb = 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1567s + local cetype=Upstream 1567s + '[' xUpstream = xUpstream ']' 1567s + cetype=SAME 1567s ++ git log -n1 --pretty=format:%P 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1567s + local parents=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1567s + expect=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1567s + enparents=1 1567s + : Upstream/SAME 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s ++ printf %s 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1567s ++ t-sort -u 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s ++ wc -w 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 Upstream ===== 1567s + test 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 = 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1567s + local cetype=Upstream 1567s + '[' xUpstream = xUpstream ']' 1567s + cetype=SAME 1567s ++ git log -n1 --pretty=format:%P 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1567s + local parents=439c17a177f0446ce30950b9b8e91f43c101cc23 1567s + expect=439c17a177f0446ce30950b9b8e91f43c101cc23 1567s + enparents=1 1567s + : Upstream/SAME 439c17a177f0446ce30950b9b8e91f43c101cc23 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s ++ printf %s 439c17a177f0446ce30950b9b8e91f43c101cc23 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo 439c17a177f0446ce30950b9b8e91f43c101cc23 1567s ++ wc -w 1567s ++ t-sort -u 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== 439c17a177f0446ce30950b9b8e91f43c101cc23 Upstream ===== 1567s + test 439c17a177f0446ce30950b9b8e91f43c101cc23 = 439c17a177f0446ce30950b9b8e91f43c101cc23 1567s + local cetype=Upstream 1567s + '[' xUpstream = xUpstream ']' 1567s + cetype=SAME 1567s ++ git log -n1 --pretty=format:%P 439c17a177f0446ce30950b9b8e91f43c101cc23 1567s + local parents=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1567s + expect=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1567s + enparents=1 1567s + : Upstream/SAME 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s ++ printf %s 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1567s ++ t-sort -u 1567s ++ wc -w 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 Upstream ===== 1567s + test 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 = 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1567s + local cetype=Upstream 1567s + '[' xUpstream = xUpstream ']' 1567s + cetype=SAME 1567s ++ git log -n1 --pretty=format:%P 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1567s + local parents=f96b8ee9c829c22ea92f8e82e2048017db012c8a 1567s + expect=f96b8ee9c829c22ea92f8e82e2048017db012c8a 1567s + enparents=1 1567s + : Upstream/SAME f96b8ee9c829c22ea92f8e82e2048017db012c8a 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s ++ printf %s f96b8ee9c829c22ea92f8e82e2048017db012c8a 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo f96b8ee9c829c22ea92f8e82e2048017db012c8a 1567s ++ t-sort -u 1567s ++ wc -w 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== f96b8ee9c829c22ea92f8e82e2048017db012c8a Upstream ===== 1567s + test f96b8ee9c829c22ea92f8e82e2048017db012c8a = f96b8ee9c829c22ea92f8e82e2048017db012c8a 1567s + local cetype=Upstream 1567s + '[' xUpstream = xUpstream ']' 1567s + cetype=SAME 1567s ++ git log -n1 --pretty=format:%P f96b8ee9c829c22ea92f8e82e2048017db012c8a 1567s + local parents=e143304e38e5e9a822f93056dad834788c62e198 1567s + expect=e143304e38e5e9a822f93056dad834788c62e198 1567s + enparents=1 1567s + : Upstream/SAME e143304e38e5e9a822f93056dad834788c62e198 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s ++ printf %s e143304e38e5e9a822f93056dad834788c62e198 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo e143304e38e5e9a822f93056dad834788c62e198 1567s ++ t-sort -u 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s ++ wc -w 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== e143304e38e5e9a822f93056dad834788c62e198 Upstream ===== 1567s + test e143304e38e5e9a822f93056dad834788c62e198 = e143304e38e5e9a822f93056dad834788c62e198 1567s + local cetype=Upstream 1567s + '[' xUpstream = xUpstream ']' 1567s + cetype=SAME 1567s ++ git log -n1 --pretty=format:%P e143304e38e5e9a822f93056dad834788c62e198 1567s + local parents=195f145753880dd4e5c1ff65136bb523cb2940c4 1567s + expect=195f145753880dd4e5c1ff65136bb523cb2940c4 1567s + enparents=1 1567s + : Upstream/SAME 195f145753880dd4e5c1ff65136bb523cb2940c4 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s ++ printf %s 195f145753880dd4e5c1ff65136bb523cb2940c4 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo 195f145753880dd4e5c1ff65136bb523cb2940c4 1567s ++ t-sort -u 1567s ++ wc -w 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== 195f145753880dd4e5c1ff65136bb523cb2940c4 Upstream ===== 1567s + test 195f145753880dd4e5c1ff65136bb523cb2940c4 = 195f145753880dd4e5c1ff65136bb523cb2940c4 1567s + local cetype=Upstream 1567s + '[' xUpstream = xUpstream ']' 1567s + cetype=SAME 1567s ++ git log -n1 --pretty=format:%P 195f145753880dd4e5c1ff65136bb523cb2940c4 1567s + local parents=72e35041bfbd2d841ef8d4b4bf24616be30909ce 1567s + expect=72e35041bfbd2d841ef8d4b4bf24616be30909ce 1567s + enparents=1 1567s + : Upstream/SAME 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s ++ printf %s 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1567s ++ t-sort -u 1567s ++ wc -w 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== 72e35041bfbd2d841ef8d4b4bf24616be30909ce Packaging ===== 1567s + test 72e35041bfbd2d841ef8d4b4bf24616be30909ce = 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1567s + local cetype=Upstream 1567s + '[' xPackaging = xUpstream ']' 1567s ++ git log -n1 --pretty=format:%P 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1567s + local parents=7c13e61bd6887af7ef124f8331a541ae7431bc7c 1567s + expect=7c13e61bd6887af7ef124f8331a541ae7431bc7c 1567s + enparents=1 1567s + : Packaging/Upstream 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + '[' xY:72e35041bfbd2d841ef8d4b4bf24616be30909ce '!=' x ']' 1567s + test Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce = Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 1567s + bwtip= 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :. ':!debian' 1567s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :debian/patches 1567s + etypes=Packaging 1567s ++ printf %s 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1567s ++ wc -w 1567s ++ t-sort -u 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== 7c13e61bd6887af7ef124f8331a541ae7431bc7c Packaging ===== 1567s + test 7c13e61bd6887af7ef124f8331a541ae7431bc7c = 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1567s + local cetype=Packaging 1567s + '[' xPackaging = xPackaging ']' 1567s + cetype=SAME 1567s ++ git log -n1 --pretty=format:%P 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1567s + local parents=63bb83776dc0439e7e1f38011cc3230347a1f3a0 1567s + expect=63bb83776dc0439e7e1f38011cc3230347a1f3a0 1567s + enparents=1 1567s + : Packaging/SAME 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :. ':!debian' 1567s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :debian/patches 1567s + etypes=Packaging 1567s ++ printf %s 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1567s ++ wc -w 1567s ++ t-sort -u 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== 63bb83776dc0439e7e1f38011cc3230347a1f3a0 Packaging ===== 1567s + test 63bb83776dc0439e7e1f38011cc3230347a1f3a0 = 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1567s + local cetype=Packaging 1567s + '[' xPackaging = xPackaging ']' 1567s + cetype=SAME 1567s ++ git log -n1 --pretty=format:%P 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1567s + local parents=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1567s + expect=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1567s + enparents=1 1567s + : Packaging/SAME 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :. ':!debian' 1567s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :debian/patches 1567s + etypes=Packaging 1567s ++ printf %s 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1567s ++ t-sort -u 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s ++ wc -w 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 Packaging ===== 1567s + test 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 = 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1567s + local cetype=Packaging 1567s + '[' xPackaging = xPackaging ']' 1567s + cetype=SAME 1567s ++ git log -n1 --pretty=format:%P 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1567s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 1567s + expect=809643e5389def220ea36d61f2d3dd504603e95a 1567s + enparents=1 1567s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :. ':!debian' 1567s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :debian/patches 1567s + etypes=Packaging 1567s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 1567s ++ wc -w 1567s ++ t-sort -u 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 1567s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 1567s + local cetype=Packaging 1567s + '[' xChangelog = xPackaging ']' 1567s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 1567s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 1567s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 1567s + enparents=1 1567s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 1567s + etypes=Packaging 1567s ++ wc -w 1567s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 1567s ++ wc -w 1567s ++ t-sort -u 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 1567s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 1567s + local cetype=Packaging 1567s + '[' xChangelog = xPackaging ']' 1567s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 1567s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1567s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1567s + enparents=1 1567s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 1567s + etypes=Packaging 1567s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1567s ++ wc -w 1567s + local cnparents=1 1567s + test 1 = 1 1567s ++ for f in $parents 1567s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1567s ++ t-sort -u 1567s ++ LC_COLLATE=C 1567s ++ sort -u 1567s ++ wc -w 1567s + local cndparents=1 1567s + test 1 = 1 1567s + case "$parents" in 1567s + case "$ctype" in 1567s + read cid ctype info 1567s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1567s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1567s + local cetype=Packaging 1567s + '[' xAnchor = xPackaging ']' 1567s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1567s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1567s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1567s + enparents=1 1567s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1567s + case "$ctype/$cetype" in 1567s + case "$ctype/$etypes" in 1567s + case "$cetype" in 1567s + case "$ctype" in 1567s + break 1567s + checkletters= 1567s + '[' x '!=' x ']' 1567s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1567s + work=work-quick-raw-converted-from-gbp 1567s + : '---------- quick raw-converted-from-gbp ----------' 1567s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 1567s + git update-ref --stdin 1567s + sed s/raw-converted-from-gbp/work-quick-raw-converted-from-gbp/ 1567s + git checkout work-quick-raw-converted-from-gbp 1567s Switched to branch 'work-quick-raw-converted-from-gbp' 1567s + checkletters=n 1567s + shift 1567s + before=before-work-quick-raw-converted-from-gbp 1567s + git branch before-work-quick-raw-converted-from-gbp 1567s + local xopts= 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + t-git-debrebase quick 1567s + local gdr=git-debrebase 1567s + : ' 1567s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1567s + git-debrebase --dgit=dgit -D quick 1567s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-raw-converted-from-gbp 1567s git-debrebase ffq check_specs * 1567s git-debrebase *** WALK 178896af44c5b02e05a3442df6c33233b6acb807 0 - 1567s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1567s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1567s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2,"Ix" => 0}],"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1567s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1567s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1567s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}],"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1567s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1567s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1567s git-debrebase = Upstream {"Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 2}],"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"} 1567s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1567s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1567s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1567s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1567s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw -1 upp 2 proc 3 pm -1 1567s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1567s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1567s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 4 1567s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1567s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1567s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=0) 1567s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=0) 1567s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=0) 1567s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1567s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 = 0 1567s git-debrebase *** WALK RETURN 178896af44c5b02e05a3442df6c33233b6acb807 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1567s git-debrebase: laundered (head was 178896af44c5b02e05a3442df6c33233b6acb807) 1567s git-debrebase >= update refs/ffq-prev/heads/work-quick-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 0000000000000000000000000000000000000000 1567s git-debrebase >= delete refs/debrebase-last/heads/work-quick-raw-converted-from-gbp 1567s git-debrebase >= update HEAD 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 1567s git-debrebase >$ 1567s Recorded previous head for preservation 1567s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-raw-converted-from-gbp 1567s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1567s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1567s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","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","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0,"Differs" => 2}]} 1567s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1567s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1567s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","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","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"} 1567s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1567s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1567s git-debrebase = Upstream {"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","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"}],"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1567s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1567s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1567s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1567s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$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"} 1567s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 = 0 1567s git-debrebase >= delete refs/ffq-prev/heads/work-quick-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1567s git-debrebase >= update refs/debrebase-last/heads/work-quick-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 0000000000000000000000000000000000000000 1567s git-debrebase >= update HEAD 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 1567s git-debrebase >$ 1567s HEAD is now at 178896a Add another new upstream file 1567s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1567s ' 1567s + peel=peel-quick-raw-converted-from-gbp 1567s + git checkout -b peel-quick-raw-converted-from-gbp 1567s Switched to a new branch 'peel-quick-raw-converted-from-gbp' 1567s + t-clean-on-branch peel-quick-raw-converted-from-gbp 1567s + t-output '## peel-quick-raw-converted-from-gbp' git status -b --porcelain 1567s + printf '%s\n' '## peel-quick-raw-converted-from-gbp' 1567s + shift 1567s + git status -b --porcelain 1567s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1567s + : '---------- quick raw-converted-from-gbp n ----------' 1567s + '[' xn '!=' x ']' 1567s + : '---- quick raw-converted-from-gbp ...n ----' 1567s + make_check n 1567s + case "$1" in 1567s + t-refs-same-start 1567s + unset t_ref_val 1567s + t_ref_names=() 1567s + t-refs-same refs/heads/before-work-quick-raw-converted-from-gbp refs/heads/peel-quick-raw-converted-from-gbp 1567s + local g 1567s + for g in $* 1567s + t-ref-same refs/heads/before-work-quick-raw-converted-from-gbp 1567s + local name=refs/heads/before-work-quick-raw-converted-from-gbp 1567s + local val 1567s ++ t-git-get-ref refs/heads/before-work-quick-raw-converted-from-gbp 1567s ++ local ref=refs/heads/before-work-quick-raw-converted-from-gbp 1567s ++ case "$ref" in 1567s ++ git show-ref -d refs/heads/before-work-quick-raw-converted-from-gbp 1567s ++ perl -ne ' 1567s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-quick-raw-converted-from-gbp\E(?:\^\{\})?$#; 1567s END { print "$x\n" if length $x; } 1567s ' 1567s + val=178896af44c5b02e05a3442df6c33233b6acb807 1567s + t-ref-same-val refs/heads/before-work-quick-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1567s + local name=refs/heads/before-work-quick-raw-converted-from-gbp 1567s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1567s + case "${t_ref_val-unset}" in 1567s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1567s + t_ref_names+=("$name") 1567s + for g in $* 1567s + t-ref-same refs/heads/peel-quick-raw-converted-from-gbp 1567s + local name=refs/heads/peel-quick-raw-converted-from-gbp 1567s + local val 1567s ++ t-git-get-ref refs/heads/peel-quick-raw-converted-from-gbp 1567s ++ local ref=refs/heads/peel-quick-raw-converted-from-gbp 1567s ++ case "$ref" in 1567s ++ git show-ref -d refs/heads/peel-quick-raw-converted-from-gbp 1567s ++ perl -ne ' 1567s $x = $1 if m#^(\w+) \Qrefs/heads/peel-quick-raw-converted-from-gbp\E(?:\^\{\})?$#; 1567s END { print "$x\n" if length $x; } 1567s ' 1567s + val=178896af44c5b02e05a3442df6c33233b6acb807 1567s + t-ref-same-val refs/heads/peel-quick-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1567s + local name=refs/heads/peel-quick-raw-converted-from-gbp 1567s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1567s + case "${t_ref_val-unset}" in 1567s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1567s + t_ref_names+=("$name") 1567s + checkletters= 1567s + '[' x '!=' x ']' 1567s + subcmd conclude 'F:No ongoing git-debrebase session' 'F:No ongoing git-debrebase session' Sltf Sl N 1567s + local subcmd=conclude 1567s + shift 1567s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1567s + work=work-conclude-stitched-laundered 1567s + : '---------- conclude stitched-laundered ----------' 1567s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 1567s + git update-ref --stdin 1567s + sed s/stitched-laundered/work-conclude-stitched-laundered/ 1567s + git checkout work-conclude-stitched-laundered 1567s Switched to branch 'work-conclude-stitched-laundered' 1567s + checkletters='F:No ongoing git-debrebase session' 1567s + shift 1567s + before=before-work-conclude-stitched-laundered 1567s + git branch before-work-conclude-stitched-laundered 1567s + local xopts= 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + t-expect-fail 'F:No ongoing git-debrebase session' t-git-debrebase conclude 1567s + local 'mpat=F:No ongoing git-debrebase session' 1567s + shift 1567s + set +o pipefail 1567s + LC_MESSAGES=C 1567s + LANGUAGE=C 1567s + t-git-debrebase conclude 1567s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1567s + local gdr=git-debrebase 1567s + : ' 1567s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1567s + git-debrebase --dgit=dgit -D conclude 1567s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-stitched-laundered 1567s 1567s git-debrebase: error: No ongoing git-debrebase session. 1567s + local 'ps=255 0' 1567s + set -o pipefail 1567s + case $ps in 1567s + t-grep-mpat 'F:No ongoing git-debrebase session' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1567s + local 'mpat=F:No ongoing git-debrebase session' 1567s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1567s + local grepper=fgrep 1567s + case "$mpat" in 1567s + case "$mpat" in 1567s + grepper=fgrep 1567s + mpat='No ongoing git-debrebase session' 1567s + fgrep -e 'No ongoing git-debrebase session' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1567s git-debrebase: error: No ongoing git-debrebase session. 1567s + continue 1567s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1567s + work=work-conclude-stitched-mixed 1567s + : '---------- conclude stitched-mixed ----------' 1567s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 1567s + git update-ref --stdin 1567s + sed s/stitched-mixed/work-conclude-stitched-mixed/ 1567s + git checkout work-conclude-stitched-mixed 1567s Switched to branch 'work-conclude-stitched-mixed' 1567s + checkletters='F:No ongoing git-debrebase session' 1567s + shift 1567s + before=before-work-conclude-stitched-mixed 1567s + git branch before-work-conclude-stitched-mixed 1567s + local xopts= 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + t-expect-fail 'F:No ongoing git-debrebase session' t-git-debrebase conclude 1567s + local 'mpat=F:No ongoing git-debrebase session' 1567s + shift 1567s + set +o pipefail 1567s + LC_MESSAGES=C 1567s + LANGUAGE=C 1567s + t-git-debrebase conclude 1567s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1567s + local gdr=git-debrebase 1567s + : ' 1567s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1567s + git-debrebase --dgit=dgit -D conclude 1567s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-stitched-mixed 1567s 1567s git-debrebase: error: No ongoing git-debrebase session. 1567s + local 'ps=255 0' 1567s + set -o pipefail 1567s + case $ps in 1567s + t-grep-mpat 'F:No ongoing git-debrebase session' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1567s + local 'mpat=F:No ongoing git-debrebase session' 1567s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1567s + local grepper=fgrep 1567s + case "$mpat" in 1567s + case "$mpat" in 1567s + grepper=fgrep 1567s + mpat='No ongoing git-debrebase session' 1567s + fgrep -e 'No ongoing git-debrebase session' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1567s git-debrebase: error: No ongoing git-debrebase session. 1567s + continue 1567s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1567s + work=work-conclude-unstitched-laundered 1567s + : '---------- conclude unstitched-laundered ----------' 1567s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 1567s + git update-ref --stdin 1567s + sed s/unstitched-laundered/work-conclude-unstitched-laundered/ 1567s + git checkout work-conclude-unstitched-laundered 1567s Switched to branch 'work-conclude-unstitched-laundered' 1567s + checkletters=Sltf 1567s + shift 1567s + before=before-work-conclude-unstitched-laundered 1567s + git branch before-work-conclude-unstitched-laundered 1567s + local xopts= 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + case "$checkletters" in 1567s + t-git-debrebase conclude 1567s + local gdr=git-debrebase 1567s + : ' 1567s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1567s + git-debrebase --dgit=dgit -D conclude 1567s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-laundered 1567s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-laundered 1567s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 0 - 1567s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1567s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1567s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2}],"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"} 1568s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1568s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1568s git-debrebase = Upstream {"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}]} 1568s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1568s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1568s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2}],"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","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"} 1568s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1568s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1568s git-debrebase = 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","Type" => "Upstream","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2,"Ix" => 0}]} 1568s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1568s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1568s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}],"Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1568s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1568s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1568s 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","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}]} 1568s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1568s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1568s git-debrebase = Upstream {"Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","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" => "967132c54ba679bab3250ffd973e6c5b05514150","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"} 1568s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1568s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1568s 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","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32,"Ix" => 0}]} 1568s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1568s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1568s git-debrebase = Packaging {"Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","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","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21"} 1568s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1568s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1568s 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","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}]} 1568s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1568s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1568s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","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"} 1568s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1568s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1568s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n"} 1568s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1568s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1568s 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","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}]} 1568s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1568s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1568s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1568s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","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"} 1568s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1568s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1568s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1568s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 14 1568s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1568s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 1568s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 1568s git-debrebase WALK BUILD 515e62b8d591fcc68597383b955d898db71abc6c Debian (rewriting=0) 1568s git-debrebase WALK BUILD 301cc9756d79fc379acfed35ff33c0785f2e1b7d Debian (rewriting=0) 1568s git-debrebase WALK BUILD f2db5dc7e25f34f0f34d04d0160f912a76b3667d Debian (rewriting=0) 1568s git-debrebase WALK BUILD 86248dea3770451139d1a57015bd9b36aa1ed39c Debian (rewriting=0) 1568s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1568s git-debrebase WALK BUILD 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream (rewriting=0) 1568s git-debrebase WALK BUILD e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream (rewriting=0) 1568s git-debrebase WALK BUILD 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream (rewriting=0) 1568s git-debrebase WALK BUILD b79d513107e3cff19d401deb87cc3e6c4809966e Upstream (rewriting=0) 1568s git-debrebase WALK BUILD eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream (rewriting=0) 1568s git-debrebase WALK BUILD fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream (rewriting=0) 1568s git-debrebase WALK BUILD 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream (rewriting=0) 1568s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1568s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 0 1568s git-debrebase *** WALK RETURN 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 86248dea3770451139d1a57015bd9b36aa1ed39c 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1568s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-laundered 1568s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1568s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1568s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2}],"Type" => "Upstream","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1568s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1568s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1568s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}],"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"} 1568s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1568s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1568s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1568s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1568s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1568s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2,"Ix" => 0}],"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"} 1568s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1568s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1568s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}],"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1568s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1568s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1568s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2,"Ix" => 0}],"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","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"} 1568s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1568s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1568s git-debrebase = Upstream {"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","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1568s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1568s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1568s 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","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0}]} 1568s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1568s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1568s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Type" => "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","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 1568s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1568s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1568s 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","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32,"Ix" => 0}],"Type" => "Packaging"} 1568s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1568s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1568s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","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","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}]} 1568s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1568s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1568s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}],"Msg" => "dch -r -D unstable\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1568s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1568s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1568s 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" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}]} 1568s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1568s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1568s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1568s 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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 1568s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1568s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1568s git-debrebase >= delete refs/ffq-prev/heads/work-conclude-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 1569s git-debrebase >= update refs/debrebase-last/heads/work-conclude-unstitched-laundered b35dc4c5ac9626e05811f857d83e42693da4c5ce 0000000000000000000000000000000000000000 1569s git-debrebase >= update HEAD b35dc4c5ac9626e05811f857d83e42693da4c5ce 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1569s git-debrebase >$ 1569s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1569s ' 1569s + peel=peel-conclude-unstitched-laundered 1569s + git checkout -b peel-conclude-unstitched-laundered 1569s Switched to a new branch 'peel-conclude-unstitched-laundered' 1569s + t-clean-on-branch peel-conclude-unstitched-laundered 1569s + t-output '## peel-conclude-unstitched-laundered' git status -b --porcelain 1569s + printf '%s\n' '## peel-conclude-unstitched-laundered' 1569s + shift 1569s + git status -b --porcelain 1569s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1569s + : '---------- conclude unstitched-laundered Sltf ----------' 1569s + '[' xSltf '!=' x ']' 1569s + : '---- conclude unstitched-laundered ...Sltf ----' 1569s + make_check Sltf 1569s + case "$1" in 1569s + t-refs-notexist refs/ffq-prev/heads/work-conclude-unstitched-laundered 1569s + local val 1569s + for g in $* 1569s ++ t-git-get-ref refs/ffq-prev/heads/work-conclude-unstitched-laundered 1569s ++ local ref=refs/ffq-prev/heads/work-conclude-unstitched-laundered 1569s ++ case "$ref" in 1569s ++ git show-ref -d refs/ffq-prev/heads/work-conclude-unstitched-laundered 1569s ++ perl -ne ' 1569s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-conclude-unstitched-laundered\E(?:\^\{\})?$#; 1569s END { print "$x\n" if length $x; } 1569s ' 1569s ++ test 1 = 1 1569s + val= 1569s + '[' x '!=' x ']' 1569s + t-refs-same-start refs/debrebase-last/heads/work-conclude-unstitched-laundered 1569s + unset t_ref_val 1569s + t_ref_names=() 1569s + t-ref-head 1569s + local val 1569s ++ git rev-parse HEAD 1569s + val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 1569s + t-ref-same-val HEAD b35dc4c5ac9626e05811f857d83e42693da4c5ce 1569s + local name=HEAD 1569s + local val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 1569s + case "${t_ref_val-unset}" in 1569s + t_ref_val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 1569s + t_ref_names+=("$name") 1569s + git diff --quiet 'HEAD^1' 1569s + git diff 'HEAD^2' 1569s + grep unstitched-laundered 1569s -Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 1569s - // upstream subcommands refs/heads/unstitched-laundered 1 1569s -+// both! subcommands refs/heads/unstitched-laundered 1 1569s -Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 1569s -+// upstream subcommands refs/heads/unstitched-laundered 1 1569s + git reset --hard 'HEAD^1' 1569s HEAD is now at 5472c89 MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 1569s + checkletters=ltf 1569s + '[' xltf '!=' x ']' 1569s + : '---- conclude unstitched-laundered ...ltf ----' 1569s + make_check ltf 1569s + case "$1" in 1569s + git diff --quiet HEAD refs/heads/before-work-conclude-unstitched-laundered -- :. ':!debian/patches' 1569s + t-gdr-good laundered 1569s + local state=laundered 1569s + local beforetag= 1569s + case $state in 1569s + git diff --quiet -- :. ':!debian/patches' 1569s + LC_MESSAGES=C 1569s + t-git-debrebase status 1569s + local gdr=git-debrebase 1569s + : ' 1569s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1569s + git-debrebase --dgit=dgit -D status 1569s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1569s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1569s git-debrebase = Upstream {"Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2,"Ix" => 0}],"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream"} 1569s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1569s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1569s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}],"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Upstream"} 1569s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1569s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1569s 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" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}]} 1569s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1569s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1569s git-debrebase = 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","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 1569s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1569s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1569s 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","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}]} 1569s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1569s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1569s 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","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 1569s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1569s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1569s git-debrebase = 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","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 1569s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1569s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1569s git-debrebase = Packaging {"Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1569s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1569s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1569s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32,"Ix" => 0}]} 1569s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1569s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1569s 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","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}]} 1569s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1569s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1569s git-debrebase = Packaging {"Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging","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","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f"} 1569s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1569s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1569s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n","Type" => "Changelog"} 1569s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1569s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1569s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "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","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}]} 1569s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1569s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1569s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1569s 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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","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","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]]} 1569s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-conclude-unstitched-laundered 1569s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1569s ' 1569s + case $state in 1569s + egrep '^ *branch is laundered' ../status.check 1569s branch is laundered 1569s + t-gdr-good-analyse HEAD laundered 1569s + local head=HEAD 1569s + local state=laundered 1569s + local wsfx= 1569s + local etypes bwtip 1569s + case $state in 1569s + etypes=Upstream 1569s ++ t-git-debrebase breakwater 1569s ++ local gdr=git-debrebase 1569s ++ : ' 1569s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1569s ++ git-debrebase --dgit=dgit -D breakwater 1569s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1569s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1569s 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","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,"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}]} 1569s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1569s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1569s git-debrebase = Upstream {"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","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}]} 1569s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1569s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1569s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Type" => "Upstream","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e"} 1569s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1569s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1569s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0,"Differs" => 2}],"Type" => "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"} 1569s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1569s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1569s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}],"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","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"} 1569s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1569s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1569s git-debrebase = Upstream {"Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0,"Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Type" => "Upstream","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 1569s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1569s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1569s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2,"Ix" => 0}],"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150"} 1569s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1569s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1569s git-debrebase = Packaging {"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Type" => "Packaging","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","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"} 1569s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1569s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1569s git-debrebase = Packaging {"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 1569s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1569s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1569s git-debrebase = Packaging {"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1569s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1569s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1569s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f"} 1569s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1569s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1569s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","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" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Msg" => "dch -r -D unstable\n"} 1569s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1569s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1569s 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","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1569s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1569s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1569s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1569s 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","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 1569s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1569s ' 1569s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1569s + anal=../anal 1569s + t-git-debrebase analyse HEAD 1569s + local gdr=git-debrebase 1569s + : ' 1569s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1569s + git-debrebase --dgit=dgit -D analyse HEAD 1569s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 1569s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1569s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1569s git-debrebase = Upstream {"Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2,"Ix" => 0}],"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","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","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Type" => "Upstream"} 1569s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1569s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1569s 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","Type" => "Upstream","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 1569s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1569s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1569s git-debrebase = Upstream {"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","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","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 1569s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1569s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1569s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Parents" => [{"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","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"} 1569s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1569s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1569s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Parents" => [{"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2}],"Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1569s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1569s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1569s 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","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2}],"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 1569s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1569s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1569s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0}],"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","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","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Type" => "Upstream"} 1569s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1569s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1569s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}],"Type" => "Packaging","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 1569s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1569s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1569s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Type" => "Packaging","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21"} 1569s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1569s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1569s git-debrebase = 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"}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1569s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1569s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1569s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 1569s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1569s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1569s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16,"Ix" => 0}],"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"} 1569s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1569s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1569s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"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","Type" => "Changelog"} 1569s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1569s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1569s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1569s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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},{"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","OrigParents" => [$VAR1->{"Parents"}[1]]} 1569s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1569s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1569s ' 1569s ++ git rev-parse HEAD 1569s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1569s + exec 1569s + local cid ctype info nparents 1569s + read cid ctype info 1569s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 1569s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1569s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1569s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 1569s + enparents=1 1569s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 1569s ++ t-sort -u 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s ++ wc -w 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 1569s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 1569s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1569s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1569s + enparents=1 1569s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1569s ++ t-sort -u 1569s ++ wc -w 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 1569s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 1569s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 1569s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 1569s + enparents=1 1569s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 1569s ++ t-sort -u 1569s ++ wc -w 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 1569s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 1569s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 1569s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 1569s + enparents=1 1569s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 1569s ++ t-sort -u 1569s ++ wc -w 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 1569s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 1569s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1569s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1569s + enparents=1 1569s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1569s ++ t-sort -u 1569s ++ wc -w 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 1569s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 1569s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1569s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 1569s + enparents=1 1569s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1569s ++ wc -w 1569s ++ t-sort -u 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 1569s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 1569s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 1569s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 1569s + enparents=1 1569s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 1569s ++ t-sort -u 1569s ++ wc -w 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 1569s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 1569s + local cetype=Upstream 1569s + '[' xPackaging = xUpstream ']' 1569s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 1569s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1569s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1569s + enparents=1 1569s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 1569s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 1569s + bwtip= 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 1569s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 1569s + etypes=Packaging 1569s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1569s ++ wc -w 1569s ++ t-sort -u 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 1569s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1569s + local cetype=Packaging 1569s + '[' xPackaging = xPackaging ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 1569s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1569s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 1569s + enparents=1 1569s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 1569s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 1569s + etypes=Packaging 1569s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1569s ++ wc -w 1569s ++ t-sort -u 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 1569s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1569s + local cetype=Packaging 1569s + '[' xPackaging = xPackaging ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 1569s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 1569s + expect=515e62b8d591fcc68597383b955d898db71abc6c 1569s + enparents=1 1569s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 1569s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 1569s + etypes=Packaging 1569s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 1569s ++ t-sort -u 1569s ++ wc -w 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 1569s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 1569s + local cetype=Packaging 1569s + '[' xPackaging = xPackaging ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 1569s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 1569s + expect=809643e5389def220ea36d61f2d3dd504603e95a 1569s + enparents=1 1569s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 1569s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 1569s + etypes=Packaging 1569s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 1569s ++ t-sort -u 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s ++ wc -w 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 1569s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 1569s + local cetype=Packaging 1569s + '[' xChangelog = xPackaging ']' 1569s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 1569s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 1569s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 1569s + enparents=1 1569s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 1569s + etypes=Packaging 1569s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 1569s ++ t-sort -u 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s ++ wc -w 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 1569s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 1569s + local cetype=Packaging 1569s + '[' xChangelog = xPackaging ']' 1569s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 1569s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1569s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1569s + enparents=1 1569s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 1569s + etypes=Packaging 1569s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1569s ++ t-sort -u 1569s ++ wc -w 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1569s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1569s + local cetype=Packaging 1569s + '[' xAnchor = xPackaging ']' 1569s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1569s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1569s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1569s + enparents=1 1569s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s + break 1569s + checkletters=tf 1569s + '[' xtf '!=' x ']' 1569s + : '---- conclude unstitched-laundered ...tf ----' 1569s + make_check tf 1569s + case "$1" in 1569s + git diff --quiet HEAD refs/heads/before-work-conclude-unstitched-laundered 1569s + checkletters=f 1569s + '[' xf '!=' x ']' 1569s + : '---- conclude unstitched-laundered ...f ----' 1569s + make_check f 1569s + case "$1" in 1569s + t-has-ancestor HEAD refs/heads/before-work-conclude-unstitched-laundered 1569s + local now 1569s ++ git rev-parse HEAD 1569s + now=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1569s + local ancestor 1569s ++ git rev-parse 'HEAD^{}' 1569s + ancestor=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1569s + local mbase 1569s ++ t-git-merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1569s ++ git merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1569s + mbase=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1569s + '[' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f '!=' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f ']' 1569s + checkletters= 1569s + '[' x '!=' x ']' 1569s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1569s + work=work-conclude-unstitched-mixed 1569s + : '---------- conclude unstitched-mixed ----------' 1569s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 1569s + git update-ref --stdin 1569s + sed s/unstitched-mixed/work-conclude-unstitched-mixed/ 1569s + git checkout work-conclude-unstitched-mixed 1569s Switched to branch 'work-conclude-unstitched-mixed' 1569s + checkletters=Sl 1569s + shift 1569s + before=before-work-conclude-unstitched-mixed 1569s + git branch before-work-conclude-unstitched-mixed 1569s + local xopts= 1569s + case "$checkletters" in 1569s + case "$checkletters" in 1569s + case "$checkletters" in 1569s + case "$checkletters" in 1569s + t-git-debrebase conclude 1569s + local gdr=git-debrebase 1569s + : ' 1569s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1569s + git-debrebase --dgit=dgit -D conclude 1569s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-mixed 1569s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-mixed 1569s git-debrebase *** WALK 9b56b9c2600dc10b9eec97d535d89870476de971 0 - 1569s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 1569s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 1569s 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"} 1569s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 1569s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 1569s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","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" => [{"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1569s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 1569s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 1569s 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","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Type" => "Packaging","CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Parents" => [{"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Ix" => 0,"Differs" => 32}]} 1569s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 1569s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 1569s git-debrebase = AddPatches {"Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","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"}],"Type" => "AddPatches"} 1569s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 1569s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 1569s 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"} 1569s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 1569s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 1569s git-debrebase = Upstream {"Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Upstream","CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Parents" => [{"Ix" => 0,"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Differs" => 2}]} 1569s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 1569s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 1569s git-debrebase = 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","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Ix" => 0}],"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433"} 1569s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1569s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 1569s git-debrebase = Upstream {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Parents" => [{"Ix" => 0,"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Differs" => 2}]} 1569s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1569s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 1569s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Differs" => 2}],"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 1569s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1569s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 1569s git-debrebase = Upstream {"Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Parents" => [{"Differs" => 2,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}]} 1569s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1569s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1569s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n"} 1569s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1569s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1569s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","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","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1569s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1569s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1569s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1569s 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","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","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1569s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 7 proc 15 pm -1 1569s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1569s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1569s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 1569s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1569s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 1569s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 1569s git-debrebase WALK BUILD a4efcc9f58a06f20c5de1258de24211048e99433 Debian (rewriting=0) 1569s git-debrebase WALK REWRITING NOW cl=HASH(0x3c167820188) procd=HASH(0x3c16783fef8) 1569s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1569s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Debian (rewriting=1) 1569s git-debrebase WALK BUILD 5360dd228488e99ffa3d55e906ddc0de1c111c4e Debian (rewriting=1) 1569s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1569s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Debian (rewriting=1) 1569s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1569s git-debrebase WALK BUILD eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 Upstream (rewriting=1) 1569s git-debrebase WALK BUILD ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b Upstream (rewriting=1) 1569s git-debrebase WALK BUILD 9f40936eece8f6452df026cc64200db82005a166 Upstream (rewriting=1) 1569s git-debrebase WALK BUILD 5138bd8205d6eeb162d87a2d085746c0c305261c Upstream (rewriting=1) 1569s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Upstream (rewriting=1) 1569s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1569s git-debrebase WALK BUILD 5668ce44fba4db3f42ac837f0104a9335a819367 Upstream (rewriting=1) 1569s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Upstream (rewriting=1) 1569s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1569s git-debrebase get_differs 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 = 0x4 1569s git-debrebase *** WALK RETURN 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 72e35041bfbd2d841ef8d4b4bf24616be30909ce 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1569s git-debrebase: laundered (head was 9b56b9c2600dc10b9eec97d535d89870476de971) 1569s git-debrebase >= update HEAD 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 1569s git-debrebase >$ 1569s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-mixed 1569s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1569s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1569s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45"}],"CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1569s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1569s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1569s 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","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Parents" => [{"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Ix" => 0}],"Type" => "Upstream"} 1569s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1569s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1569s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42"}],"Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1569s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1569s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1569s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Parents" => [{"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1569s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1569s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1569s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Ix" => 0,"Differs" => 2}],"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","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"} 1569s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1569s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1569s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"}],"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"} 1569s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1569s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1569s 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","Parents" => [{"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Ix" => 0,"Differs" => 2}],"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Type" => "Upstream"} 1569s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1569s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1569s git-debrebase = 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","Type" => "Packaging","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c"}]} 1569s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1569s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1569s 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","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Ix" => 0,"Differs" => 32}],"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Type" => "Packaging"} 1569s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1569s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1569s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Ix" => 0,"Differs" => 32}],"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1569s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1569s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1569s git-debrebase = 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","Type" => "Packaging","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}],"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0"} 1569s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1569s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1569s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"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"} 1569s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1569s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1569s 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" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}]} 1569s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1569s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1569s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1569s git-debrebase = Anchor {"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","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","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 1569s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1569s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1569s git-debrebase >= delete refs/ffq-prev/heads/work-conclude-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1569s git-debrebase >= update refs/debrebase-last/heads/work-conclude-unstitched-mixed 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 0000000000000000000000000000000000000000 1569s git-debrebase >= update HEAD 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1569s git-debrebase >$ 1569s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1569s ' 1569s + peel=peel-conclude-unstitched-mixed 1569s + git checkout -b peel-conclude-unstitched-mixed 1569s Switched to a new branch 'peel-conclude-unstitched-mixed' 1569s + t-clean-on-branch peel-conclude-unstitched-mixed 1569s + t-output '## peel-conclude-unstitched-mixed' git status -b --porcelain 1569s + printf '%s\n' '## peel-conclude-unstitched-mixed' 1569s + shift 1569s + git status -b --porcelain 1569s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1569s + : '---------- conclude unstitched-mixed Sl ----------' 1569s + '[' xSl '!=' x ']' 1569s + : '---- conclude unstitched-mixed ...Sl ----' 1569s + make_check Sl 1569s + case "$1" in 1569s + t-refs-notexist refs/ffq-prev/heads/work-conclude-unstitched-mixed 1569s + local val 1569s + for g in $* 1569s ++ t-git-get-ref refs/ffq-prev/heads/work-conclude-unstitched-mixed 1569s ++ local ref=refs/ffq-prev/heads/work-conclude-unstitched-mixed 1569s ++ case "$ref" in 1569s ++ git show-ref -d refs/ffq-prev/heads/work-conclude-unstitched-mixed 1569s ++ perl -ne ' 1569s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-conclude-unstitched-mixed\E(?:\^\{\})?$#; 1569s END { print "$x\n" if length $x; } 1569s ' 1569s ++ test 1 = 1 1569s + val= 1569s + '[' x '!=' x ']' 1569s + t-refs-same-start refs/debrebase-last/heads/work-conclude-unstitched-mixed 1569s + unset t_ref_val 1569s + t_ref_names=() 1569s + t-ref-head 1569s + local val 1569s ++ git rev-parse HEAD 1569s + val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 1569s + t-ref-same-val HEAD 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 1569s + local name=HEAD 1569s + local val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 1569s + case "${t_ref_val-unset}" in 1569s + t_ref_val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 1569s + t_ref_names+=("$name") 1569s + git diff --quiet 'HEAD^1' 1569s + git diff 'HEAD^2' 1569s + grep unstitched-mixed 1569s +// debian subcommands refs/heads/unstitched-mixed 1 1569s +// both! subcommands refs/heads/unstitched-mixed 1 1569s +// debian subcommands refs/heads/unstitched-mixed 2 1569s +// both! subcommands refs/heads/unstitched-mixed 2 1569s +// upstream subcommands refs/heads/unstitched-mixed 1 1569s +// both! subcommands refs/heads/unstitched-mixed 1 1569s +// upstream subcommands refs/heads/unstitched-mixed 2 1569s +// both! subcommands refs/heads/unstitched-mixed 2 1569s + git reset --hard 'HEAD^1' 1569s HEAD is now at 7b7a1b7 MIXED add both() (subcommands refs/heads/unstitched-mixed 2) 1569s + checkletters=l 1569s + '[' xl '!=' x ']' 1569s + : '---- conclude unstitched-mixed ...l ----' 1569s + make_check l 1569s + case "$1" in 1569s + git diff --quiet HEAD refs/heads/before-work-conclude-unstitched-mixed -- :. ':!debian/patches' 1569s + t-gdr-good laundered 1569s + local state=laundered 1569s + local beforetag= 1569s + case $state in 1569s + git diff --quiet -- :. ':!debian/patches' 1569s + LC_MESSAGES=C 1569s + t-git-debrebase status 1569s + local gdr=git-debrebase 1569s + : ' 1569s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1569s + git-debrebase --dgit=dgit -D status 1569s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1569s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1569s git-debrebase = Upstream {"CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","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"} 1569s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1569s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1569s git-debrebase = Upstream {"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Type" => "Upstream","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1569s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1569s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1569s git-debrebase = Upstream {"Type" => "Upstream","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","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Parents" => [{"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Differs" => 2,"Ix" => 0}]} 1569s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1569s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1569s git-debrebase = Upstream {"Type" => "Upstream","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","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Parents" => [{"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Differs" => 2,"Ix" => 0}]} 1569s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1569s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1569s git-debrebase = Upstream {"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","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Parents" => [{"Ix" => 0,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2}]} 1569s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1569s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1569s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"}],"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","Type" => "Upstream"} 1569s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1569s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1569s 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 f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Parents" => [{"Differs" => 2,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Ix" => 0}]} 1569s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1569s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1569s git-debrebase = Packaging {"Parents" => [{"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Differs" => 32,"Ix" => 0}],"Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1569s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1569s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1569s git-debrebase = Packaging {"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","Parents" => [{"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Type" => "Packaging","Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1569s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1569s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1569s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Ix" => 0}],"Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","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"} 1569s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1569s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1569s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n"} 1569s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1569s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1569s git-debrebase = Changelog {"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","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}]} 1569s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1569s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1569s 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","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1569s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1569s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1569s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1569s git-debrebase = Anchor {"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},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"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","OrigParents" => [$VAR1->{"Parents"}[1]]} 1569s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-conclude-unstitched-mixed 1569s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1569s ' 1569s + case $state in 1569s + egrep '^ *branch is laundered' ../status.check 1569s branch is laundered 1569s + t-gdr-good-analyse HEAD laundered 1569s + local head=HEAD 1569s + local state=laundered 1569s + local wsfx= 1569s + local etypes bwtip 1569s + case $state in 1569s + etypes=Upstream 1569s ++ t-git-debrebase breakwater 1569s ++ local gdr=git-debrebase 1569s ++ : ' 1569s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1569s ++ git-debrebase --dgit=dgit -D breakwater 1569s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1569s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1569s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Differs" => 2}],"CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","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","Type" => "Upstream"} 1569s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1569s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1569s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Ix" => 0}],"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","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","Type" => "Upstream"} 1569s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1569s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1569s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42"}],"Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","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","Type" => "Upstream"} 1569s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1569s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1569s git-debrebase = Upstream {"Type" => "Upstream","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","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Parents" => [{"Ix" => 0,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Differs" => 2}]} 1569s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1569s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1569s git-debrebase = Upstream {"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198"}],"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","Type" => "Upstream"} 1569s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1569s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1569s git-debrebase = Upstream {"Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Ix" => 0}],"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1569s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1569s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1569s git-debrebase = Upstream {"Type" => "Upstream","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","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Parents" => [{"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Differs" => 2,"Ix" => 0}]} 1569s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1569s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1569s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Differs" => 32,"Ix" => 0}],"Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1569s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1569s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1569s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Differs" => 32}],"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1569s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1569s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1569s git-debrebase = Packaging {"Type" => "Packaging","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","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Parents" => [{"Ix" => 0,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32}]} 1569s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1569s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1569s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Packaging"} 1569s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1569s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1569s 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","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n"} 1569s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1569s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1569s 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 1530000022 +0100\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 1569s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1569s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1569s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1569s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"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]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor"} 1569s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1569s ' 1569s + bwtip=Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 1569s + anal=../anal 1569s + t-git-debrebase analyse HEAD 1569s + local gdr=git-debrebase 1569s + : ' 1569s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1569s + git-debrebase --dgit=dgit -D analyse HEAD 1569s git-debrebase *** WALK 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1 *main::STDOUT 1569s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 1569s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 1569s git-debrebase = Upstream {"Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45"}],"Type" => "Upstream","Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1569s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 1569s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 1569s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Ix" => 0}],"Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1569s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 1569s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 1569s git-debrebase = Upstream {"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","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","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42"}],"Type" => "Upstream"} 1569s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 1569s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 1569s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Ix" => 0}],"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","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42"} 1569s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 1569s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 1569s git-debrebase = Upstream {"Parents" => [{"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","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","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3"} 1569s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 1569s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 1569s git-debrebase = Upstream {"Type" => "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","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198"} 1569s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 1569s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 1569s 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","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Differs" => 2}],"Type" => "Upstream"} 1569s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 1569s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 1569s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Ix" => 0}],"Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 1569s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 1569s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 1569s git-debrebase = Packaging {"Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","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","Parents" => [{"Ix" => 0,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Differs" => 32}],"Type" => "Packaging"} 1569s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 1569s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 1569s git-debrebase = Packaging {"Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32}],"Type" => "Packaging","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1569s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 1569s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1569s git-debrebase = Packaging {"Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32}],"Type" => "Packaging","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n"} 1569s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1569s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1569s git-debrebase = Changelog {"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}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n"} 1569s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1569s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1569s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","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","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 1569s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1569s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1569s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1569s 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" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","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"} 1569s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1569s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1569s ' 1569s ++ git rev-parse HEAD 1569s + expect=7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1569s + exec 1569s + local cid ctype info nparents 1569s + read cid ctype info 1569s + : ===== 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb Upstream ===== 1569s + test 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb = 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1569s + local parents=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1569s + expect=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1569s + enparents=1 1569s + : Upstream/SAME 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1569s ++ t-sort -u 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s ++ wc -w 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 Upstream ===== 1569s + test 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 = 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 1569s + local parents=439c17a177f0446ce30950b9b8e91f43c101cc23 1569s + expect=439c17a177f0446ce30950b9b8e91f43c101cc23 1569s + enparents=1 1569s + : Upstream/SAME 439c17a177f0446ce30950b9b8e91f43c101cc23 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s 439c17a177f0446ce30950b9b8e91f43c101cc23 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo 439c17a177f0446ce30950b9b8e91f43c101cc23 1569s ++ wc -w 1569s ++ t-sort -u 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== 439c17a177f0446ce30950b9b8e91f43c101cc23 Upstream ===== 1569s + test 439c17a177f0446ce30950b9b8e91f43c101cc23 = 439c17a177f0446ce30950b9b8e91f43c101cc23 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P 439c17a177f0446ce30950b9b8e91f43c101cc23 1569s + local parents=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1569s + expect=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1569s + enparents=1 1569s + : Upstream/SAME 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ for f in $parents 1569s ++ echo 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1569s ++ t-sort -u 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1569s ++ wc -w 1569s + local cndparents=1 1569s + test 1 = 1 1569s + case "$parents" in 1569s + case "$ctype" in 1569s + read cid ctype info 1569s + : ===== 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 Upstream ===== 1569s + test 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 = 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1569s + local cetype=Upstream 1569s + '[' xUpstream = xUpstream ']' 1569s + cetype=SAME 1569s ++ git log -n1 --pretty=format:%P 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 1569s + local parents=f96b8ee9c829c22ea92f8e82e2048017db012c8a 1569s + expect=f96b8ee9c829c22ea92f8e82e2048017db012c8a 1569s + enparents=1 1569s + : Upstream/SAME f96b8ee9c829c22ea92f8e82e2048017db012c8a 1569s + case "$ctype/$cetype" in 1569s + case "$ctype/$etypes" in 1569s + case "$cetype" in 1569s + case "$ctype" in 1569s ++ printf %s f96b8ee9c829c22ea92f8e82e2048017db012c8a 1569s ++ wc -w 1569s + local cnparents=1 1569s + test 1 = 1 1569s ++ wc -w 1569s ++ for f in $parents 1569s ++ echo f96b8ee9c829c22ea92f8e82e2048017db012c8a 1569s ++ t-sort -u 1569s ++ LC_COLLATE=C 1569s ++ sort -u 1570s + local cndparents=1 1570s + test 1 = 1 1570s + case "$parents" in 1570s + case "$ctype" in 1570s + read cid ctype info 1570s + : ===== f96b8ee9c829c22ea92f8e82e2048017db012c8a Upstream ===== 1570s + test f96b8ee9c829c22ea92f8e82e2048017db012c8a = f96b8ee9c829c22ea92f8e82e2048017db012c8a 1570s + local cetype=Upstream 1570s + '[' xUpstream = xUpstream ']' 1570s + cetype=SAME 1570s ++ git log -n1 --pretty=format:%P f96b8ee9c829c22ea92f8e82e2048017db012c8a 1570s + local parents=e143304e38e5e9a822f93056dad834788c62e198 1570s + expect=e143304e38e5e9a822f93056dad834788c62e198 1570s + enparents=1 1570s + : Upstream/SAME e143304e38e5e9a822f93056dad834788c62e198 1570s + case "$ctype/$cetype" in 1570s + case "$ctype/$etypes" in 1570s + case "$cetype" in 1570s + case "$ctype" in 1570s ++ printf %s e143304e38e5e9a822f93056dad834788c62e198 1570s ++ wc -w 1570s + local cnparents=1 1570s + test 1 = 1 1570s ++ for f in $parents 1570s ++ echo e143304e38e5e9a822f93056dad834788c62e198 1570s ++ wc -w 1570s ++ t-sort -u 1570s ++ LC_COLLATE=C 1570s ++ sort -u 1570s + local cndparents=1 1570s + test 1 = 1 1570s + case "$parents" in 1570s + case "$ctype" in 1570s + read cid ctype info 1570s + : ===== e143304e38e5e9a822f93056dad834788c62e198 Upstream ===== 1570s + test e143304e38e5e9a822f93056dad834788c62e198 = e143304e38e5e9a822f93056dad834788c62e198 1570s + local cetype=Upstream 1570s + '[' xUpstream = xUpstream ']' 1570s + cetype=SAME 1570s ++ git log -n1 --pretty=format:%P e143304e38e5e9a822f93056dad834788c62e198 1570s + local parents=195f145753880dd4e5c1ff65136bb523cb2940c4 1570s + expect=195f145753880dd4e5c1ff65136bb523cb2940c4 1570s + enparents=1 1570s + : Upstream/SAME 195f145753880dd4e5c1ff65136bb523cb2940c4 1570s + case "$ctype/$cetype" in 1570s + case "$ctype/$etypes" in 1570s + case "$cetype" in 1570s + case "$ctype" in 1570s ++ printf %s 195f145753880dd4e5c1ff65136bb523cb2940c4 1570s ++ wc -w 1570s + local cnparents=1 1570s + test 1 = 1 1570s ++ for f in $parents 1570s ++ echo 195f145753880dd4e5c1ff65136bb523cb2940c4 1570s ++ t-sort -u 1570s ++ wc -w 1570s ++ LC_COLLATE=C 1570s ++ sort -u 1570s + local cndparents=1 1570s + test 1 = 1 1570s + case "$parents" in 1570s + case "$ctype" in 1570s + read cid ctype info 1570s + : ===== 195f145753880dd4e5c1ff65136bb523cb2940c4 Upstream ===== 1570s + test 195f145753880dd4e5c1ff65136bb523cb2940c4 = 195f145753880dd4e5c1ff65136bb523cb2940c4 1570s + local cetype=Upstream 1570s + '[' xUpstream = xUpstream ']' 1570s + cetype=SAME 1570s ++ git log -n1 --pretty=format:%P 195f145753880dd4e5c1ff65136bb523cb2940c4 1570s + local parents=72e35041bfbd2d841ef8d4b4bf24616be30909ce 1570s + expect=72e35041bfbd2d841ef8d4b4bf24616be30909ce 1570s + enparents=1 1570s + : Upstream/SAME 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1570s + case "$ctype/$cetype" in 1570s + case "$ctype/$etypes" in 1570s + case "$cetype" in 1570s + case "$ctype" in 1570s ++ printf %s 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1570s ++ wc -w 1570s + local cnparents=1 1570s + test 1 = 1 1570s ++ for f in $parents 1570s ++ echo 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1570s ++ t-sort -u 1570s ++ wc -w 1570s ++ LC_COLLATE=C 1570s ++ sort -u 1570s + local cndparents=1 1570s + test 1 = 1 1570s + case "$parents" in 1570s + case "$ctype" in 1570s + read cid ctype info 1570s + : ===== 72e35041bfbd2d841ef8d4b4bf24616be30909ce Packaging ===== 1570s + test 72e35041bfbd2d841ef8d4b4bf24616be30909ce = 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1570s + local cetype=Upstream 1570s + '[' xPackaging = xUpstream ']' 1570s ++ git log -n1 --pretty=format:%P 72e35041bfbd2d841ef8d4b4bf24616be30909ce 1570s + local parents=7c13e61bd6887af7ef124f8331a541ae7431bc7c 1570s + expect=7c13e61bd6887af7ef124f8331a541ae7431bc7c 1570s + enparents=1 1570s + : Packaging/Upstream 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1570s + case "$ctype/$cetype" in 1570s + case "$ctype/$etypes" in 1570s + '[' xY:72e35041bfbd2d841ef8d4b4bf24616be30909ce '!=' x ']' 1570s + test Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce = Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 1570s + bwtip= 1570s + case "$cetype" in 1570s + case "$ctype" in 1570s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :. ':!debian' 1570s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :debian/patches 1570s + etypes=Packaging 1570s ++ printf %s 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1570s ++ wc -w 1570s + local cnparents=1 1570s + test 1 = 1 1570s ++ for f in $parents 1570s ++ echo 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1570s ++ t-sort -u 1570s ++ wc -w 1570s ++ LC_COLLATE=C 1570s ++ sort -u 1570s + local cndparents=1 1570s + test 1 = 1 1570s + case "$parents" in 1570s + case "$ctype" in 1570s + read cid ctype info 1570s + : ===== 7c13e61bd6887af7ef124f8331a541ae7431bc7c Packaging ===== 1570s + test 7c13e61bd6887af7ef124f8331a541ae7431bc7c = 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1570s + local cetype=Packaging 1570s + '[' xPackaging = xPackaging ']' 1570s + cetype=SAME 1570s ++ git log -n1 --pretty=format:%P 7c13e61bd6887af7ef124f8331a541ae7431bc7c 1570s + local parents=63bb83776dc0439e7e1f38011cc3230347a1f3a0 1570s + expect=63bb83776dc0439e7e1f38011cc3230347a1f3a0 1570s + enparents=1 1570s + : Packaging/SAME 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1570s + case "$ctype/$cetype" in 1570s + case "$ctype/$etypes" in 1570s + case "$cetype" in 1570s + case "$ctype" in 1570s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :. ':!debian' 1570s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :debian/patches 1570s + etypes=Packaging 1570s ++ printf %s 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1570s ++ wc -w 1570s + local cnparents=1 1570s + test 1 = 1 1570s ++ for f in $parents 1570s ++ echo 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1570s ++ wc -w 1570s ++ t-sort -u 1570s ++ LC_COLLATE=C 1570s ++ sort -u 1570s + local cndparents=1 1570s + test 1 = 1 1570s + case "$parents" in 1570s + case "$ctype" in 1570s + read cid ctype info 1570s + : ===== 63bb83776dc0439e7e1f38011cc3230347a1f3a0 Packaging ===== 1570s + test 63bb83776dc0439e7e1f38011cc3230347a1f3a0 = 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1570s + local cetype=Packaging 1570s + '[' xPackaging = xPackaging ']' 1570s + cetype=SAME 1570s ++ git log -n1 --pretty=format:%P 63bb83776dc0439e7e1f38011cc3230347a1f3a0 1570s + local parents=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1570s + expect=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1570s + enparents=1 1570s + : Packaging/SAME 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1570s + case "$ctype/$cetype" in 1570s + case "$ctype/$etypes" in 1570s + case "$cetype" in 1570s + case "$ctype" in 1570s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :. ':!debian' 1570s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :debian/patches 1570s + etypes=Packaging 1570s ++ printf %s 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1570s ++ wc -w 1570s + local cnparents=1 1570s + test 1 = 1 1570s ++ for f in $parents 1570s ++ echo 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1570s ++ wc -w 1570s ++ t-sort -u 1570s ++ LC_COLLATE=C 1570s ++ sort -u 1570s + local cndparents=1 1570s + test 1 = 1 1570s + case "$parents" in 1570s + case "$ctype" in 1570s + read cid ctype info 1570s + : ===== 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 Packaging ===== 1570s + test 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 = 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1570s + local cetype=Packaging 1570s + '[' xPackaging = xPackaging ']' 1570s + cetype=SAME 1570s ++ git log -n1 --pretty=format:%P 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 1570s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 1570s + expect=809643e5389def220ea36d61f2d3dd504603e95a 1570s + enparents=1 1570s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 1570s + case "$ctype/$cetype" in 1570s + case "$ctype/$etypes" in 1570s + case "$cetype" in 1570s + case "$ctype" in 1570s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :. ':!debian' 1570s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :debian/patches 1570s + etypes=Packaging 1570s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 1570s ++ wc -w 1570s + local cnparents=1 1570s + test 1 = 1 1570s ++ for f in $parents 1570s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 1570s ++ wc -w 1570s ++ t-sort -u 1570s ++ LC_COLLATE=C 1570s ++ sort -u 1570s + local cndparents=1 1570s + test 1 = 1 1570s + case "$parents" in 1570s + case "$ctype" in 1570s + read cid ctype info 1570s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 1570s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 1570s + local cetype=Packaging 1570s + '[' xChangelog = xPackaging ']' 1570s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 1570s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 1570s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 1570s + enparents=1 1570s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 1570s + case "$ctype/$cetype" in 1570s + case "$ctype/$etypes" in 1570s + case "$cetype" in 1570s + case "$ctype" in 1570s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 1570s + etypes=Packaging 1570s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 1570s ++ wc -w 1570s + local cnparents=1 1570s + test 1 = 1 1570s ++ for f in $parents 1570s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 1570s ++ t-sort -u 1570s ++ wc -w 1570s ++ LC_COLLATE=C 1570s ++ sort -u 1570s + local cndparents=1 1570s + test 1 = 1 1570s + case "$parents" in 1570s + case "$ctype" in 1570s + read cid ctype info 1570s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 1570s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 1570s + local cetype=Packaging 1570s + '[' xChangelog = xPackaging ']' 1570s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 1570s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1570s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1570s + enparents=1 1570s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1570s + case "$ctype/$cetype" in 1570s + case "$ctype/$etypes" in 1570s + case "$cetype" in 1570s + case "$ctype" in 1570s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 1570s + etypes=Packaging 1570s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1570s ++ wc -w 1570s + local cnparents=1 1570s + test 1 = 1 1570s ++ for f in $parents 1570s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1570s ++ t-sort -u 1570s ++ wc -w 1570s ++ LC_COLLATE=C 1570s ++ sort -u 1570s + local cndparents=1 1570s + test 1 = 1 1570s + case "$parents" in 1570s + case "$ctype" in 1570s + read cid ctype info 1570s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 1570s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1570s + local cetype=Packaging 1570s + '[' xAnchor = xPackaging ']' 1570s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1570s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1570s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1570s + enparents=1 1570s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 1570s + case "$ctype/$cetype" in 1570s + case "$ctype/$etypes" in 1570s + case "$cetype" in 1570s + case "$ctype" in 1570s + break 1570s + checkletters= 1570s + '[' x '!=' x ']' 1570s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1570s + work=work-conclude-raw-converted-from-gbp 1570s + : '---------- conclude raw-converted-from-gbp ----------' 1570s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 1570s + git update-ref --stdin 1570s + sed s/raw-converted-from-gbp/work-conclude-raw-converted-from-gbp/ 1570s + git checkout work-conclude-raw-converted-from-gbp 1570s Switched to branch 'work-conclude-raw-converted-from-gbp' 1570s + checkletters=N 1570s + shift 1570s + before=before-work-conclude-raw-converted-from-gbp 1570s + git branch before-work-conclude-raw-converted-from-gbp 1570s + local xopts= 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + t-expect-fail E:. t-git-debrebase conclude 1570s + local mpat=E:. 1570s + shift 1570s + set +o pipefail 1570s + LC_MESSAGES=C 1570s + LANGUAGE=C 1570s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + t-git-debrebase conclude 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D conclude 1570s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-raw-converted-from-gbp 1570s 1570s git-debrebase: error: No ongoing git-debrebase session. 1570s + local 'ps=255 0' 1570s + set -o pipefail 1570s + case $ps in 1570s + t-grep-mpat E:. /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local mpat=E:. 1570s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local grepper=fgrep 1570s + case "$mpat" in 1570s + case "$mpat" in 1570s + grepper=egrep 1570s + mpat=. 1570s + egrep -e . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D conclude 1570s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-raw-converted-from-gbp 1570s git-debrebase: error: No ongoing git-debrebase session. 1570s + xopts+=' --noop-ok' 1570s + next_checkletter 1570s + checkletters= 1570s + case "$checkletters" in 1570s + t-git-debrebase --noop-ok conclude 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D --noop-ok conclude 1570s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-raw-converted-from-gbp 1570s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1570s ' 1570s + peel=peel-conclude-raw-converted-from-gbp 1570s + git checkout -b peel-conclude-raw-converted-from-gbp 1570s Switched to a new branch 'peel-conclude-raw-converted-from-gbp' 1570s + t-clean-on-branch peel-conclude-raw-converted-from-gbp 1570s + t-output '## peel-conclude-raw-converted-from-gbp' git status -b --porcelain 1570s + printf '%s\n' '## peel-conclude-raw-converted-from-gbp' 1570s + shift 1570s + git status -b --porcelain 1570s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1570s + : '---------- conclude raw-converted-from-gbp ----------' 1570s + '[' x '!=' x ']' 1570s + subcmd scrap Ns Ns Z Z N 1570s + local subcmd=scrap 1570s + shift 1570s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1570s + work=work-scrap-stitched-laundered 1570s + : '---------- scrap stitched-laundered ----------' 1570s + git update-ref --stdin 1570s + sed s/stitched-laundered/work-scrap-stitched-laundered/ 1570s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 1570s + git checkout work-scrap-stitched-laundered 1570s Switched to branch 'work-scrap-stitched-laundered' 1570s + checkletters=Ns 1570s + shift 1570s + before=before-work-scrap-stitched-laundered 1570s + git branch before-work-scrap-stitched-laundered 1570s + local xopts= 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + t-expect-fail E:. t-git-debrebase scrap 1570s + local mpat=E:. 1570s + shift 1570s + set +o pipefail 1570s + LC_MESSAGES=C 1570s + LANGUAGE=C 1570s + t-git-debrebase scrap 1570s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D scrap 1570s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-laundered 1570s 1570s git-debrebase: error: No ongoing git-debrebase session. 1570s + local 'ps=255 0' 1570s + set -o pipefail 1570s + case $ps in 1570s + t-grep-mpat E:. /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local mpat=E:. 1570s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local grepper=fgrep 1570s + case "$mpat" in 1570s + case "$mpat" in 1570s + grepper=egrep 1570s + mpat=. 1570s + egrep -e . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D scrap 1570s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-laundered 1570s git-debrebase: error: No ongoing git-debrebase session. 1570s + xopts+=' --noop-ok' 1570s + next_checkletter 1570s + checkletters=s 1570s + case "$checkletters" in 1570s + t-git-debrebase --noop-ok scrap 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D --noop-ok scrap 1570s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-laundered 1570s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1570s ' 1570s + peel=peel-scrap-stitched-laundered 1570s + git checkout -b peel-scrap-stitched-laundered 1570s Switched to a new branch 'peel-scrap-stitched-laundered' 1570s + t-clean-on-branch peel-scrap-stitched-laundered 1570s + t-output '## peel-scrap-stitched-laundered' git status -b --porcelain 1570s + printf '%s\n' '## peel-scrap-stitched-laundered' 1570s + shift 1570s + git status -b --porcelain 1570s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1570s + : '---------- scrap stitched-laundered s ----------' 1570s + '[' xs '!=' x ']' 1570s + : '---- scrap stitched-laundered ...s ----' 1570s + make_check s 1570s + case "$1" in 1570s + t-refs-notexist refs/ffq-prev/heads/work-scrap-stitched-laundered 1570s + local val 1570s + for g in $* 1570s ++ t-git-get-ref refs/ffq-prev/heads/work-scrap-stitched-laundered 1570s ++ local ref=refs/ffq-prev/heads/work-scrap-stitched-laundered 1570s ++ case "$ref" in 1570s ++ git show-ref -d refs/ffq-prev/heads/work-scrap-stitched-laundered 1570s ++ perl -ne ' 1570s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-scrap-stitched-laundered\E(?:\^\{\})?$#; 1570s END { print "$x\n" if length $x; } 1570s ' 1570s ++ test 1 = 1 1570s + val= 1570s + '[' x '!=' x ']' 1570s + t-refs-same-start 1570s + unset t_ref_val 1570s + t_ref_names=() 1570s + t-refs-same refs/debrebase-last/heads/work-scrap-stitched-laundered refs/debrebase-last/heads/stitched-laundered 1570s + local g 1570s + for g in $* 1570s + t-ref-same refs/debrebase-last/heads/work-scrap-stitched-laundered 1570s + local name=refs/debrebase-last/heads/work-scrap-stitched-laundered 1570s + local val 1570s ++ t-git-get-ref refs/debrebase-last/heads/work-scrap-stitched-laundered 1570s ++ local ref=refs/debrebase-last/heads/work-scrap-stitched-laundered 1570s ++ case "$ref" in 1570s ++ git show-ref -d refs/debrebase-last/heads/work-scrap-stitched-laundered 1570s ++ perl -ne ' 1570s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-scrap-stitched-laundered\E(?:\^\{\})?$#; 1570s END { print "$x\n" if length $x; } 1570s ' 1570s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + t-ref-same-val refs/debrebase-last/heads/work-scrap-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + local name=refs/debrebase-last/heads/work-scrap-stitched-laundered 1570s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + case "${t_ref_val-unset}" in 1570s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + t_ref_names+=("$name") 1570s + for g in $* 1570s + t-ref-same refs/debrebase-last/heads/stitched-laundered 1570s + local name=refs/debrebase-last/heads/stitched-laundered 1570s + local val 1570s ++ t-git-get-ref refs/debrebase-last/heads/stitched-laundered 1570s ++ local ref=refs/debrebase-last/heads/stitched-laundered 1570s ++ case "$ref" in 1570s ++ git show-ref -d refs/debrebase-last/heads/stitched-laundered 1570s ++ perl -ne ' 1570s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-laundered\E(?:\^\{\})?$#; 1570s END { print "$x\n" if length $x; } 1570s ' 1570s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + t-ref-same-val refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + local name=refs/debrebase-last/heads/stitched-laundered 1570s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + case "${t_ref_val-unset}" in 1570s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + t_ref_names+=("$name") 1570s + t-has-ancestor HEAD refs/debrebase-last/heads/work-scrap-stitched-laundered 1570s + local now 1570s ++ git rev-parse HEAD 1570s + now=64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + local ancestor 1570s ++ git rev-parse 'HEAD^{}' 1570s + ancestor=64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + local mbase 1570s ++ t-git-merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s ++ git merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + mbase=64d2fdf7628f675981360f0dce3aaaa227b0676a 1570s + '[' x64d2fdf7628f675981360f0dce3aaaa227b0676a '!=' x64d2fdf7628f675981360f0dce3aaaa227b0676a ']' 1570s + checkletters= 1570s + '[' x '!=' x ']' 1570s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1570s + work=work-scrap-stitched-mixed 1570s + : '---------- scrap stitched-mixed ----------' 1570s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 1570s + git update-ref --stdin 1570s + sed s/stitched-mixed/work-scrap-stitched-mixed/ 1570s + git checkout work-scrap-stitched-mixed 1570s Switched to branch 'work-scrap-stitched-mixed' 1570s + checkletters=Ns 1570s + shift 1570s + before=before-work-scrap-stitched-mixed 1570s + git branch before-work-scrap-stitched-mixed 1570s + local xopts= 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + t-expect-fail E:. t-git-debrebase scrap 1570s + local mpat=E:. 1570s + shift 1570s + set +o pipefail 1570s + LC_MESSAGES=C 1570s + LANGUAGE=C 1570s + t-git-debrebase scrap 1570s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D scrap 1570s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-mixed 1570s 1570s git-debrebase: error: No ongoing git-debrebase session. 1570s + local 'ps=255 0' 1570s + set -o pipefail 1570s + case $ps in 1570s + t-grep-mpat E:. /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local mpat=E:. 1570s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local grepper=fgrep 1570s + case "$mpat" in 1570s + case "$mpat" in 1570s + grepper=egrep 1570s + mpat=. 1570s + egrep -e . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D scrap 1570s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-mixed 1570s git-debrebase: error: No ongoing git-debrebase session. 1570s + xopts+=' --noop-ok' 1570s + next_checkletter 1570s + checkletters=s 1570s + case "$checkletters" in 1570s + t-git-debrebase --noop-ok scrap 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D --noop-ok scrap 1570s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-mixed 1570s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1570s ' 1570s + peel=peel-scrap-stitched-mixed 1570s + git checkout -b peel-scrap-stitched-mixed 1570s Switched to a new branch 'peel-scrap-stitched-mixed' 1570s + t-clean-on-branch peel-scrap-stitched-mixed 1570s + t-output '## peel-scrap-stitched-mixed' git status -b --porcelain 1570s + printf '%s\n' '## peel-scrap-stitched-mixed' 1570s + shift 1570s + git status -b --porcelain 1570s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1570s + : '---------- scrap stitched-mixed s ----------' 1570s + '[' xs '!=' x ']' 1570s + : '---- scrap stitched-mixed ...s ----' 1570s + make_check s 1570s + case "$1" in 1570s + t-refs-notexist refs/ffq-prev/heads/work-scrap-stitched-mixed 1570s + local val 1570s + for g in $* 1570s ++ t-git-get-ref refs/ffq-prev/heads/work-scrap-stitched-mixed 1570s ++ local ref=refs/ffq-prev/heads/work-scrap-stitched-mixed 1570s ++ case "$ref" in 1570s ++ git show-ref -d refs/ffq-prev/heads/work-scrap-stitched-mixed 1570s ++ perl -ne ' 1570s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-scrap-stitched-mixed\E(?:\^\{\})?$#; 1570s END { print "$x\n" if length $x; } 1570s ' 1570s ++ test 1 = 1 1570s + val= 1570s + '[' x '!=' x ']' 1570s + t-refs-same-start 1570s + unset t_ref_val 1570s + t_ref_names=() 1570s + t-refs-same refs/debrebase-last/heads/work-scrap-stitched-mixed refs/debrebase-last/heads/stitched-mixed 1570s + local g 1570s + for g in $* 1570s + t-ref-same refs/debrebase-last/heads/work-scrap-stitched-mixed 1570s + local name=refs/debrebase-last/heads/work-scrap-stitched-mixed 1570s + local val 1570s ++ t-git-get-ref refs/debrebase-last/heads/work-scrap-stitched-mixed 1570s ++ local ref=refs/debrebase-last/heads/work-scrap-stitched-mixed 1570s ++ case "$ref" in 1570s ++ git show-ref -d refs/debrebase-last/heads/work-scrap-stitched-mixed 1570s ++ perl -ne ' 1570s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-scrap-stitched-mixed\E(?:\^\{\})?$#; 1570s END { print "$x\n" if length $x; } 1570s ' 1570s ++ test 1 = 1 1570s + val= 1570s + t-ref-same-val refs/debrebase-last/heads/work-scrap-stitched-mixed 1570s + local name=refs/debrebase-last/heads/work-scrap-stitched-mixed 1570s + local val= 1570s + case "${t_ref_val-unset}" in 1570s + t_ref_val= 1570s + t_ref_names+=("$name") 1570s + for g in $* 1570s + t-ref-same refs/debrebase-last/heads/stitched-mixed 1570s + local name=refs/debrebase-last/heads/stitched-mixed 1570s + local val 1570s ++ t-git-get-ref refs/debrebase-last/heads/stitched-mixed 1570s ++ local ref=refs/debrebase-last/heads/stitched-mixed 1570s ++ case "$ref" in 1570s ++ perl -ne ' 1570s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-mixed\E(?:\^\{\})?$#; 1570s END { print "$x\n" if length $x; } 1570s ' 1570s ++ git show-ref -d refs/debrebase-last/heads/stitched-mixed 1570s ++ test 1 = 1 1570s + val= 1570s + t-ref-same-val refs/debrebase-last/heads/stitched-mixed 1570s + local name=refs/debrebase-last/heads/stitched-mixed 1570s + local val= 1570s + case "${t_ref_val-unset}" in 1570s + t_ref_val= 1570s + t_ref_names+=("$name") 1570s + t-has-ancestor HEAD refs/debrebase-last/heads/work-scrap-stitched-mixed 1570s + local now 1570s ++ git rev-parse HEAD 1570s + now=5e0bf3cea3c715230b96aca41156852390014b98 1570s + local ancestor 1570s ++ git rev-parse 'HEAD^{}' 1570s + ancestor=5e0bf3cea3c715230b96aca41156852390014b98 1570s + local mbase 1570s ++ t-git-merge-base 5e0bf3cea3c715230b96aca41156852390014b98 5e0bf3cea3c715230b96aca41156852390014b98 1570s ++ git merge-base 5e0bf3cea3c715230b96aca41156852390014b98 5e0bf3cea3c715230b96aca41156852390014b98 1570s + mbase=5e0bf3cea3c715230b96aca41156852390014b98 1570s + '[' x5e0bf3cea3c715230b96aca41156852390014b98 '!=' x5e0bf3cea3c715230b96aca41156852390014b98 ']' 1570s + checkletters= 1570s + '[' x '!=' x ']' 1570s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1570s + work=work-scrap-unstitched-laundered 1570s + : '---------- scrap unstitched-laundered ----------' 1570s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 1570s + git update-ref --stdin 1570s + sed s/unstitched-laundered/work-scrap-unstitched-laundered/ 1570s + git checkout work-scrap-unstitched-laundered 1570s Switched to branch 'work-scrap-unstitched-laundered' 1570s + checkletters=Z 1570s + shift 1570s + before=before-work-scrap-unstitched-laundered 1570s + git branch before-work-scrap-unstitched-laundered 1570s + local xopts= 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + t-git-debrebase scrap 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D scrap 1570s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-unstitched-laundered 1570s git-debrebase >= update refs/debrebase-last/heads/work-scrap-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 0000000000000000000000000000000000000000 1570s git-debrebase >= update refs/ffq-prev/heads/work-scrap-unstitched-laundered 0000000000000000000000000000000000000000 5c6280b3d52c002248dd7f608e1adb63f1295538 1570s git-debrebase >= update HEAD 5c6280b3d52c002248dd7f608e1adb63f1295538 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1570s git-debrebase >$ 1570s HEAD is now at 5c6280b MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 1570s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1570s ' 1570s + peel=peel-scrap-unstitched-laundered 1570s + git checkout -b peel-scrap-unstitched-laundered 1570s Switched to a new branch 'peel-scrap-unstitched-laundered' 1570s + t-clean-on-branch peel-scrap-unstitched-laundered 1570s + t-output '## peel-scrap-unstitched-laundered' git status -b --porcelain 1570s + printf '%s\n' '## peel-scrap-unstitched-laundered' 1570s + shift 1570s + git status -b --porcelain 1570s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1570s + : '---------- scrap unstitched-laundered Z ----------' 1570s + '[' xZ '!=' x ']' 1570s + : '---- scrap unstitched-laundered ...Z ----' 1570s + make_check Z 1570s + case "$1" in 1570s + t-refs-same-start 1570s + unset t_ref_val 1570s + t_ref_names=() 1570s + t-refs-same refs/heads/peel-scrap-unstitched-laundered 1570s + local g 1570s + for g in $* 1570s + t-ref-same refs/heads/peel-scrap-unstitched-laundered 1570s + local name=refs/heads/peel-scrap-unstitched-laundered 1570s + local val 1570s ++ t-git-get-ref refs/heads/peel-scrap-unstitched-laundered 1570s ++ local ref=refs/heads/peel-scrap-unstitched-laundered 1570s ++ case "$ref" in 1570s ++ git show-ref -d refs/heads/peel-scrap-unstitched-laundered 1570s ++ perl -ne ' 1570s $x = $1 if m#^(\w+) \Qrefs/heads/peel-scrap-unstitched-laundered\E(?:\^\{\})?$#; 1570s END { print "$x\n" if length $x; } 1570s ' 1570s + val=5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + t-ref-same-val refs/heads/peel-scrap-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + local name=refs/heads/peel-scrap-unstitched-laundered 1570s + local val=5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + case "${t_ref_val-unset}" in 1570s + t_ref_val=5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + t_ref_names+=("$name") 1570s + t-refs-same refs/heads/before-unstitch/unstitched-laundered 1570s + local g 1570s + for g in $* 1570s + t-ref-same refs/heads/before-unstitch/unstitched-laundered 1570s + local name=refs/heads/before-unstitch/unstitched-laundered 1570s + local val 1570s ++ t-git-get-ref refs/heads/before-unstitch/unstitched-laundered 1570s ++ local ref=refs/heads/before-unstitch/unstitched-laundered 1570s ++ case "$ref" in 1570s ++ git show-ref -d refs/heads/before-unstitch/unstitched-laundered 1570s ++ perl -ne ' 1570s $x = $1 if m#^(\w+) \Qrefs/heads/before-unstitch/unstitched-laundered\E(?:\^\{\})?$#; 1570s END { print "$x\n" if length $x; } 1570s ' 1570s + val=5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + t-ref-same-val refs/heads/before-unstitch/unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + local name=refs/heads/before-unstitch/unstitched-laundered 1570s + local val=5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + case "${t_ref_val-unset}" in 1570s + t_ref_val=5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + t_ref_names+=("$name") 1570s + t-ref-head 1570s + local val 1570s ++ git rev-parse HEAD 1570s + val=5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + t-ref-same-val HEAD 5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + local name=HEAD 1570s + local val=5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + case "${t_ref_val-unset}" in 1570s + t_ref_val=5c6280b3d52c002248dd7f608e1adb63f1295538 1570s + t_ref_names+=("$name") 1570s + checkletters= 1570s + '[' x '!=' x ']' 1570s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1570s + work=work-scrap-unstitched-mixed 1570s + : '---------- scrap unstitched-mixed ----------' 1570s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 1570s + git update-ref --stdin 1570s + sed s/unstitched-mixed/work-scrap-unstitched-mixed/ 1570s + git checkout work-scrap-unstitched-mixed 1570s Switched to branch 'work-scrap-unstitched-mixed' 1570s + checkletters=Z 1570s + shift 1570s + before=before-work-scrap-unstitched-mixed 1570s + git branch before-work-scrap-unstitched-mixed 1570s + local xopts= 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + case "$checkletters" in 1570s + t-git-debrebase scrap 1570s + local gdr=git-debrebase 1570s + : ' 1570s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1570s + git-debrebase --dgit=dgit -D scrap 1571s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-unstitched-mixed 1571s git-debrebase >= update refs/debrebase-last/heads/work-scrap-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0000000000000000000000000000000000000000 1571s git-debrebase >= update refs/ffq-prev/heads/work-scrap-unstitched-mixed 0000000000000000000000000000000000000000 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s git-debrebase >= update HEAD 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 9b56b9c2600dc10b9eec97d535d89870476de971 1571s git-debrebase >$ 1571s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 1571s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1571s ' 1571s + peel=peel-scrap-unstitched-mixed 1571s + git checkout -b peel-scrap-unstitched-mixed 1571s Switched to a new branch 'peel-scrap-unstitched-mixed' 1571s + t-clean-on-branch peel-scrap-unstitched-mixed 1571s + t-output '## peel-scrap-unstitched-mixed' git status -b --porcelain 1571s + printf '%s\n' '## peel-scrap-unstitched-mixed' 1571s + shift 1571s + git status -b --porcelain 1571s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1571s + : '---------- scrap unstitched-mixed Z ----------' 1571s + '[' xZ '!=' x ']' 1571s + : '---- scrap unstitched-mixed ...Z ----' 1571s + make_check Z 1571s + case "$1" in 1571s + t-refs-same-start 1571s + unset t_ref_val 1571s + t_ref_names=() 1571s + t-refs-same refs/heads/peel-scrap-unstitched-mixed 1571s + local g 1571s + for g in $* 1571s + t-ref-same refs/heads/peel-scrap-unstitched-mixed 1571s + local name=refs/heads/peel-scrap-unstitched-mixed 1571s + local val 1571s ++ t-git-get-ref refs/heads/peel-scrap-unstitched-mixed 1571s ++ local ref=refs/heads/peel-scrap-unstitched-mixed 1571s ++ case "$ref" in 1571s ++ git show-ref -d refs/heads/peel-scrap-unstitched-mixed 1571s ++ perl -ne ' 1571s $x = $1 if m#^(\w+) \Qrefs/heads/peel-scrap-unstitched-mixed\E(?:\^\{\})?$#; 1571s END { print "$x\n" if length $x; } 1571s ' 1571s + val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + t-ref-same-val refs/heads/peel-scrap-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + local name=refs/heads/peel-scrap-unstitched-mixed 1571s + local val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + case "${t_ref_val-unset}" in 1571s + t_ref_val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + t_ref_names+=("$name") 1571s + t-refs-same refs/heads/before-unstitch/unstitched-mixed 1571s + local g 1571s + for g in $* 1571s + t-ref-same refs/heads/before-unstitch/unstitched-mixed 1571s + local name=refs/heads/before-unstitch/unstitched-mixed 1571s + local val 1571s ++ t-git-get-ref refs/heads/before-unstitch/unstitched-mixed 1571s ++ local ref=refs/heads/before-unstitch/unstitched-mixed 1571s ++ case "$ref" in 1571s ++ git show-ref -d refs/heads/before-unstitch/unstitched-mixed 1571s ++ perl -ne ' 1571s $x = $1 if m#^(\w+) \Qrefs/heads/before-unstitch/unstitched-mixed\E(?:\^\{\})?$#; 1571s END { print "$x\n" if length $x; } 1571s ' 1571s + val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + t-ref-same-val refs/heads/before-unstitch/unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + local name=refs/heads/before-unstitch/unstitched-mixed 1571s + local val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + case "${t_ref_val-unset}" in 1571s + t_ref_val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + t_ref_names+=("$name") 1571s + t-ref-head 1571s + local val 1571s ++ git rev-parse HEAD 1571s + val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + t-ref-same-val HEAD 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + local name=HEAD 1571s + local val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + case "${t_ref_val-unset}" in 1571s + t_ref_val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1571s + t_ref_names+=("$name") 1571s + checkletters= 1571s + '[' x '!=' x ']' 1571s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1571s + work=work-scrap-raw-converted-from-gbp 1571s + : '---------- scrap raw-converted-from-gbp ----------' 1571s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 1571s + git update-ref --stdin 1571s + sed s/raw-converted-from-gbp/work-scrap-raw-converted-from-gbp/ 1571s + git checkout work-scrap-raw-converted-from-gbp 1571s Switched to branch 'work-scrap-raw-converted-from-gbp' 1571s + checkletters=N 1571s + shift 1571s + before=before-work-scrap-raw-converted-from-gbp 1571s + git branch before-work-scrap-raw-converted-from-gbp 1571s + local xopts= 1571s + case "$checkletters" in 1571s + case "$checkletters" in 1571s + case "$checkletters" in 1571s + t-expect-fail E:. t-git-debrebase scrap 1571s + local mpat=E:. 1571s + shift 1571s + set +o pipefail 1571s + LC_MESSAGES=C 1571s + LANGUAGE=C 1571s + t-git-debrebase scrap 1571s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1571s + local gdr=git-debrebase 1571s + : ' 1571s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1571s + git-debrebase --dgit=dgit -D scrap 1571s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-raw-converted-from-gbp 1571s 1571s git-debrebase: error: No ongoing git-debrebase session. 1571s + local 'ps=255 0' 1571s + set -o pipefail 1571s + case $ps in 1571s + t-grep-mpat E:. /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1571s + local mpat=E:. 1571s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1571s + local grepper=fgrep 1571s + case "$mpat" in 1571s + case "$mpat" in 1571s + grepper=egrep 1571s + mpat=. 1571s + egrep -e . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1571s + local gdr=git-debrebase 1571s + : ' 1571s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1571s + git-debrebase --dgit=dgit -D scrap 1571s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-raw-converted-from-gbp 1571s git-debrebase: error: No ongoing git-debrebase session. 1571s + xopts+=' --noop-ok' 1571s + next_checkletter 1571s + checkletters= 1571s + case "$checkletters" in 1571s + t-git-debrebase --noop-ok scrap 1571s + local gdr=git-debrebase 1571s + : ' 1571s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1571s + git-debrebase --dgit=dgit -D --noop-ok scrap 1571s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-raw-converted-from-gbp 1571s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1571s ' 1571s + peel=peel-scrap-raw-converted-from-gbp 1571s + git checkout -b peel-scrap-raw-converted-from-gbp 1571s Switched to a new branch 'peel-scrap-raw-converted-from-gbp' 1571s + t-clean-on-branch peel-scrap-raw-converted-from-gbp 1571s + t-output '## peel-scrap-raw-converted-from-gbp' git status -b --porcelain 1571s + printf '%s\n' '## peel-scrap-raw-converted-from-gbp' 1571s + shift 1571s + git status -b --porcelain 1571s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1571s + : '---------- scrap raw-converted-from-gbp ----------' 1571s + '[' x '!=' x ']' 1571s + subcmd make-patches sPft 'F:Patch export produced patch amendments' uPft 'F:Patch export produced patch amendments' Pn 1571s + local subcmd=make-patches 1571s + shift 1571s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1571s + work=work-make-patches-stitched-laundered 1571s + : '---------- make-patches stitched-laundered ----------' 1571s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 1571s + git update-ref --stdin 1571s + sed s/stitched-laundered/work-make-patches-stitched-laundered/ 1571s + git checkout work-make-patches-stitched-laundered 1571s Switched to branch 'work-make-patches-stitched-laundered' 1571s + checkletters=sPft 1571s + shift 1571s + before=before-work-make-patches-stitched-laundered 1571s + git branch before-work-make-patches-stitched-laundered 1571s + local xopts= 1571s + case "$checkletters" in 1571s + case "$checkletters" in 1571s + case "$checkletters" in 1571s + case "$checkletters" in 1571s + t-git-debrebase make-patches 1571s + local gdr=git-debrebase 1571s + : ' 1571s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1571s + git-debrebase --dgit=dgit -D make-patches 1571s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 1571s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 1571s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 1571s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804"},{"Differs" => 8,"Ix" => 1,"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9"}],"CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a","Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]],"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent dab3cc0fcfead932f6714305cfb670067c157804\nparent 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Pseudomerge"} 1571s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1571s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1571s 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","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"}]} 1571s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1571s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1571s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391"}],"Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","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"} 1571s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1571s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1571s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"}],"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","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"} 1571s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1571s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1571s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Differs" => 2,"Ix" => 0}],"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","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"} 1571s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1571s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1571s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","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"} 1571s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1571s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1571s git-debrebase = Upstream {"Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","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","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d"}]} 1571s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1571s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1571s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}],"Type" => "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","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d"} 1571s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1571s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1571s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48"}],"Type" => "Packaging","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","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"} 1571s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1571s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1571s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"}],"Type" => "Packaging","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","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"} 1571s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1571s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1571s git-debrebase = Packaging {"Parents" => [{"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Ix" => 0,"Differs" => 32}],"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","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472"} 1571s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1571s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1571s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"}],"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"} 1571s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1571s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1571s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Differs" => 16,"Ix" => 0}],"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","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"} 1571s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1571s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1571s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"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","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1571s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1571s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1571s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1571s 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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"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"} 1571s git-debrebase *** WALK 64d2fdf7628f675981360f0dce3aaaa227b0676a 0 - 1571s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 1571s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 1571s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 1571s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent dab3cc0fcfead932f6714305cfb670067c157804\nparent 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Contributor" => {"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Ix" => 0,"Differs" => 0},"CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a","Overwritten" => [{"Differs" => 8,"Ix" => 1,"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9"}],"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n"} 1571s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 1571s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 1571s git-debrebase = Upstream {"Parents" => [{"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Ix" => 0,"Differs" => 2}],"Type" => "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"} 1571s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 1571s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 1571s git-debrebase = Upstream {"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","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf"} 1571s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 1571s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 1571s git-debrebase = Upstream {"Type" => "Upstream","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","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555"} 1571s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 1571s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 1571s git-debrebase = Upstream {"Parents" => [{"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Ix" => 0,"Differs" => 2}],"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","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745"} 1571s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 1571s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 1571s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Ix" => 0,"Differs" => 2}],"Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","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"} 1571s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 1571s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 1571s git-debrebase = Upstream {"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","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","Type" => "Upstream","Parents" => [{"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Ix" => 0,"Differs" => 2}]} 1571s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 1571s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 1571s git-debrebase = Upstream {"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","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}],"Type" => "Upstream"} 1571s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 1571s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 1571s 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","Type" => "Packaging","Parents" => [{"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Differs" => 32,"Ix" => 0}]} 1571s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 1571s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 1571s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c"} 1571s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 1571s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 1571s git-debrebase = Packaging {"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","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"}]} 1571s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 1571s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 1571s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"}],"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","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"} 1571s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1571s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 1571s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","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","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2"}]} 1571s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1571s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1571s 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","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}]} 1571s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1571s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1571s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1571s 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},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"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","Type" => "Anchor"} 1571s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 15 pm 0 1571s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1571s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1571s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 1571s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1571s git-debrebase WALK BUILD bef5ccd302033398655e3e4e8896fba41691d0b2 Debian (rewriting=0) 1571s git-debrebase WALK BUILD 6b98ac2fc854dc69f9cabc904a8e43328f649f41 Debian (rewriting=0) 1571s git-debrebase WALK BUILD 6184b930def645d1f8da8cb6a91475445cbb817d Debian (rewriting=0) 1571s git-debrebase WALK BUILD 4926fc77fd0b974ce5a2892ad46669ed4ec14edb Debian (rewriting=0) 1571s git-debrebase WALK BUILD 420fa3b34303353709bcfbcf88ccc4e272f5ee48 Debian (rewriting=0) 1571s git-debrebase WALK BUILD 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 Debian (rewriting=0) 1571s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1571s git-debrebase WALK BUILD 64efa6cded3fc4da385f8ed4bd8c72164c1c914d Upstream (rewriting=0) 1571s git-debrebase WALK BUILD b0291461cc529ff9fa4060b3e41ebff6cb563c49 Upstream (rewriting=0) 1571s git-debrebase WALK BUILD 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 Upstream (rewriting=0) 1571s git-debrebase WALK BUILD cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 Upstream (rewriting=0) 1571s git-debrebase WALK BUILD 3025551c1e030f25c60bdabaab789745e585f391 Upstream (rewriting=0) 1571s git-debrebase WALK BUILD 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 Upstream (rewriting=0) 1571s git-debrebase WALK BUILD dab3cc0fcfead932f6714305cfb670067c157804 Upstream (rewriting=0) 1571s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1571s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1571s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a = 0 1571s git-debrebase *** WALK RETURN dab3cc0fcfead932f6714305cfb670067c157804 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1571s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1571s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1571s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1571s git-debrebase gbp_pq_export bw 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 dab3cc0fcfead932f6714305cfb670067c157804 1571s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1571s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1571s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1571s git-debrebase get_differs 64d2fdf7628f675981360f0dce3aaaa227b0676a c2291d120a12b2aae559cc4d1ac6940b480e39af = 0x4 1571s git-debrebase >= update HEAD c2291d120a12b2aae559cc4d1ac6940b480e39af 64d2fdf7628f675981360f0dce3aaaa227b0676a 1571s git-debrebase >$ 1571s HEAD is now at c2291d1 Commit patch queue (exported by git-debrebase) 1571s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1571s ' 1571s + peel=peel-make-patches-stitched-laundered 1571s + git checkout -b peel-make-patches-stitched-laundered 1571s Switched to a new branch 'peel-make-patches-stitched-laundered' 1571s + t-clean-on-branch peel-make-patches-stitched-laundered 1571s + t-output '## peel-make-patches-stitched-laundered' git status -b --porcelain 1571s + printf '%s\n' '## peel-make-patches-stitched-laundered' 1571s + shift 1571s + git status -b --porcelain 1571s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1571s + : '---------- make-patches stitched-laundered sPft ----------' 1571s + '[' xsPft '!=' x ']' 1571s + : '---- make-patches stitched-laundered ...sPft ----' 1571s + make_check sPft 1571s + case "$1" in 1571s + t-refs-notexist refs/ffq-prev/heads/work-make-patches-stitched-laundered 1571s + local val 1571s + for g in $* 1571s ++ t-git-get-ref refs/ffq-prev/heads/work-make-patches-stitched-laundered 1571s ++ local ref=refs/ffq-prev/heads/work-make-patches-stitched-laundered 1571s ++ case "$ref" in 1571s ++ perl -ne ' 1571s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-make-patches-stitched-laundered\E(?:\^\{\})?$#; 1571s END { print "$x\n" if length $x; } 1571s ' 1571s ++ git show-ref -d refs/ffq-prev/heads/work-make-patches-stitched-laundered 1571s ++ test 1 = 1 1571s + val= 1571s + '[' x '!=' x ']' 1571s + t-refs-same-start 1571s + unset t_ref_val 1571s + t_ref_names=() 1571s + t-refs-same refs/debrebase-last/heads/work-make-patches-stitched-laundered refs/debrebase-last/heads/stitched-laundered 1571s + local g 1571s + for g in $* 1571s + t-ref-same refs/debrebase-last/heads/work-make-patches-stitched-laundered 1571s + local name=refs/debrebase-last/heads/work-make-patches-stitched-laundered 1571s + local val 1571s ++ t-git-get-ref refs/debrebase-last/heads/work-make-patches-stitched-laundered 1571s ++ local ref=refs/debrebase-last/heads/work-make-patches-stitched-laundered 1571s ++ case "$ref" in 1571s ++ git show-ref -d refs/debrebase-last/heads/work-make-patches-stitched-laundered 1571s ++ perl -ne ' 1571s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-make-patches-stitched-laundered\E(?:\^\{\})?$#; 1571s END { print "$x\n" if length $x; } 1571s ' 1571s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1571s + t-ref-same-val refs/debrebase-last/heads/work-make-patches-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1571s + local name=refs/debrebase-last/heads/work-make-patches-stitched-laundered 1571s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1571s + case "${t_ref_val-unset}" in 1571s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1571s + t_ref_names+=("$name") 1571s + for g in $* 1571s + t-ref-same refs/debrebase-last/heads/stitched-laundered 1571s + local name=refs/debrebase-last/heads/stitched-laundered 1571s + local val 1571s ++ t-git-get-ref refs/debrebase-last/heads/stitched-laundered 1571s ++ local ref=refs/debrebase-last/heads/stitched-laundered 1571s ++ case "$ref" in 1571s ++ git show-ref -d refs/debrebase-last/heads/stitched-laundered 1571s ++ perl -ne ' 1571s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-laundered\E(?:\^\{\})?$#; 1571s END { print "$x\n" if length $x; } 1571s ' 1571s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1571s + t-ref-same-val refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1571s + local name=refs/debrebase-last/heads/stitched-laundered 1571s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1571s + case "${t_ref_val-unset}" in 1571s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1571s + t_ref_names+=("$name") 1571s + t-has-ancestor HEAD refs/debrebase-last/heads/work-make-patches-stitched-laundered 1571s + local now 1571s ++ git rev-parse HEAD 1571s + now=c2291d120a12b2aae559cc4d1ac6940b480e39af 1571s + local ancestor 1571s ++ git rev-parse 'HEAD^{}' 1571s + ancestor=c2291d120a12b2aae559cc4d1ac6940b480e39af 1571s + local mbase 1571s ++ t-git-merge-base c2291d120a12b2aae559cc4d1ac6940b480e39af c2291d120a12b2aae559cc4d1ac6940b480e39af 1571s ++ git merge-base c2291d120a12b2aae559cc4d1ac6940b480e39af c2291d120a12b2aae559cc4d1ac6940b480e39af 1571s + mbase=c2291d120a12b2aae559cc4d1ac6940b480e39af 1571s + '[' xc2291d120a12b2aae559cc4d1ac6940b480e39af '!=' xc2291d120a12b2aae559cc4d1ac6940b480e39af ']' 1571s + checkletters=Pft 1571s + '[' xPft '!=' x ']' 1571s + : '---- make-patches stitched-laundered ...Pft ----' 1571s + make_check Pft 1571s + case "$1" in 1571s + t-dgit -wgf --quilt=nofix quilt-fixup 1571s + local dgit=dgit 1571s + pwd 1571s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1571s + : ' 1571s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1571s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --quilt=nofix quilt-fixup 1572s | git rev-parse --show-toplevel 1572s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1572s | git config -z --get-regexp --local '.*' 1572s | git config -z --get-regexp --local '.*' 1572s | git config -z --get-regexp --global '.*' 1572s | git config -z --get-regexp --system '.*' 1572s format 3.0 (quilt), quilt mode nofix 1572s Format `3.0 (quilt)', need to check/update patch stack 1572s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1572s => `' 1572s + git diff --quiet HEAD 1572s + git clean -xdff 1572s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1572s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1572s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1572s | git rev-parse 'HEAD~0' 1572s => `c2291d120a12b2aae559cc4d1ac6940b480e39af' 1572s | git symbolic-ref -q HEAD 1572s => `refs/heads/peel-make-patches-stitched-laundered' 1572s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1572s CD work 1572s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1572s + git reset -q --hard c2291d120a12b2aae559cc4d1ac6940b480e39af 1572s examining quilt state (multiple patches, nofix mode) 1572s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1572s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1572s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1572s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1572s CD fake 1572s | find -name .git -prune -print0 1572s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1572s + git checkout -f c2291d120a12b2aae559cc4d1ac6940b480e39af -- debian 1572s + git add -Af . 1572s | git write-tree 1572s => `cf7723837423b89bee4a40933d910c12cafd6edb' 1572s fake orig tree object cf7723837423b89bee4a40933d910c12cafd6edb 1572s CD .. 1572s + git reset -q --hard c2291d120a12b2aae559cc4d1ac6940b480e39af 1572s CD ../fake 1572s + git add -Af . 1572s | git write-tree 1572s => `2b673ea0e208ca3a73f92c92d84de00c8e730b68' 1572s fake o+d/p tree object cf7723837423b89bee4a40933d910c12cafd6edb 1572s CD ../work 1572s | git ls-tree --name-only -z c2291d120a12b2aae559cc4d1ac6940b480e39af 1572s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1572s | git diff-tree -z --no-renames -r cf7723837423b89bee4a40933d910c12cafd6edb c2291d120a12b2aae559cc4d1ac6940b480e39af 1572s => `: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' 1572s quiltify_trees_differ cf7723837423b89bee4a40933d910c12cafd6edb c2291d120a12b2aae559cc4d1ac6940b480e39af => 1 1572s | git diff-tree -z --no-renames --name-only -r c2291d120a12b2aae559cc4d1ac6940b480e39af 2b673ea0e208ca3a73f92c92d84de00c8e730b68 1572s => `' 1572s quiltify_trees_differ c2291d120a12b2aae559cc4d1ac6940b480e39af 2b673ea0e208ca3a73f92c92d84de00c8e730b68 => 0 1572s | git diff-tree -z --no-renames --name-only -r cf7723837423b89bee4a40933d910c12cafd6edb 2b673ea0e208ca3a73f92c92d84de00c8e730b68 1572s => `lib.c\x00new-upstream-file\x00src.c\x00' 1572s quiltify_trees_differ cf7723837423b89bee4a40933d910c12cafd6edb 2b673ea0e208ca3a73f92c92d84de00c8e730b68 => 1 1572s differences @dl ## ## == == == ==. 1572s dgit: base trees orig=cf7723837423b89bee4a o+d/p=2b673ea0e208ca3a73f9 1572s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1572s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1572s starting quiltify (multiple patches, nofix mode) 1572s | git ls-tree --name-only c2291d120a12b2aae559cc4d1ac6940b480e39af -- debian/rules debian/control 1572s => `debian/control'... 1572s quiltify investigate c2291d120a12b2aae559cc4d1ac6940b480e39af 1572s | git diff-tree -z --no-renames --name-only c2291d120a12b2aae559cc4d1ac6940b480e39af 2b673ea0e208ca3a73f92c92d84de00c8e730b68 1572s => `' 1572s quiltify_trees_differ c2291d120a12b2aae559cc4d1ac6940b480e39af 2b673ea0e208ca3a73f92c92d84de00c8e730b68 => 0 1572s search finished hooray! 1572s quiltify linearisation planning successful, executing... 1572s + git checkout -q master 1572s | git status --ignored --porcelain 1572s => `?? .pc/' 1572s nothing quilty to commit, ok. 1572s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1572s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1572s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1572s ' 1572s + git diff HEAD~ debian/patches 1572s + egrep . 1572s diff --git a/debian/patches/0001-Add-a-new-upstream-file.patch b/debian/patches/0001-Add-a-new-upstream-file.patch 1572s new file mode 100644 1572s index 0000000..0405708 1572s --- /dev/null 1572s +++ b/debian/patches/0001-Add-a-new-upstream-file.patch 1572s @@ -0,0 +1,16 @@ 1572s +From: Ian Jackson 1572s +Date: Sun, 6 Dec 2015 23:50:08 +0000 1572s +Subject: Add a new upstream file 1572s + 1572s +--- 1572s + new-upstream-file | 1 + 1572s + 1 file changed, 1 insertion(+) 1572s + create mode 100644 new-upstream-file 1572s + 1572s +diff --git a/new-upstream-file b/new-upstream-file 1572s +new file mode 100644 1572s +index 0000000..a2d670b 1572s +--- /dev/null 1572s ++++ b/new-upstream-file 1572s +@@ -0,0 +1 @@ 1572s ++Add a file 1572s diff --git a/debian/patches/0002-Edit-the-.c-file.patch b/debian/patches/0002-Edit-the-.c-file.patch 1572s new file mode 100644 1572s index 0000000..0e04924 1572s --- /dev/null 1572s +++ b/debian/patches/0002-Edit-the-.c-file.patch 1572s @@ -0,0 +1,15 @@ 1572s +From: Ian Jackson 1572s +Date: Sun, 6 Dec 2015 23:50:39 +0000 1572s +Subject: Edit the .c file 1572s + 1572s +--- 1572s + src.c | 2 +- 1572s + 1 file changed, 1 insertion(+), 1 deletion(-) 1572s + 1572s +diff --git a/src.c b/src.c 1572s +index 05437c5..6cc28de 100644 1572s +--- a/src.c 1572s ++++ b/src.c 1572s +@@ -1 +1 @@ 1572s +-main(){} 1572s ++main(void){} 1572s 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 1572s new file mode 100644 1572s index 0000000..154685d 1572s --- /dev/null 1572s +++ b/debian/patches/0004-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch 1572s @@ -0,0 +1,15 @@ 1572s +From: dgit test git user 1572s +Date: Tue, 26 Jun 2018 09:00:03 +0100 1572s +Subject: UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1) 1572s + 1572s +--- 1572s + src.c | 1 + 1572s + 1 file changed, 1 insertion(+) 1572s + 1572s +diff --git a/src.c b/src.c 1572s +index 6cc28de..41fcfa1 100644 1572s +--- a/src.c 1572s ++++ b/src.c 1572s +@@ -1 +1,2 @@ 1572s + main(void){} 1572s ++// upstream subcommands refs/heads/stitched-laundered 1 1572s 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 1572s new file mode 100644 1572s index 0000000..541a797 1572s --- /dev/null 1572s +++ b/debian/patches/0005-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch 1572s @@ -0,0 +1,17 @@ 1572s +From: dgit test git user 1572s +Date: Tue, 26 Jun 2018 09:00:03 +0100 1572s +Subject: MIXED add both() (subcommands refs/heads/stitched-laundered 1) 1572s + 1572s +[git-debrebase split: mixed commit: upstream part] 1572s +--- 1572s + src.c | 1 + 1572s + 1 file changed, 1 insertion(+) 1572s + 1572s +diff --git a/src.c b/src.c 1572s +index 41fcfa1..3a10090 100644 1572s +--- a/src.c 1572s ++++ b/src.c 1572s +@@ -1,2 +1,3 @@ 1572s + main(void){} 1572s + // upstream subcommands refs/heads/stitched-laundered 1 1572s ++// both! subcommands refs/heads/stitched-laundered 1 1572s 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 1572s new file mode 100644 1572s index 0000000..a34c666 1572s --- /dev/null 1572s +++ b/debian/patches/0006-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch 1572s @@ -0,0 +1,17 @@ 1572s +From: dgit test git user 1572s +Date: Tue, 26 Jun 2018 09:00:06 +0100 1572s +Subject: UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2) 1572s + 1572s +--- 1572s + src.c | 1 + 1572s + 1 file changed, 1 insertion(+) 1572s + 1572s +diff --git a/src.c b/src.c 1572s +index 3a10090..2a513ab 100644 1572s +--- a/src.c 1572s ++++ b/src.c 1572s +@@ -1,3 +1,4 @@ 1572s + main(void){} 1572s + // upstream subcommands refs/heads/stitched-laundered 1 1572s + // both! subcommands refs/heads/stitched-laundered 1 1572s ++// upstream subcommands refs/heads/stitched-laundered 2 1572s 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 1572s new file mode 100644 1572s index 0000000..2b26363 1572s --- /dev/null 1572s +++ b/debian/patches/0007-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch 1572s @@ -0,0 +1,18 @@ 1572s +From: dgit test git user 1572s +Date: Tue, 26 Jun 2018 09:00:06 +0100 1572s +Subject: MIXED add both() (subcommands refs/heads/stitched-laundered 2) 1572s + 1572s +[git-debrebase split: mixed commit: upstream part] 1572s +--- 1572s + src.c | 1 + 1572s + 1 file changed, 1 insertion(+) 1572s + 1572s +diff --git a/src.c b/src.c 1572s +index 2a513ab..ae034e0 100644 1572s +--- a/src.c 1572s ++++ b/src.c 1572s +@@ -2,3 +2,4 @@ main(void){} 1572s + // upstream subcommands refs/heads/stitched-laundered 1 1572s + // both! subcommands refs/heads/stitched-laundered 1 1572s + // upstream subcommands refs/heads/stitched-laundered 2 1572s ++// both! subcommands refs/heads/stitched-laundered 2 1572s diff --git a/debian/patches/series b/debian/patches/series 1572s new file mode 100644 1572s index 0000000..7972c30 1572s --- /dev/null 1572s +++ b/debian/patches/series 1572s @@ -0,0 +1,7 @@ 1572s +0001-Add-a-new-upstream-file.patch 1572s +0002-Edit-the-.c-file.patch 1572s +subdir/addnewups 1572s +0004-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch 1572s +0005-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch 1572s +0006-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch 1572s +0007-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch 1572s diff --git a/debian/patches/subdir/addnewups b/debian/patches/subdir/addnewups 1572s new file mode 100644 1572s index 0000000..1acc2e8 1572s --- /dev/null 1572s +++ b/debian/patches/subdir/addnewups 1572s @@ -0,0 +1,16 @@ 1572s +From: Ian Jackson 1572s +Date: Sat, 4 Jun 2016 22:09:32 +0100 1572s +Subject: Add another new upstream file 1572s + 1572s +--- 1572s + lib.c | 1 + 1572s + 1 file changed, 1 insertion(+) 1572s + create mode 100644 lib.c 1572s + 1572s +diff --git a/lib.c b/lib.c 1572s +new file mode 100644 1572s +index 0000000..e026ed3 1572s +--- /dev/null 1572s ++++ b/lib.c 1572s +@@ -0,0 +1 @@ 1572s ++void function(void){} 1572s + t-gdr-made-patches 1572s + git log -n1 --pretty=format:%B 1572s + egrep '^\[git-debrebase' 1572s [git-debrebase make-patches: export and commit patches] 1572s + git diff --quiet HEAD~ -- :. ':!debian/patches' 1572s + git reset --hard HEAD~ 1572s HEAD is now at 64d2fdf Declare fast forward / record previous work 1572s + checkletters=ft 1572s + '[' xft '!=' x ']' 1572s + : '---- make-patches stitched-laundered ...ft ----' 1572s + make_check ft 1572s + case "$1" in 1572s + t-has-ancestor HEAD refs/heads/before-work-make-patches-stitched-laundered 1572s + local now 1572s ++ git rev-parse HEAD 1572s + now=64d2fdf7628f675981360f0dce3aaaa227b0676a 1572s + local ancestor 1572s ++ git rev-parse 'HEAD^{}' 1572s + ancestor=64d2fdf7628f675981360f0dce3aaaa227b0676a 1572s + local mbase 1572s ++ t-git-merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 1572s ++ git merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 1572s + mbase=64d2fdf7628f675981360f0dce3aaaa227b0676a 1572s + '[' x64d2fdf7628f675981360f0dce3aaaa227b0676a '!=' x64d2fdf7628f675981360f0dce3aaaa227b0676a ']' 1572s + checkletters=t 1572s + '[' xt '!=' x ']' 1572s + : '---- make-patches stitched-laundered ...t ----' 1572s + make_check t 1572s + case "$1" in 1572s + git diff --quiet HEAD refs/heads/before-work-make-patches-stitched-laundered 1572s + checkletters= 1572s + '[' x '!=' x ']' 1572s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1572s + work=work-make-patches-stitched-mixed 1572s + : '---------- make-patches stitched-mixed ----------' 1572s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 1572s + git update-ref --stdin 1572s + sed s/stitched-mixed/work-make-patches-stitched-mixed/ 1572s + git checkout work-make-patches-stitched-mixed 1572s Switched to branch 'work-make-patches-stitched-mixed' 1572s + checkletters='F:Patch export produced patch amendments' 1572s + shift 1572s + before=before-work-make-patches-stitched-mixed 1572s + git branch before-work-make-patches-stitched-mixed 1572s + local xopts= 1572s + case "$checkletters" in 1572s + case "$checkletters" in 1572s + case "$checkletters" in 1572s + case "$checkletters" in 1572s + t-expect-fail 'F:Patch export produced patch amendments' t-git-debrebase make-patches 1572s + local 'mpat=F:Patch export produced patch amendments' 1572s + shift 1572s + set +o pipefail 1572s + LC_MESSAGES=C 1572s + LANGUAGE=C 1572s + t-git-debrebase make-patches 1572s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1572s + local gdr=git-debrebase 1572s + : ' 1572s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1572s + git-debrebase --dgit=dgit -D make-patches 1572s git-debrebase get_differs 7091adece516711371505e702f87d9973010f25b 50e48c643e8c0e3794bbfe42b45ab72549dda504 = 0x22 1572s git-debrebase classify 5e0bf3cea3c715230b96aca41156852390014b98 $t=50e48c643e8c0e3794bbfe42b45ab72549dda504 @p 7091adece516711371505e702f87d9973010f25b/0x22 1572s git-debrebase = Mixed {"Hdr" => "tree 50e48c643e8c0e3794bbfe42b45ab72549dda504\nparent 7091adece516711371505e702f87d9973010f25b\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Mixed","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "5e0bf3cea3c715230b96aca41156852390014b98","Parents" => [{"Differs" => 34,"CommitId" => "7091adece516711371505e702f87d9973010f25b","Ix" => 0}],"Tree" => "50e48c643e8c0e3794bbfe42b45ab72549dda504"} 1572s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (5e0bf3cea3c715230b96aca41156852390014b98) 1572s git-debrebase get_differs 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 6066466a7bfccd9539954883312605a59c5b4502 = 0x2 1572s git-debrebase classify 7091adece516711371505e702f87d9973010f25b $t=6066466a7bfccd9539954883312605a59c5b4502 @p 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1/0x2 1572s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "7091adece516711371505e702f87d9973010f25b","Tree" => "6066466a7bfccd9539954883312605a59c5b4502","Parents" => [{"Differs" => 2,"CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1","Ix" => 0}],"Hdr" => "tree 6066466a7bfccd9539954883312605a59c5b4502\nparent 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Upstream"} 1572s git-debrebase get_differs a5e2aaa2551f9e331d30511eb4356a22c939e752 0cbb6dcc737dae60cb32b3675f13a2dbfc737647 = 0x20 1572s git-debrebase classify 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 $t=0cbb6dcc737dae60cb32b3675f13a2dbfc737647 @p a5e2aaa2551f9e331d30511eb4356a22c939e752/0x20 1572s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752"}],"Tree" => "0cbb6dcc737dae60cb32b3675f13a2dbfc737647","Hdr" => "tree 0cbb6dcc737dae60cb32b3675f13a2dbfc737647\nparent a5e2aaa2551f9e331d30511eb4356a22c939e752\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Packaging"} 1572s git-debrebase get_differs 0a3febb41892833b131ed8ca6958d68efc7f925f 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 = 0x4 1572s git-debrebase classify a5e2aaa2551f9e331d30511eb4356a22c939e752 $t=0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 @p 0a3febb41892833b131ed8ca6958d68efc7f925f/0x4 1572s git-debrebase = AddPatches {"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","Parents" => [{"Differs" => 4,"CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Ix" => 0}],"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752"} 1572s git-debrebase get_differs c848bc784454d4635b6a71ea59b65b373615e8e4 cb27fe0206f700a55e3ec45caa3b80b9d71ed691 = 0x22 1572s git-debrebase classify 0a3febb41892833b131ed8ca6958d68efc7f925f $t=cb27fe0206f700a55e3ec45caa3b80b9d71ed691 @p c848bc784454d4635b6a71ea59b65b373615e8e4/0x22 1572s git-debrebase = Mixed {"Type" => "Mixed","Hdr" => "tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691\nparent c848bc784454d4635b6a71ea59b65b373615e8e4\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Tree" => "cb27fe0206f700a55e3ec45caa3b80b9d71ed691","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n"} 1572s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (0a3febb41892833b131ed8ca6958d68efc7f925f) 1572s git-debrebase get_differs 772b2a1d3dacffb5498a61b7c9518d57d439e1ca af40286d15dcd54aed3b8586be973b89dfad2ee8 = 0x2 1572s git-debrebase classify c848bc784454d4635b6a71ea59b65b373615e8e4 $t=af40286d15dcd54aed3b8586be973b89dfad2ee8 @p 772b2a1d3dacffb5498a61b7c9518d57d439e1ca/0x2 1572s git-debrebase = Upstream {"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,"Ix" => 0,"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca"}],"Tree" => "af40286d15dcd54aed3b8586be973b89dfad2ee8","CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n"} 1572s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf eadc003377c95410215ba90c8b32bc80c122ce2b = 0x20 1572s git-debrebase classify 772b2a1d3dacffb5498a61b7c9518d57d439e1ca $t=eadc003377c95410215ba90c8b32bc80c122ce2b @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 1572s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree eadc003377c95410215ba90c8b32bc80c122ce2b\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Tree" => "eadc003377c95410215ba90c8b32bc80c122ce2b","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n"} 1572s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1572s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1572s 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,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Differs" => 4}],"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"} 1572s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1572s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1572s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}],"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog"} 1572s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1572s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1572s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Ix" => 0}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog"} 1572s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1572s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1572s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1572s 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","Contributor" => {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0,"Differs" => 0},"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}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"} 1572s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1572s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1572s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0,"Differs" => 2}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 1572s git-debrebase: snag detected (-funclean-ordering): packaging change (772b2a1d3dacffb5498a61b7c9518d57d439e1ca) follows upstream change (eg 178896af44c5b02e05a3442df6c33233b6acb807) 1572s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1572s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1572s git-debrebase = Upstream {"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Parents" => [{"Ix" => 0,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2}],"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"} 1572s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1572s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1572s 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" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2}],"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream"} 1572s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1572s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1572s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1572s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","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"} 1572s git-debrebase *** WALK 5e0bf3cea3c715230b96aca41156852390014b98 0 - 1572s git-debrebase get_differs 7091adece516711371505e702f87d9973010f25b 50e48c643e8c0e3794bbfe42b45ab72549dda504 = 0x22 1572s git-debrebase classify 5e0bf3cea3c715230b96aca41156852390014b98 $t=50e48c643e8c0e3794bbfe42b45ab72549dda504 @p 7091adece516711371505e702f87d9973010f25b/0x22 1572s git-debrebase = Mixed {"Tree" => "50e48c643e8c0e3794bbfe42b45ab72549dda504","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "7091adece516711371505e702f87d9973010f25b"}],"CommitId" => "5e0bf3cea3c715230b96aca41156852390014b98","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Mixed","Hdr" => "tree 50e48c643e8c0e3794bbfe42b45ab72549dda504\nparent 7091adece516711371505e702f87d9973010f25b\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 1572s git-debrebase get_differs 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 6066466a7bfccd9539954883312605a59c5b4502 = 0x2 1572s git-debrebase classify 7091adece516711371505e702f87d9973010f25b $t=6066466a7bfccd9539954883312605a59c5b4502 @p 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1/0x2 1572s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Tree" => "6066466a7bfccd9539954883312605a59c5b4502","Parents" => [{"Ix" => 0,"CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1","Differs" => 2}],"CommitId" => "7091adece516711371505e702f87d9973010f25b","Hdr" => "tree 6066466a7bfccd9539954883312605a59c5b4502\nparent 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Upstream"} 1572s git-debrebase get_differs a5e2aaa2551f9e331d30511eb4356a22c939e752 0cbb6dcc737dae60cb32b3675f13a2dbfc737647 = 0x20 1572s git-debrebase classify 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 $t=0cbb6dcc737dae60cb32b3675f13a2dbfc737647 @p a5e2aaa2551f9e331d30511eb4356a22c939e752/0x20 1572s 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","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752"}],"CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1"} 1572s git-debrebase get_differs 0a3febb41892833b131ed8ca6958d68efc7f925f 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 = 0x4 1572s git-debrebase classify a5e2aaa2551f9e331d30511eb4356a22c939e752 $t=0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 @p 0a3febb41892833b131ed8ca6958d68efc7f925f/0x4 1572s git-debrebase = AddPatches {"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752","Parents" => [{"Ix" => 0,"CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Differs" => 4}],"Tree" => "0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Type" => "AddPatches","Hdr" => "tree 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3\nparent 0a3febb41892833b131ed8ca6958d68efc7f925f\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 1572s git-debrebase get_differs c848bc784454d4635b6a71ea59b65b373615e8e4 cb27fe0206f700a55e3ec45caa3b80b9d71ed691 = 0x22 1572s git-debrebase classify 0a3febb41892833b131ed8ca6958d68efc7f925f $t=cb27fe0206f700a55e3ec45caa3b80b9d71ed691 @p c848bc784454d4635b6a71ea59b65b373615e8e4/0x22 1572s git-debrebase = Mixed {"Type" => "Mixed","Hdr" => "tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691\nparent c848bc784454d4635b6a71ea59b65b373615e8e4\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Parents" => [{"Ix" => 0,"CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Differs" => 34}],"Tree" => "cb27fe0206f700a55e3ec45caa3b80b9d71ed691","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n"} 1572s git-debrebase get_differs 772b2a1d3dacffb5498a61b7c9518d57d439e1ca af40286d15dcd54aed3b8586be973b89dfad2ee8 = 0x2 1572s git-debrebase classify c848bc784454d4635b6a71ea59b65b373615e8e4 $t=af40286d15dcd54aed3b8586be973b89dfad2ee8 @p 772b2a1d3dacffb5498a61b7c9518d57d439e1ca/0x2 1572s git-debrebase = Upstream {"Hdr" => "tree af40286d15dcd54aed3b8586be973b89dfad2ee8\nparent 772b2a1d3dacffb5498a61b7c9518d57d439e1ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Parents" => [{"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Ix" => 0,"Differs" => 2}],"Tree" => "af40286d15dcd54aed3b8586be973b89dfad2ee8"} 1572s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf eadc003377c95410215ba90c8b32bc80c122ce2b = 0x20 1572s git-debrebase classify 772b2a1d3dacffb5498a61b7c9518d57d439e1ca $t=eadc003377c95410215ba90c8b32bc80c122ce2b @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 1572s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree eadc003377c95410215ba90c8b32bc80c122ce2b\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "eadc003377c95410215ba90c8b32bc80c122ce2b","Parents" => [{"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Ix" => 0,"Differs" => 32}],"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n"} 1572s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 1572s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 1572s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Parents" => [{"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Ix" => 0,"Differs" => 4}],"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "AddPatches"} 1572s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1572s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 1572s git-debrebase = Changelog {"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0}],"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"} 1572s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1572s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 1572s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","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","Type" => "Changelog"} 1572s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 1572s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 1572s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 1572s git-debrebase = Pseudomerge {"Contributor" => {"Differs" => 0,"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"},"Type" => "Pseudomerge","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"},{"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8}],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Overwritten" => [$VAR1->{"Parents"}[1]]} 1572s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1572s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1572s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0,"Differs" => 2}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream"} 1572s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1572s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1572s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0}],"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"} 1572s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1572s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1572s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","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","Type" => "Upstream"} 1572s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1572s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1572s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1572s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","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","Type" => "Anchor"} 1572s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 1572s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1572s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1572s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 20 1572s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1572s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 1572s git-debrebase WALK REWRITING NOW cl=HASH(0x6565f08c6f0) procd=HASH(0x6565f08c6d8) 1572s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 1572s git-debrebase WALK BUILD 772b2a1d3dacffb5498a61b7c9518d57d439e1ca Debian (rewriting=1) 1572s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1572s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Debian (rewriting=1) 1572s git-debrebase WALK BUILD 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 Debian (rewriting=1) 1572s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1572s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Debian (rewriting=1) 1572s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1572s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 1572s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 1572s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 1572s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1572s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1572s git-debrebase WALK BUILD c848bc784454d4635b6a71ea59b65b373615e8e4 Upstream (rewriting=1) 1572s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Upstream (rewriting=1) 1572s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1572s git-debrebase WALK BUILD 7091adece516711371505e702f87d9973010f25b Upstream (rewriting=1) 1572s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Upstream (rewriting=1) 1572s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1572s git-debrebase get_differs 97a91c40026ff6a52a5cc7d020dda82048f2e77d 5e0bf3cea3c715230b96aca41156852390014b98 = 0x4 1572s git-debrebase *** WALK RETURN 97a91c40026ff6a52a5cc7d020dda82048f2e77d e7d45cf6ecfa83b4fd6418de6b88f8471799e588 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1572s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1573s git-debrebase gbp_pq_export bw e7d45cf6ecfa83b4fd6418de6b88f8471799e588 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1573s git-debrebase get_differs 5e0bf3cea3c715230b96aca41156852390014b98 11b91ab8d256b1f506e17b2b74c080a50963cd9c = 0xc 1573s 1573s git-debrebase: error: Patch export produced patch amendments (abandoned output commit 11b91ab8d256b1f506e17b2b74c080a50963cd9c). Try laundering first. 1573s + local 'ps=7 0' 1573s + set -o pipefail 1573s + case $ps in 1573s + t-grep-mpat 'F:Patch export produced patch amendments' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1573s + local 'mpat=F:Patch export produced patch amendments' 1573s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1573s + local grepper=fgrep 1573s + case "$mpat" in 1573s + case "$mpat" in 1573s + grepper=fgrep 1573s + mpat='Patch export produced patch amendments' 1573s + fgrep -e 'Patch export produced patch amendments' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1573s git-debrebase: error: Patch export produced patch amendments (abandoned output commit 11b91ab8d256b1f506e17b2b74c080a50963cd9c). Try laundering first. 1573s + continue 1573s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1573s + work=work-make-patches-unstitched-laundered 1573s + : '---------- make-patches unstitched-laundered ----------' 1573s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 1573s + git update-ref --stdin 1573s + sed s/unstitched-laundered/work-make-patches-unstitched-laundered/ 1573s + git checkout work-make-patches-unstitched-laundered 1573s Switched to branch 'work-make-patches-unstitched-laundered' 1573s + checkletters=uPft 1573s + shift 1573s + before=before-work-make-patches-unstitched-laundered 1573s + git branch before-work-make-patches-unstitched-laundered 1573s + local xopts= 1573s + case "$checkletters" in 1573s + case "$checkletters" in 1573s + case "$checkletters" in 1573s + case "$checkletters" in 1573s + t-git-debrebase make-patches 1573s + local gdr=git-debrebase 1573s + : ' 1573s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1573s + git-debrebase --dgit=dgit -D make-patches 1573s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1573s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1573s 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","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}],"Type" => "Upstream"} 1573s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1573s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1573s git-debrebase = Upstream {"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}],"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","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"} 1573s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1573s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1573s 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" => [{"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0}],"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e"} 1573s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1573s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1573s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","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"} 1573s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1573s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1573s git-debrebase = Upstream {"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}],"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","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"} 1573s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1573s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1573s git-debrebase = Upstream {"Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 1573s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1573s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1573s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0}],"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","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"} 1573s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1573s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1573s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0,"Differs" => 32}],"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","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"} 1573s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1573s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1573s git-debrebase = 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","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}],"Type" => "Packaging"} 1573s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1573s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1573s git-debrebase = 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","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}],"Type" => "Packaging"} 1573s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1573s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1573s git-debrebase = 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","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Type" => "Packaging"} 1573s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1573s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1573s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","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"} 1573s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1573s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1573s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","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"} 1573s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1573s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1573s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1573s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1573s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 0 - 1573s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 1573s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 1573s git-debrebase = Upstream {"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","Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b"} 1573s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 1573s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 1573s git-debrebase = 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","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}],"Type" => "Upstream"} 1573s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 1573s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 1573s 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","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Parents" => [{"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2}],"Type" => "Upstream"} 1573s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 1573s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 1573s git-debrebase = Upstream {"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0,"Differs" => 2}],"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","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 1573s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 1573s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 1573s 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","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1573s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 1573s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 1573s git-debrebase = 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","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2}],"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5"} 1573s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 1573s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 1573s git-debrebase = Upstream {"Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","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"} 1573s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 1573s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 1573s 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","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0,"Differs" => 32}],"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 1573s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 1573s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 1573s 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" => [{"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32}]} 1573s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 1573s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 1573s git-debrebase = Packaging {"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Type" => "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","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 1573s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 1573s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 1573s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32}],"Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 1573s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1573s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1573s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "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","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n"} 1573s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1573s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1573s 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","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}]} 1573s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1573s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1573s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1573s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"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","OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 1573s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1573s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 14 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1573s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 1573s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 1573s git-debrebase WALK BUILD 515e62b8d591fcc68597383b955d898db71abc6c Debian (rewriting=0) 1573s git-debrebase WALK BUILD 301cc9756d79fc379acfed35ff33c0785f2e1b7d Debian (rewriting=0) 1573s git-debrebase WALK BUILD f2db5dc7e25f34f0f34d04d0160f912a76b3667d Debian (rewriting=0) 1573s git-debrebase WALK BUILD 86248dea3770451139d1a57015bd9b36aa1ed39c Debian (rewriting=0) 1573s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1573s git-debrebase WALK BUILD 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream (rewriting=0) 1573s git-debrebase WALK BUILD e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream (rewriting=0) 1573s git-debrebase WALK BUILD 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream (rewriting=0) 1573s git-debrebase WALK BUILD b79d513107e3cff19d401deb87cc3e6c4809966e Upstream (rewriting=0) 1573s git-debrebase WALK BUILD eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream (rewriting=0) 1573s git-debrebase WALK BUILD fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream (rewriting=0) 1573s git-debrebase WALK BUILD 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream (rewriting=0) 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1573s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 0 1573s git-debrebase *** WALK RETURN 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 86248dea3770451139d1a57015bd9b36aa1ed39c 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1573s git-debrebase gbp_pq_export bw 86248dea3770451139d1a57015bd9b36aa1ed39c 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1573s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1573s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 635f565e82edea90ebe97c024b3c4f6cad96eea2 = 0x4 1573s git-debrebase >= update HEAD 635f565e82edea90ebe97c024b3c4f6cad96eea2 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1573s git-debrebase >$ 1573s HEAD is now at 635f565 Commit patch queue (exported by git-debrebase) 1573s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1573s ' 1573s + peel=peel-make-patches-unstitched-laundered 1573s + git checkout -b peel-make-patches-unstitched-laundered 1573s Switched to a new branch 'peel-make-patches-unstitched-laundered' 1573s + t-clean-on-branch peel-make-patches-unstitched-laundered 1573s + t-output '## peel-make-patches-unstitched-laundered' git status -b --porcelain 1573s + printf '%s\n' '## peel-make-patches-unstitched-laundered' 1573s + shift 1573s + git status -b --porcelain 1573s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1573s + : '---------- make-patches unstitched-laundered uPft ----------' 1573s + '[' xuPft '!=' x ']' 1573s + : '---- make-patches unstitched-laundered ...uPft ----' 1573s + make_check uPft 1573s + case "$1" in 1573s + t-git-get-ref refs/ffq-prev/heads/work-make-patches-unstitched-laundered 1573s + local ref=refs/ffq-prev/heads/work-make-patches-unstitched-laundered 1573s + case "$ref" in 1573s + git show-ref -d refs/ffq-prev/heads/work-make-patches-unstitched-laundered 1573s + perl -ne ' 1573s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-make-patches-unstitched-laundered\E(?:\^\{\})?$#; 1573s END { print "$x\n" if length $x; } 1573s ' 1573s 5c6280b3d52c002248dd7f608e1adb63f1295538 1573s + t-refs-notexist refs/debrebase-last/heads/work-make-patches-unstitched-laundered 1573s + local val 1573s + for g in $* 1573s ++ t-git-get-ref refs/debrebase-last/heads/work-make-patches-unstitched-laundered 1573s ++ local ref=refs/debrebase-last/heads/work-make-patches-unstitched-laundered 1573s ++ case "$ref" in 1573s ++ git show-ref -d refs/debrebase-last/heads/work-make-patches-unstitched-laundered 1573s ++ perl -ne ' 1573s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-make-patches-unstitched-laundered\E(?:\^\{\})?$#; 1573s END { print "$x\n" if length $x; } 1573s ' 1573s ++ test 1 = 1 1573s + val= 1573s + '[' x '!=' x ']' 1573s + checkletters=Pft 1573s + '[' xPft '!=' x ']' 1573s + : '---- make-patches unstitched-laundered ...Pft ----' 1573s + make_check Pft 1573s + case "$1" in 1573s + t-dgit -wgf --quilt=nofix quilt-fixup 1573s + local dgit=dgit 1573s + pwd 1573s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1573s + : ' 1573s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1573s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --quilt=nofix quilt-fixup 1573s | git rev-parse --show-toplevel 1573s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1573s | git config -z --get-regexp --local '.*' 1573s | git config -z --get-regexp --local '.*' 1573s | git config -z --get-regexp --global '.*' 1573s | git config -z --get-regexp --system '.*' 1573s format 3.0 (quilt), quilt mode nofix 1573s Format `3.0 (quilt)', need to check/update patch stack 1573s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1573s => `' 1573s + git diff --quiet HEAD 1573s + git clean -xdff 1573s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1573s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1573s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1573s | git rev-parse 'HEAD~0' 1573s => `635f565e82edea90ebe97c024b3c4f6cad96eea2' 1573s | git symbolic-ref -q HEAD 1573s => `refs/heads/peel-make-patches-unstitched-laundered' 1573s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1573s CD work 1573s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1573s + git reset -q --hard 635f565e82edea90ebe97c024b3c4f6cad96eea2 1573s examining quilt state (multiple patches, nofix mode) 1573s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1573s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1573s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1573s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1574s CD fake 1574s | find -name .git -prune -print0 1574s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1574s + git checkout -f 635f565e82edea90ebe97c024b3c4f6cad96eea2 -- debian 1574s + git add -Af . 1574s | git write-tree 1574s => `886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e' 1574s fake orig tree object 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 1574s CD .. 1574s + git reset -q --hard 635f565e82edea90ebe97c024b3c4f6cad96eea2 1574s CD ../fake 1574s + git add -Af . 1574s | git write-tree 1574s => `445886c352b204b21cc3851f2592ea89bfea0d32' 1574s fake o+d/p tree object 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 1574s CD ../work 1574s | git ls-tree --name-only -z 635f565e82edea90ebe97c024b3c4f6cad96eea2 1574s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1574s | git diff-tree -z --no-renames -r 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 635f565e82edea90ebe97c024b3c4f6cad96eea2 1574s => `: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' 1574s quiltify_trees_differ 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 635f565e82edea90ebe97c024b3c4f6cad96eea2 => 1 1574s | git diff-tree -z --no-renames --name-only -r 635f565e82edea90ebe97c024b3c4f6cad96eea2 445886c352b204b21cc3851f2592ea89bfea0d32 1574s => `' 1574s quiltify_trees_differ 635f565e82edea90ebe97c024b3c4f6cad96eea2 445886c352b204b21cc3851f2592ea89bfea0d32 => 0 1574s | git diff-tree -z --no-renames --name-only -r 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 445886c352b204b21cc3851f2592ea89bfea0d32 1574s => `lib.c\x00new-upstream-file\x00src.c\x00' 1574s quiltify_trees_differ 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 445886c352b204b21cc3851f2592ea89bfea0d32 => 1 1574s differences @dl ## ## == == == ==. 1574s dgit: base trees orig=886bd8d28c21b5bf5fb4 o+d/p=445886c352b204b21cc3 1574s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1574s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1574s starting quiltify (multiple patches, nofix mode) 1574s | git ls-tree --name-only 635f565e82edea90ebe97c024b3c4f6cad96eea2 -- debian/rules debian/control 1574s => `debian/control'... 1574s quiltify investigate 635f565e82edea90ebe97c024b3c4f6cad96eea2 1574s | git diff-tree -z --no-renames --name-only 635f565e82edea90ebe97c024b3c4f6cad96eea2 445886c352b204b21cc3851f2592ea89bfea0d32 1574s => `' 1574s quiltify_trees_differ 635f565e82edea90ebe97c024b3c4f6cad96eea2 445886c352b204b21cc3851f2592ea89bfea0d32 => 0 1574s search finished hooray! 1574s quiltify linearisation planning successful, executing... 1574s + git checkout -q master 1574s | git status --ignored --porcelain 1574s => `?? .pc/' 1574s nothing quilty to commit, ok. 1574s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1574s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1574s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1574s ' 1574s + git diff HEAD~ debian/patches 1574s + egrep . 1574s diff --git a/debian/patches/0001-Add-a-new-upstream-file.patch b/debian/patches/0001-Add-a-new-upstream-file.patch 1574s new file mode 100644 1574s index 0000000..0405708 1574s --- /dev/null 1574s +++ b/debian/patches/0001-Add-a-new-upstream-file.patch 1574s @@ -0,0 +1,16 @@ 1574s +From: Ian Jackson 1574s +Date: Sun, 6 Dec 2015 23:50:08 +0000 1574s +Subject: Add a new upstream file 1574s + 1574s +--- 1574s + new-upstream-file | 1 + 1574s + 1 file changed, 1 insertion(+) 1574s + create mode 100644 new-upstream-file 1574s + 1574s +diff --git a/new-upstream-file b/new-upstream-file 1574s +new file mode 100644 1574s +index 0000000..a2d670b 1574s +--- /dev/null 1574s ++++ b/new-upstream-file 1574s +@@ -0,0 +1 @@ 1574s ++Add a file 1574s diff --git a/debian/patches/0002-Edit-the-.c-file.patch b/debian/patches/0002-Edit-the-.c-file.patch 1574s new file mode 100644 1574s index 0000000..0e04924 1574s --- /dev/null 1574s +++ b/debian/patches/0002-Edit-the-.c-file.patch 1574s @@ -0,0 +1,15 @@ 1574s +From: Ian Jackson 1574s +Date: Sun, 6 Dec 2015 23:50:39 +0000 1574s +Subject: Edit the .c file 1574s + 1574s +--- 1574s + src.c | 2 +- 1574s + 1 file changed, 1 insertion(+), 1 deletion(-) 1574s + 1574s +diff --git a/src.c b/src.c 1574s +index 05437c5..6cc28de 100644 1574s +--- a/src.c 1574s ++++ b/src.c 1574s +@@ -1 +1 @@ 1574s +-main(){} 1574s ++main(void){} 1574s 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 1574s new file mode 100644 1574s index 0000000..bf7ce7d 1574s --- /dev/null 1574s +++ b/debian/patches/0004-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch 1574s @@ -0,0 +1,15 @@ 1574s +From: dgit test git user 1574s +Date: Tue, 26 Jun 2018 09:00:17 +0100 1574s +Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 1574s + 1574s +--- 1574s + src.c | 1 + 1574s + 1 file changed, 1 insertion(+) 1574s + 1574s +diff --git a/src.c b/src.c 1574s +index 6cc28de..9d0bbc1 100644 1574s +--- a/src.c 1574s ++++ b/src.c 1574s +@@ -1 +1,2 @@ 1574s + main(void){} 1574s ++// upstream subcommands refs/heads/unstitched-laundered 1 1574s 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 1574s new file mode 100644 1574s index 0000000..6878785 1574s --- /dev/null 1574s +++ b/debian/patches/0005-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch 1574s @@ -0,0 +1,17 @@ 1574s +From: dgit test git user 1574s +Date: Tue, 26 Jun 2018 09:00:17 +0100 1574s +Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 1574s + 1574s +[git-debrebase split: mixed commit: upstream part] 1574s +--- 1574s + src.c | 1 + 1574s + 1 file changed, 1 insertion(+) 1574s + 1574s +diff --git a/src.c b/src.c 1574s +index 9d0bbc1..501347a 100644 1574s +--- a/src.c 1574s ++++ b/src.c 1574s +@@ -1,2 +1,3 @@ 1574s + main(void){} 1574s + // upstream subcommands refs/heads/unstitched-laundered 1 1574s ++// both! subcommands refs/heads/unstitched-laundered 1 1574s 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 1574s new file mode 100644 1574s index 0000000..0ff481e 1574s --- /dev/null 1574s +++ b/debian/patches/0006-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch 1574s @@ -0,0 +1,17 @@ 1574s +From: dgit test git user 1574s +Date: Tue, 26 Jun 2018 09:00:20 +0100 1574s +Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2) 1574s + 1574s +--- 1574s + src.c | 1 + 1574s + 1 file changed, 1 insertion(+) 1574s + 1574s +diff --git a/src.c b/src.c 1574s +index 501347a..2ba1e58 100644 1574s +--- a/src.c 1574s ++++ b/src.c 1574s +@@ -1,3 +1,4 @@ 1574s + main(void){} 1574s + // upstream subcommands refs/heads/unstitched-laundered 1 1574s + // both! subcommands refs/heads/unstitched-laundered 1 1574s ++// upstream subcommands refs/heads/unstitched-laundered 2 1574s 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 1574s new file mode 100644 1574s index 0000000..195adf9 1574s --- /dev/null 1574s +++ b/debian/patches/0007-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch 1574s @@ -0,0 +1,18 @@ 1574s +From: dgit test git user 1574s +Date: Tue, 26 Jun 2018 09:00:20 +0100 1574s +Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 1574s + 1574s +[git-debrebase split: mixed commit: upstream part] 1574s +--- 1574s + src.c | 1 + 1574s + 1 file changed, 1 insertion(+) 1574s + 1574s +diff --git a/src.c b/src.c 1574s +index 2ba1e58..b5b2907 100644 1574s +--- a/src.c 1574s ++++ b/src.c 1574s +@@ -2,3 +2,4 @@ main(void){} 1574s + // upstream subcommands refs/heads/unstitched-laundered 1 1574s + // both! subcommands refs/heads/unstitched-laundered 1 1574s + // upstream subcommands refs/heads/unstitched-laundered 2 1574s ++// both! subcommands refs/heads/unstitched-laundered 2 1574s diff --git a/debian/patches/series b/debian/patches/series 1574s new file mode 100644 1574s index 0000000..27635f6 1574s --- /dev/null 1574s +++ b/debian/patches/series 1574s @@ -0,0 +1,7 @@ 1574s +0001-Add-a-new-upstream-file.patch 1574s +0002-Edit-the-.c-file.patch 1574s +subdir/addnewups 1574s +0004-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch 1574s +0005-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch 1574s +0006-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch 1574s +0007-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch 1574s diff --git a/debian/patches/subdir/addnewups b/debian/patches/subdir/addnewups 1574s new file mode 100644 1574s index 0000000..1acc2e8 1574s --- /dev/null 1574s +++ b/debian/patches/subdir/addnewups 1574s @@ -0,0 +1,16 @@ 1574s +From: Ian Jackson 1574s +Date: Sat, 4 Jun 2016 22:09:32 +0100 1574s +Subject: Add another new upstream file 1574s + 1574s +--- 1574s + lib.c | 1 + 1574s + 1 file changed, 1 insertion(+) 1574s + create mode 100644 lib.c 1574s + 1574s +diff --git a/lib.c b/lib.c 1574s +new file mode 100644 1574s +index 0000000..e026ed3 1574s +--- /dev/null 1574s ++++ b/lib.c 1574s +@@ -0,0 +1 @@ 1574s ++void function(void){} 1574s + t-gdr-made-patches 1574s + git log -n1 --pretty=format:%B 1574s + egrep '^\[git-debrebase' 1574s [git-debrebase make-patches: export and commit patches] 1574s + git diff --quiet HEAD~ -- :. ':!debian/patches' 1574s + git reset --hard HEAD~ 1574s HEAD is now at 5472c89 MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 1574s + checkletters=ft 1574s + '[' xft '!=' x ']' 1574s + : '---- make-patches unstitched-laundered ...ft ----' 1574s + make_check ft 1574s + case "$1" in 1574s + t-has-ancestor HEAD refs/heads/before-work-make-patches-unstitched-laundered 1574s + local now 1574s ++ git rev-parse HEAD 1574s + now=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1574s + local ancestor 1574s ++ git rev-parse 'HEAD^{}' 1574s + ancestor=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1574s + local mbase 1574s ++ t-git-merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1574s ++ git merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1574s + mbase=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1574s + '[' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f '!=' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f ']' 1574s + checkletters=t 1574s + '[' xt '!=' x ']' 1574s + : '---- make-patches unstitched-laundered ...t ----' 1574s + make_check t 1574s + case "$1" in 1574s + git diff --quiet HEAD refs/heads/before-work-make-patches-unstitched-laundered 1574s + checkletters= 1574s + '[' x '!=' x ']' 1574s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1574s + work=work-make-patches-unstitched-mixed 1574s + : '---------- make-patches unstitched-mixed ----------' 1574s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 1574s + git update-ref --stdin 1574s + sed s/unstitched-mixed/work-make-patches-unstitched-mixed/ 1574s + git checkout work-make-patches-unstitched-mixed 1574s Switched to branch 'work-make-patches-unstitched-mixed' 1574s + checkletters='F:Patch export produced patch amendments' 1574s + shift 1574s + before=before-work-make-patches-unstitched-mixed 1574s + git branch before-work-make-patches-unstitched-mixed 1574s + local xopts= 1574s + case "$checkletters" in 1574s + case "$checkletters" in 1574s + case "$checkletters" in 1574s + case "$checkletters" in 1574s + t-expect-fail 'F:Patch export produced patch amendments' t-git-debrebase make-patches 1574s + local 'mpat=F:Patch export produced patch amendments' 1574s + shift 1574s + set +o pipefail 1574s + LC_MESSAGES=C 1574s + LANGUAGE=C 1574s + t-git-debrebase make-patches 1574s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1574s + local gdr=git-debrebase 1574s + : ' 1574s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1574s + git-debrebase --dgit=dgit -D make-patches 1574s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 1574s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 1574s git-debrebase = Mixed {"Parents" => [{"Differs" => 34,"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Ix" => 0}],"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","Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9","Type" => "Mixed","CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971"} 1574s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (9b56b9c2600dc10b9eec97d535d89870476de971) 1574s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 1574s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 1574s git-debrebase = Upstream {"Hdr" => "tree cd4c1550c7da8a4cd81ed765f7a91f2c58843a39\nparent 5360dd228488e99ffa3d55e906ddc0de1c111c4e\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e"}],"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Type" => "Upstream","Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n"} 1574s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 1574s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 1574s git-debrebase = Packaging {"Parents" => [{"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Ix" => 0,"Differs" => 32}],"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","Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Type" => "Packaging","CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e"} 1574s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 1574s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 1574s git-debrebase = AddPatches {"Type" => "AddPatches","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","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","Parents" => [{"Differs" => 4,"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Ix" => 0}]} 1574s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 1574s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 1574s git-debrebase = Mixed {"Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c"}],"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","Type" => "Mixed","Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449"} 1574s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (6e00b9cbfb2ac78131496aadb210310e5b4b6a84) 1574s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 1574s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 1574s git-debrebase = Upstream {"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Type" => "Upstream","Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","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","Parents" => [{"Ix" => 0,"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Differs" => 2}]} 1574s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 1574s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 1574s git-debrebase = Packaging {"Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","Type" => "Packaging","CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","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","Parents" => [{"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Ix" => 0,"Differs" => 32}]} 1574s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1574s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 1574s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Differs" => 2}],"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1574s git-debrebase: snag detected (-funclean-ordering): packaging change (a4efcc9f58a06f20c5de1258de24211048e99433) follows upstream change (eg 9f40936eece8f6452df026cc64200db82005a166) 1574s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1574s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 1574s git-debrebase = Upstream {"Parents" => [{"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Ix" => 0,"Differs" => 2}],"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","CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Type" => "Upstream"} 1574s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1574s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 1574s git-debrebase = Upstream {"Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Type" => "Upstream","CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1574s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1574s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1574s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Type" => "Changelog","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","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}]} 1574s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1574s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1574s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","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"} 1574s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1574s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1574s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1574s 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,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1574s git-debrebase *** WALK 9b56b9c2600dc10b9eec97d535d89870476de971 0 - 1574s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 1574s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 1574s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971","Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9","Type" => "Mixed","Parents" => [{"Differs" => 34,"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Ix" => 0}],"Hdr" => "tree bec3a99f595d6254a65c51aa0160db363a70a9f9\nparent 5668ce44fba4db3f42ac837f0104a9335a819367\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n"} 1574s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 1574s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 1574s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e"}]} 1574s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 1574s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 1574s git-debrebase = Packaging {"Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Type" => "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","Parents" => [{"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Ix" => 0,"Differs" => 32}]} 1574s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 1574s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 1574s git-debrebase = AddPatches {"Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","Type" => "AddPatches","Parents" => [{"Ix" => 0,"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Differs" => 4}],"Hdr" => "tree e6c6c599f5b52414c68918fbedd2a0a4abe68178\nparent 6e00b9cbfb2ac78131496aadb210310e5b4b6a84\nauthor dgit test git user 1530000025 +0100\ncommitter dgit test git user 1530000025 +0100\n"} 1574s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 1574s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 1574s git-debrebase = Mixed {"Hdr" => "tree 4d870e59c3a21c2e6202b59474df673e46ef6449\nparent 5138bd8205d6eeb162d87a2d085746c0c305261c\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Parents" => [{"Differs" => 34,"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Ix" => 0}],"Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449","Type" => "Mixed","CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n"} 1574s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 1574s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 1574s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Upstream","Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Parents" => [{"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n"} 1574s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 1574s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 1574s git-debrebase = Packaging {"Hdr" => "tree 1b9dba384382fd10423f44e82b75e4a495de36dc\nparent 9f40936eece8f6452df026cc64200db82005a166\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Ix" => 0}],"Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","Type" => "Packaging","CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n"} 1574s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 1574s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 1574s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "9f40936eece8f6452df026cc64200db82005a166","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","Parents" => [{"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Ix" => 0,"Differs" => 2}]} 1574s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 1574s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 1574s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","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","Parents" => [{"Differs" => 2,"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Ix" => 0}]} 1574s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 1574s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 1574s git-debrebase = Upstream {"Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 2}],"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Type" => "Upstream","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1574s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1574s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 1574s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 1574s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1574s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 1574s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"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","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 1574s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1574s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1574s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1574s git-debrebase = Anchor {"Type" => "Anchor","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","OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1574s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 7 proc 15 pm -1 1574s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1574s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1574s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 1574s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1574s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 1574s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 1574s git-debrebase WALK BUILD a4efcc9f58a06f20c5de1258de24211048e99433 Debian (rewriting=0) 1574s git-debrebase WALK REWRITING NOW cl=HASH(0x16b46974e90) procd=HASH(0x16b46974f50) 1574s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1574s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Debian (rewriting=1) 1574s git-debrebase WALK BUILD 5360dd228488e99ffa3d55e906ddc0de1c111c4e Debian (rewriting=1) 1574s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1574s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Debian (rewriting=1) 1574s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1574s git-debrebase WALK BUILD eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 Upstream (rewriting=1) 1574s git-debrebase WALK BUILD ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b Upstream (rewriting=1) 1574s git-debrebase WALK BUILD 9f40936eece8f6452df026cc64200db82005a166 Upstream (rewriting=1) 1574s git-debrebase WALK BUILD 5138bd8205d6eeb162d87a2d085746c0c305261c Upstream (rewriting=1) 1574s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Upstream (rewriting=1) 1574s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1574s git-debrebase WALK BUILD 5668ce44fba4db3f42ac837f0104a9335a819367 Upstream (rewriting=1) 1574s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Upstream (rewriting=1) 1574s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1574s git-debrebase get_differs 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 = 0x4 1574s git-debrebase *** WALK RETURN 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 72e35041bfbd2d841ef8d4b4bf24616be30909ce 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1574s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1574s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1574s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1574s git-debrebase gbp_pq_export bw 72e35041bfbd2d841ef8d4b4bf24616be30909ce 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1574s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1574s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1574s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1574s git-debrebase get_differs 9b56b9c2600dc10b9eec97d535d89870476de971 ad852cd21fb1937523d9bf22b223a04ee6f5114f = 0xc 1574s 1574s git-debrebase: error: Patch export produced patch amendments (abandoned output commit ad852cd21fb1937523d9bf22b223a04ee6f5114f). Try laundering first. 1574s + local 'ps=7 0' 1574s + set -o pipefail 1574s + case $ps in 1574s + t-grep-mpat 'F:Patch export produced patch amendments' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1574s + local 'mpat=F:Patch export produced patch amendments' 1574s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1574s + local grepper=fgrep 1574s + case "$mpat" in 1574s + case "$mpat" in 1574s + grepper=fgrep 1574s + mpat='Patch export produced patch amendments' 1574s + fgrep -e 'Patch export produced patch amendments' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1574s git-debrebase: error: Patch export produced patch amendments (abandoned output commit ad852cd21fb1937523d9bf22b223a04ee6f5114f). Try laundering first. 1574s + continue 1574s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1574s + work=work-make-patches-raw-converted-from-gbp 1574s + : '---------- make-patches raw-converted-from-gbp ----------' 1574s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 1574s + git update-ref --stdin 1574s + sed s/raw-converted-from-gbp/work-make-patches-raw-converted-from-gbp/ 1574s + git checkout work-make-patches-raw-converted-from-gbp 1574s Switched to branch 'work-make-patches-raw-converted-from-gbp' 1574s + checkletters=Pn 1574s + shift 1574s + before=before-work-make-patches-raw-converted-from-gbp 1574s + git branch before-work-make-patches-raw-converted-from-gbp 1574s + local xopts= 1574s + case "$checkletters" in 1574s + case "$checkletters" in 1574s + case "$checkletters" in 1574s + case "$checkletters" in 1574s + t-git-debrebase make-patches 1574s + local gdr=git-debrebase 1574s + : ' 1574s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1574s + git-debrebase --dgit=dgit -D make-patches 1574s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1574s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1574s git-debrebase = Upstream {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"Type" => "Upstream"} 1574s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1574s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1574s git-debrebase = Upstream {"Type" => "Upstream","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","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1574s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1574s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1574s git-debrebase = Upstream {"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","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"}],"Type" => "Upstream"} 1575s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1575s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1575s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1575s 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","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","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},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 1575s git-debrebase *** WALK 178896af44c5b02e05a3442df6c33233b6acb807 0 - 1575s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1575s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 1575s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"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"} 1575s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1575s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 1575s git-debrebase = Upstream {"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","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","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"}],"Type" => "Upstream"} 1575s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1575s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 1575s git-debrebase = Upstream {"Type" => "Upstream","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","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1575s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1575s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1575s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 1575s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 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","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 1575s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw -1 upp 2 proc 3 pm -1 1575s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1575s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1575s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 4 1575s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1575s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1575s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=0) 1575s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=0) 1575s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=0) 1575s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1575s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 = 0 1575s git-debrebase *** WALK RETURN 178896af44c5b02e05a3442df6c33233b6acb807 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 1575s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1575s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1575s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1575s git-debrebase gbp_pq_export bw 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 178896af44c5b02e05a3442df6c33233b6acb807 1575s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1575s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1575s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1575s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 e0f023f5738f52a4d547f9c2779dd1d19d0c0767 = 0x4 1575s git-debrebase >= update HEAD e0f023f5738f52a4d547f9c2779dd1d19d0c0767 178896af44c5b02e05a3442df6c33233b6acb807 1575s git-debrebase >$ 1575s HEAD is now at e0f023f Commit patch queue (exported by git-debrebase) 1575s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1575s ' 1575s + peel=peel-make-patches-raw-converted-from-gbp 1575s + git checkout -b peel-make-patches-raw-converted-from-gbp 1575s Switched to a new branch 'peel-make-patches-raw-converted-from-gbp' 1575s + t-clean-on-branch peel-make-patches-raw-converted-from-gbp 1575s + t-output '## peel-make-patches-raw-converted-from-gbp' git status -b --porcelain 1575s + printf '%s\n' '## peel-make-patches-raw-converted-from-gbp' 1575s + shift 1575s + git status -b --porcelain 1575s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1575s + : '---------- make-patches raw-converted-from-gbp Pn ----------' 1575s + '[' xPn '!=' x ']' 1575s + : '---- make-patches raw-converted-from-gbp ...Pn ----' 1575s + make_check Pn 1575s + case "$1" in 1575s + t-dgit -wgf --quilt=nofix quilt-fixup 1575s + local dgit=dgit 1575s + pwd 1575s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1575s + : ' 1575s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1575s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --quilt=nofix quilt-fixup 1575s | git rev-parse --show-toplevel 1575s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1575s | git config -z --get-regexp --local '.*' 1575s | git config -z --get-regexp --local '.*' 1575s | git config -z --get-regexp --global '.*' 1575s | git config -z --get-regexp --system '.*' 1575s format 3.0 (quilt), quilt mode nofix 1575s Format `3.0 (quilt)', need to check/update patch stack 1575s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1575s => `' 1575s + git diff --quiet HEAD 1575s + git clean -xdff 1575s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1575s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1575s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1575s | git rev-parse 'HEAD~0' 1575s => `e0f023f5738f52a4d547f9c2779dd1d19d0c0767' 1575s | git symbolic-ref -q HEAD 1575s => `refs/heads/peel-make-patches-raw-converted-from-gbp' 1575s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1575s CD work 1575s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1575s + git reset -q --hard e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1575s examining quilt state (multiple patches, nofix mode) 1575s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1575s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1575s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1575s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1575s CD fake 1575s | find -name .git -prune -print0 1575s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1575s + git checkout -f e0f023f5738f52a4d547f9c2779dd1d19d0c0767 -- debian 1575s + git add -Af . 1575s | git write-tree 1575s => `b2f98a26237de17a003353d4dd6f500a70e60b1e' 1575s fake orig tree object b2f98a26237de17a003353d4dd6f500a70e60b1e 1575s CD .. 1575s + git reset -q --hard e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1575s CD ../fake 1575s + git add -Af . 1575s | git write-tree 1575s => `1dccdc0a0411608175805fedb100e27034079e64' 1575s fake o+d/p tree object b2f98a26237de17a003353d4dd6f500a70e60b1e 1575s CD ../work 1575s | git ls-tree --name-only -z e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1575s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1575s | git diff-tree -z --no-renames -r b2f98a26237de17a003353d4dd6f500a70e60b1e e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1575s => `: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' 1575s quiltify_trees_differ b2f98a26237de17a003353d4dd6f500a70e60b1e e0f023f5738f52a4d547f9c2779dd1d19d0c0767 => 1 1575s | git diff-tree -z --no-renames --name-only -r e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1dccdc0a0411608175805fedb100e27034079e64 1575s => `' 1575s quiltify_trees_differ e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1dccdc0a0411608175805fedb100e27034079e64 => 0 1575s | git diff-tree -z --no-renames --name-only -r b2f98a26237de17a003353d4dd6f500a70e60b1e 1dccdc0a0411608175805fedb100e27034079e64 1575s => `lib.c\x00new-upstream-file\x00src.c\x00' 1575s quiltify_trees_differ b2f98a26237de17a003353d4dd6f500a70e60b1e 1dccdc0a0411608175805fedb100e27034079e64 => 1 1575s differences @dl ## ## == == == ==. 1575s dgit: base trees orig=b2f98a26237de17a0033 o+d/p=1dccdc0a041160817580 1575s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1575s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1575s starting quiltify (multiple patches, nofix mode) 1575s | git ls-tree --name-only e0f023f5738f52a4d547f9c2779dd1d19d0c0767 -- debian/rules debian/control 1575s => `debian/control'... 1575s quiltify investigate e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1575s | git diff-tree -z --no-renames --name-only e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1dccdc0a0411608175805fedb100e27034079e64 1575s => `' 1575s quiltify_trees_differ e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1dccdc0a0411608175805fedb100e27034079e64 => 0 1575s search finished hooray! 1575s quiltify linearisation planning successful, executing... 1575s + git checkout -q master 1575s | git status --ignored --porcelain 1575s => `?? .pc/' 1575s nothing quilty to commit, ok. 1575s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1575s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1575s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1575s ' 1575s + git diff HEAD~ debian/patches 1575s + egrep . 1575s diff --git a/debian/patches/0001-Add-a-new-upstream-file.patch b/debian/patches/0001-Add-a-new-upstream-file.patch 1575s new file mode 100644 1575s index 0000000..0405708 1575s --- /dev/null 1575s +++ b/debian/patches/0001-Add-a-new-upstream-file.patch 1575s @@ -0,0 +1,16 @@ 1575s +From: Ian Jackson 1575s +Date: Sun, 6 Dec 2015 23:50:08 +0000 1575s +Subject: Add a new upstream file 1575s + 1575s +--- 1575s + new-upstream-file | 1 + 1575s + 1 file changed, 1 insertion(+) 1575s + create mode 100644 new-upstream-file 1575s + 1575s +diff --git a/new-upstream-file b/new-upstream-file 1575s +new file mode 100644 1575s +index 0000000..a2d670b 1575s +--- /dev/null 1575s ++++ b/new-upstream-file 1575s +@@ -0,0 +1 @@ 1575s ++Add a file 1575s diff --git a/debian/patches/0002-Edit-the-.c-file.patch b/debian/patches/0002-Edit-the-.c-file.patch 1575s new file mode 100644 1575s index 0000000..0e04924 1575s --- /dev/null 1575s +++ b/debian/patches/0002-Edit-the-.c-file.patch 1575s @@ -0,0 +1,15 @@ 1575s +From: Ian Jackson 1575s +Date: Sun, 6 Dec 2015 23:50:39 +0000 1575s +Subject: Edit the .c file 1575s + 1575s +--- 1575s + src.c | 2 +- 1575s + 1 file changed, 1 insertion(+), 1 deletion(-) 1575s + 1575s +diff --git a/src.c b/src.c 1575s +index 05437c5..6cc28de 100644 1575s +--- a/src.c 1575s ++++ b/src.c 1575s +@@ -1 +1 @@ 1575s +-main(){} 1575s ++main(void){} 1575s diff --git a/debian/patches/series b/debian/patches/series 1575s new file mode 100644 1575s index 0000000..9e8f739 1575s --- /dev/null 1575s +++ b/debian/patches/series 1575s @@ -0,0 +1,3 @@ 1575s +0001-Add-a-new-upstream-file.patch 1575s +0002-Edit-the-.c-file.patch 1575s +subdir/addnewups 1575s diff --git a/debian/patches/subdir/addnewups b/debian/patches/subdir/addnewups 1575s new file mode 100644 1575s index 0000000..1acc2e8 1575s --- /dev/null 1575s +++ b/debian/patches/subdir/addnewups 1575s @@ -0,0 +1,16 @@ 1575s +From: Ian Jackson 1575s +Date: Sat, 4 Jun 2016 22:09:32 +0100 1575s +Subject: Add another new upstream file 1575s + 1575s +--- 1575s + lib.c | 1 + 1575s + 1 file changed, 1 insertion(+) 1575s + create mode 100644 lib.c 1575s + 1575s +diff --git a/lib.c b/lib.c 1575s +new file mode 100644 1575s +index 0000000..e026ed3 1575s +--- /dev/null 1575s ++++ b/lib.c 1575s +@@ -0,0 +1 @@ 1575s ++void function(void){} 1575s + t-gdr-made-patches 1575s + git log -n1 --pretty=format:%B 1575s + egrep '^\[git-debrebase' 1575s [git-debrebase make-patches: export and commit patches] 1575s + git diff --quiet HEAD~ -- :. ':!debian/patches' 1575s + git reset --hard HEAD~ 1575s HEAD is now at 178896a Add another new upstream file 1575s + checkletters=n 1575s + '[' xn '!=' x ']' 1575s + : '---- make-patches raw-converted-from-gbp ...n ----' 1575s + make_check n 1575s + case "$1" in 1575s + t-refs-same-start 1575s + unset t_ref_val 1575s + t_ref_names=() 1575s + t-refs-same refs/heads/before-work-make-patches-raw-converted-from-gbp refs/heads/peel-make-patches-raw-converted-from-gbp 1575s + local g 1575s + for g in $* 1575s + t-ref-same refs/heads/before-work-make-patches-raw-converted-from-gbp 1575s + local name=refs/heads/before-work-make-patches-raw-converted-from-gbp 1575s + local val 1575s ++ t-git-get-ref refs/heads/before-work-make-patches-raw-converted-from-gbp 1575s ++ local ref=refs/heads/before-work-make-patches-raw-converted-from-gbp 1575s ++ case "$ref" in 1575s ++ git show-ref -d refs/heads/before-work-make-patches-raw-converted-from-gbp 1575s ++ perl -ne ' 1575s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-make-patches-raw-converted-from-gbp\E(?:\^\{\})?$#; 1575s END { print "$x\n" if length $x; } 1575s ' 1575s + val=178896af44c5b02e05a3442df6c33233b6acb807 1575s + t-ref-same-val refs/heads/before-work-make-patches-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1575s + local name=refs/heads/before-work-make-patches-raw-converted-from-gbp 1575s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1575s + case "${t_ref_val-unset}" in 1575s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1575s + t_ref_names+=("$name") 1575s + for g in $* 1575s + t-ref-same refs/heads/peel-make-patches-raw-converted-from-gbp 1575s + local name=refs/heads/peel-make-patches-raw-converted-from-gbp 1575s + local val 1575s ++ t-git-get-ref refs/heads/peel-make-patches-raw-converted-from-gbp 1575s ++ local ref=refs/heads/peel-make-patches-raw-converted-from-gbp 1575s ++ case "$ref" in 1575s ++ git show-ref -d refs/heads/peel-make-patches-raw-converted-from-gbp 1575s ++ perl -ne ' 1575s $x = $1 if m#^(\w+) \Qrefs/heads/peel-make-patches-raw-converted-from-gbp\E(?:\^\{\})?$#; 1575s END { print "$x\n" if length $x; } 1575s ' 1576s + val=178896af44c5b02e05a3442df6c33233b6acb807 1576s + t-ref-same-val refs/heads/peel-make-patches-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1576s + local name=refs/heads/peel-make-patches-raw-converted-from-gbp 1576s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1576s + t_ref_names+=("$name") 1576s + checkletters= 1576s + '[' x '!=' x ']' 1576s + subcmd forget-was-ever-debrebase nA nA nA nA nA 1576s + local subcmd=forget-was-ever-debrebase 1576s + shift 1576s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1576s + work=work-forget-was-ever-debrebase-stitched-laundered 1576s + : '---------- forget-was-ever-debrebase stitched-laundered ----------' 1576s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 1576s + git update-ref --stdin 1576s + sed s/stitched-laundered/work-forget-was-ever-debrebase-stitched-laundered/ 1576s + git checkout work-forget-was-ever-debrebase-stitched-laundered 1576s Switched to branch 'work-forget-was-ever-debrebase-stitched-laundered' 1576s + checkletters=nA 1576s + shift 1576s + before=before-work-forget-was-ever-debrebase-stitched-laundered 1576s + git branch before-work-forget-was-ever-debrebase-stitched-laundered 1576s + local xopts= 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + t-git-debrebase forget-was-ever-debrebase 1576s + local gdr=git-debrebase 1576s + : ' 1576s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1576s + git-debrebase --dgit=dgit -D forget-was-ever-debrebase 1576s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-forget-was-ever-debrebase-stitched-laundered 1576s git-debrebase >= delete refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered 1576s git-debrebase >= delete refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered 1576s git-debrebase >$ 1576s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1576s ' 1576s + peel=peel-forget-was-ever-debrebase-stitched-laundered 1576s + git checkout -b peel-forget-was-ever-debrebase-stitched-laundered 1576s Switched to a new branch 'peel-forget-was-ever-debrebase-stitched-laundered' 1576s + t-clean-on-branch peel-forget-was-ever-debrebase-stitched-laundered 1576s + t-output '## peel-forget-was-ever-debrebase-stitched-laundered' git status -b --porcelain 1576s + printf '%s\n' '## peel-forget-was-ever-debrebase-stitched-laundered' 1576s + shift 1576s + git status -b --porcelain 1576s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1576s + : '---------- forget-was-ever-debrebase stitched-laundered nA ----------' 1576s + '[' xnA '!=' x ']' 1576s + : '---- forget-was-ever-debrebase stitched-laundered ...nA ----' 1576s + make_check nA 1576s + case "$1" in 1576s + t-refs-same-start 1576s + unset t_ref_val 1576s + t_ref_names=() 1576s + t-refs-same refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 1576s + local g 1576s + for g in $* 1576s + t-ref-same refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 1576s + local name=refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 1576s + local val 1576s ++ t-git-get-ref refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 1576s ++ local ref=refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-forget-was-ever-debrebase-stitched-laundered\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1576s + t-ref-same-val refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1576s + local name=refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 1576s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1576s + t_ref_names+=("$name") 1576s + for g in $* 1576s + t-ref-same refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 1576s + local name=refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 1576s + local val 1576s ++ t-git-get-ref refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 1576s ++ local ref=refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/heads/peel-forget-was-ever-debrebase-stitched-laundered\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1576s + t-ref-same-val refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 1576s + local name=refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 1576s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 1576s + t_ref_names+=("$name") 1576s + checkletters=A 1576s + '[' xA '!=' x ']' 1576s + : '---- forget-was-ever-debrebase stitched-laundered ...A ----' 1576s + make_check A 1576s + case "$1" in 1576s + 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 1576s + local val 1576s + for g in $* 1576s ++ t-git-get-ref refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered 1576s ++ local ref=refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ test 1 = 1 1576s + val= 1576s + '[' x '!=' x ']' 1576s + for g in $* 1576s ++ t-git-get-ref refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered 1576s ++ local ref=refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ test 1 = 1 1576s + val= 1576s + '[' x '!=' x ']' 1576s + checkletters= 1576s + '[' x '!=' x ']' 1576s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1576s + work=work-forget-was-ever-debrebase-stitched-mixed 1576s + : '---------- forget-was-ever-debrebase stitched-mixed ----------' 1576s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 1576s + git update-ref --stdin 1576s + sed s/stitched-mixed/work-forget-was-ever-debrebase-stitched-mixed/ 1576s + git checkout work-forget-was-ever-debrebase-stitched-mixed 1576s Switched to branch 'work-forget-was-ever-debrebase-stitched-mixed' 1576s + checkletters=nA 1576s + shift 1576s + before=before-work-forget-was-ever-debrebase-stitched-mixed 1576s + git branch before-work-forget-was-ever-debrebase-stitched-mixed 1576s + local xopts= 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + t-git-debrebase forget-was-ever-debrebase 1576s + local gdr=git-debrebase 1576s + : ' 1576s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1576s + git-debrebase --dgit=dgit -D forget-was-ever-debrebase 1576s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-forget-was-ever-debrebase-stitched-mixed 1576s git-debrebase >= delete refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed 1576s git-debrebase >= delete refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed 1576s git-debrebase >$ 1576s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1576s ' 1576s + peel=peel-forget-was-ever-debrebase-stitched-mixed 1576s + git checkout -b peel-forget-was-ever-debrebase-stitched-mixed 1576s Switched to a new branch 'peel-forget-was-ever-debrebase-stitched-mixed' 1576s + t-clean-on-branch peel-forget-was-ever-debrebase-stitched-mixed 1576s + t-output '## peel-forget-was-ever-debrebase-stitched-mixed' git status -b --porcelain 1576s + printf '%s\n' '## peel-forget-was-ever-debrebase-stitched-mixed' 1576s + shift 1576s + git status -b --porcelain 1576s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1576s + : '---------- forget-was-ever-debrebase stitched-mixed nA ----------' 1576s + '[' xnA '!=' x ']' 1576s + : '---- forget-was-ever-debrebase stitched-mixed ...nA ----' 1576s + make_check nA 1576s + case "$1" in 1576s + t-refs-same-start 1576s + unset t_ref_val 1576s + t_ref_names=() 1576s + t-refs-same refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 1576s + local g 1576s + for g in $* 1576s + t-ref-same refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 1576s + local name=refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 1576s + local val 1576s ++ t-git-get-ref refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 1576s ++ local ref=refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-forget-was-ever-debrebase-stitched-mixed\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s + val=5e0bf3cea3c715230b96aca41156852390014b98 1576s + t-ref-same-val refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 1576s + local name=refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 1576s + local val=5e0bf3cea3c715230b96aca41156852390014b98 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 1576s + t_ref_names+=("$name") 1576s + for g in $* 1576s + t-ref-same refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 1576s + local name=refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 1576s + local val 1576s ++ t-git-get-ref refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 1576s ++ local ref=refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/heads/peel-forget-was-ever-debrebase-stitched-mixed\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s + val=5e0bf3cea3c715230b96aca41156852390014b98 1576s + t-ref-same-val refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 1576s + local name=refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 1576s + local val=5e0bf3cea3c715230b96aca41156852390014b98 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 1576s + t_ref_names+=("$name") 1576s + checkletters=A 1576s + '[' xA '!=' x ']' 1576s + : '---- forget-was-ever-debrebase stitched-mixed ...A ----' 1576s + make_check A 1576s + case "$1" in 1576s + 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 1576s + local val 1576s + for g in $* 1576s ++ t-git-get-ref refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed 1576s ++ local ref=refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed 1576s ++ case "$ref" in 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ git show-ref -d refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed 1576s ++ test 1 = 1 1576s + val= 1576s + '[' x '!=' x ']' 1576s + for g in $* 1576s ++ t-git-get-ref refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed 1576s ++ local ref=refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ test 1 = 1 1576s + val= 1576s + '[' x '!=' x ']' 1576s + checkletters= 1576s + '[' x '!=' x ']' 1576s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1576s + work=work-forget-was-ever-debrebase-unstitched-laundered 1576s + : '---------- forget-was-ever-debrebase unstitched-laundered ----------' 1576s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 1576s + git update-ref --stdin 1576s + sed s/unstitched-laundered/work-forget-was-ever-debrebase-unstitched-laundered/ 1576s + git checkout work-forget-was-ever-debrebase-unstitched-laundered 1576s Switched to branch 'work-forget-was-ever-debrebase-unstitched-laundered' 1576s + checkletters=nA 1576s + shift 1576s + before=before-work-forget-was-ever-debrebase-unstitched-laundered 1576s + git branch before-work-forget-was-ever-debrebase-unstitched-laundered 1576s + local xopts= 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + t-git-debrebase forget-was-ever-debrebase 1576s + local gdr=git-debrebase 1576s + : ' 1576s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1576s + git-debrebase --dgit=dgit -D forget-was-ever-debrebase 1576s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-forget-was-ever-debrebase-unstitched-laundered 1576s git-debrebase >= delete refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered 1576s git-debrebase >= delete refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered 1576s git-debrebase >$ 1576s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1576s ' 1576s + peel=peel-forget-was-ever-debrebase-unstitched-laundered 1576s + git checkout -b peel-forget-was-ever-debrebase-unstitched-laundered 1576s Switched to a new branch 'peel-forget-was-ever-debrebase-unstitched-laundered' 1576s + t-clean-on-branch peel-forget-was-ever-debrebase-unstitched-laundered 1576s + t-output '## peel-forget-was-ever-debrebase-unstitched-laundered' git status -b --porcelain 1576s + printf '%s\n' '## peel-forget-was-ever-debrebase-unstitched-laundered' 1576s + shift 1576s + git status -b --porcelain 1576s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1576s + : '---------- forget-was-ever-debrebase unstitched-laundered nA ----------' 1576s + '[' xnA '!=' x ']' 1576s + : '---- forget-was-ever-debrebase unstitched-laundered ...nA ----' 1576s + make_check nA 1576s + case "$1" in 1576s + t-refs-same-start 1576s + unset t_ref_val 1576s + t_ref_names=() 1576s + t-refs-same refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 1576s + local g 1576s + for g in $* 1576s + t-ref-same refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 1576s + local name=refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 1576s + local val 1576s ++ t-git-get-ref refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 1576s ++ local ref=refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 1576s ++ case "$ref" in 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ git show-ref -d refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 1576s + val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1576s + t-ref-same-val refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1576s + local name=refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 1576s + local val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1576s + t_ref_names+=("$name") 1576s + for g in $* 1576s + t-ref-same refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 1576s + local name=refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 1576s + local val 1576s ++ t-git-get-ref refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 1576s ++ local ref=refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 1576s ++ case "$ref" in 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/heads/peel-forget-was-ever-debrebase-unstitched-laundered\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ git show-ref -d refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 1576s + val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1576s + t-ref-same-val refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1576s + local name=refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 1576s + local val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1576s + t_ref_names+=("$name") 1576s + checkletters=A 1576s + '[' xA '!=' x ']' 1576s + : '---- forget-was-ever-debrebase unstitched-laundered ...A ----' 1576s + make_check A 1576s + case "$1" in 1576s + 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 1576s + local val 1576s + for g in $* 1576s ++ t-git-get-ref refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered 1576s ++ local ref=refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered 1576s ++ case "$ref" in 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ git show-ref -d refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered 1576s ++ test 1 = 1 1576s + val= 1576s + '[' x '!=' x ']' 1576s + for g in $* 1576s ++ t-git-get-ref refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered 1576s ++ local ref=refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered 1576s ++ case "$ref" in 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ git show-ref -d refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered 1576s ++ test 1 = 1 1576s + val= 1576s + '[' x '!=' x ']' 1576s + checkletters= 1576s + '[' x '!=' x ']' 1576s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1576s + work=work-forget-was-ever-debrebase-unstitched-mixed 1576s + : '---------- forget-was-ever-debrebase unstitched-mixed ----------' 1576s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 1576s + git update-ref --stdin 1576s + sed s/unstitched-mixed/work-forget-was-ever-debrebase-unstitched-mixed/ 1576s + git checkout work-forget-was-ever-debrebase-unstitched-mixed 1576s Switched to branch 'work-forget-was-ever-debrebase-unstitched-mixed' 1576s + checkletters=nA 1576s + shift 1576s + before=before-work-forget-was-ever-debrebase-unstitched-mixed 1576s + git branch before-work-forget-was-ever-debrebase-unstitched-mixed 1576s + local xopts= 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + t-git-debrebase forget-was-ever-debrebase 1576s + local gdr=git-debrebase 1576s + : ' 1576s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1576s + git-debrebase --dgit=dgit -D forget-was-ever-debrebase 1576s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-forget-was-ever-debrebase-unstitched-mixed 1576s git-debrebase >= delete refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed 1576s git-debrebase >= delete refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed 1576s git-debrebase >$ 1576s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1576s ' 1576s + peel=peel-forget-was-ever-debrebase-unstitched-mixed 1576s + git checkout -b peel-forget-was-ever-debrebase-unstitched-mixed 1576s Switched to a new branch 'peel-forget-was-ever-debrebase-unstitched-mixed' 1576s + t-clean-on-branch peel-forget-was-ever-debrebase-unstitched-mixed 1576s + t-output '## peel-forget-was-ever-debrebase-unstitched-mixed' git status -b --porcelain 1576s + printf '%s\n' '## peel-forget-was-ever-debrebase-unstitched-mixed' 1576s + shift 1576s + git status -b --porcelain 1576s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1576s + : '---------- forget-was-ever-debrebase unstitched-mixed nA ----------' 1576s + '[' xnA '!=' x ']' 1576s + : '---- forget-was-ever-debrebase unstitched-mixed ...nA ----' 1576s + make_check nA 1576s + case "$1" in 1576s + t-refs-same-start 1576s + unset t_ref_val 1576s + t_ref_names=() 1576s + t-refs-same refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 1576s + local g 1576s + for g in $* 1576s + t-ref-same refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 1576s + local name=refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 1576s + local val 1576s ++ t-git-get-ref refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 1576s ++ local ref=refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s + val=9b56b9c2600dc10b9eec97d535d89870476de971 1576s + t-ref-same-val refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 9b56b9c2600dc10b9eec97d535d89870476de971 1576s + local name=refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 1576s + local val=9b56b9c2600dc10b9eec97d535d89870476de971 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=9b56b9c2600dc10b9eec97d535d89870476de971 1576s + t_ref_names+=("$name") 1576s + for g in $* 1576s + t-ref-same refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 1576s + local name=refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 1576s + local val 1576s ++ t-git-get-ref refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 1576s ++ local ref=refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/heads/peel-forget-was-ever-debrebase-unstitched-mixed\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s + val=9b56b9c2600dc10b9eec97d535d89870476de971 1576s + t-ref-same-val refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 9b56b9c2600dc10b9eec97d535d89870476de971 1576s + local name=refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 1576s + local val=9b56b9c2600dc10b9eec97d535d89870476de971 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=9b56b9c2600dc10b9eec97d535d89870476de971 1576s + t_ref_names+=("$name") 1576s + checkletters=A 1576s + '[' xA '!=' x ']' 1576s + : '---- forget-was-ever-debrebase unstitched-mixed ...A ----' 1576s + make_check A 1576s + case "$1" in 1576s + 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 1576s + local val 1576s + for g in $* 1576s ++ t-git-get-ref refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed 1576s ++ local ref=refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ test 1 = 1 1576s + val= 1576s + '[' x '!=' x ']' 1576s + for g in $* 1576s ++ t-git-get-ref refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed 1576s ++ local ref=refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ test 1 = 1 1576s + val= 1576s + '[' x '!=' x ']' 1576s + checkletters= 1576s + '[' x '!=' x ']' 1576s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 1576s + work=work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + : '---------- forget-was-ever-debrebase raw-converted-from-gbp ----------' 1576s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 1576s + git update-ref --stdin 1576s + sed s/raw-converted-from-gbp/work-forget-was-ever-debrebase-raw-converted-from-gbp/ 1576s + git checkout work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s Switched to branch 'work-forget-was-ever-debrebase-raw-converted-from-gbp' 1576s + checkletters=nA 1576s + shift 1576s + before=before-work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + git branch before-work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + local xopts= 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + case "$checkletters" in 1576s + t-git-debrebase forget-was-ever-debrebase 1576s + local gdr=git-debrebase 1576s + : ' 1576s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1576s + git-debrebase --dgit=dgit -D forget-was-ever-debrebase 1576s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s git-debrebase >= delete refs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s git-debrebase >= delete refs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s git-debrebase >$ 1576s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1576s ' 1576s + peel=peel-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + git checkout -b peel-forget-was-ever-debrebase-raw-converted-from-gbp 1576s Switched to a new branch 'peel-forget-was-ever-debrebase-raw-converted-from-gbp' 1576s + t-clean-on-branch peel-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + t-output '## peel-forget-was-ever-debrebase-raw-converted-from-gbp' git status -b --porcelain 1576s + printf '%s\n' '## peel-forget-was-ever-debrebase-raw-converted-from-gbp' 1576s + shift 1576s + git status -b --porcelain 1576s + diff /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.want /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.got 1576s + : '---------- forget-was-ever-debrebase raw-converted-from-gbp nA ----------' 1576s + '[' xnA '!=' x ']' 1576s + : '---- forget-was-ever-debrebase raw-converted-from-gbp ...nA ----' 1576s + make_check nA 1576s + case "$1" in 1576s + t-refs-same-start 1576s + unset t_ref_val 1576s + t_ref_names=() 1576s + 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 1576s + local g 1576s + for g in $* 1576s + t-ref-same refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + local name=refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + local val 1576s ++ t-git-get-ref refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ local ref=refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s + val=178896af44c5b02e05a3442df6c33233b6acb807 1576s + t-ref-same-val refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1576s + local name=refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1576s + t_ref_names+=("$name") 1576s + for g in $* 1576s + t-ref-same refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + local name=refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + local val 1576s ++ t-git-get-ref refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ local ref=refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ case "$ref" in 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ git show-ref -d refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + val=178896af44c5b02e05a3442df6c33233b6acb807 1576s + t-ref-same-val refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 1576s + local name=refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 1576s + local val=178896af44c5b02e05a3442df6c33233b6acb807 1576s + case "${t_ref_val-unset}" in 1576s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 1576s + t_ref_names+=("$name") 1576s + checkletters=A 1576s + '[' xA '!=' x ']' 1576s + : '---- forget-was-ever-debrebase raw-converted-from-gbp ...A ----' 1576s + make_check A 1576s + case "$1" in 1576s + 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 1576s + local val 1576s + for g in $* 1576s ++ t-git-get-ref refs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ local ref=refs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ case "$ref" in 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ git show-ref -d refs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ test 1 = 1 1576s + val= 1576s + '[' x '!=' x ']' 1576s + for g in $* 1576s ++ t-git-get-ref refs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ local ref=refs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ case "$ref" in 1576s ++ git show-ref -d refs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 1576s ++ perl -ne ' 1576s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp\E(?:\^\{\})?$#; 1576s END { print "$x\n" if length $x; } 1576s ' 1576s ++ test 1 = 1 1576s + val= 1576s + '[' x '!=' x ']' 1576s + checkletters= 1576s + '[' x '!=' x ']' 1576s + t-ok 1576s + : ======================================== 1576s + t-check-only-bpd 1576s + '[' .. = .. ']' 1576s + return 1576s + t-fscks 1576s + shopt -s nullglob 1576s + for d in $tmp/*/.git $tmp/git/*.git 1576s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1576s + t-git-fsck 1576s ++ git rev-parse --git-dir 1576s + local fsckerrs=.git/dgit-test-fsck.errs 1576s + set +e 1576s + LC_MESSAGES=C 1576s + git fsck --no-dangling --strict 1576s + tee .git/dgit-test-fsck.errs 1576s + ps='0 0' 1576s + set -e 1576s + local pats 1576s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1576s + test '0 0' = '0 0' 1576s + pats+=(-e 'notice: HEAD points to an unborn branch') 1576s + pats+=(-e 'notice: No default references') 1576s + set +e 1576s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1576s + rc=1 1576s + set -e 1576s + case $rc in 1576s + for d in $tmp/*/.git $tmp/git/*.git 1576s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1576s + t-git-fsck 1576s ++ git rev-parse --git-dir 1576s + local fsckerrs=./dgit-test-fsck.errs 1576s + set +e 1576s + tee ./dgit-test-fsck.errs 1576s + LC_MESSAGES=C 1576s + git fsck --no-dangling --strict 1576s notice: HEAD points to an unborn branch (master) 1576s + ps='0 0' 1576s + set -e 1576s + local pats 1576s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1576s + test '0 0' = '0 0' 1576s + pats+=(-e 'notice: HEAD points to an unborn branch') 1576s + pats+=(-e 'notice: No default references') 1576s + set +e 1576s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1576s + rc=1 1576s + set -e 1576s + case $rc in 1576s + t-save-artifacts 1576s + artifacts=/tmp/autopkgtest.XK8uun/gdr-subcommands-artifacts 1576s + '[' x/tmp/autopkgtest.XK8uun/gdr-subcommands-artifacts = x ']' 1576s + '[' xtmp = x ']' 1576s + GZIP=-1v 1576s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-subcommands-artifacts/gdr-subcommands.tar.gz '--exclude=*.tar' . 1576s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1576s 83.0% 1576s + echo ok. 1576s ok. 1576s + rc=0 1576s + set +x 1576s + set +e 1576s + pwd 1576s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1576s + '[' x '!=' x ']' 1576s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1576s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1576s + set -e 1576s + test 0 = 0 1577s autopkgtest [23:13:27]: test gdr-subcommands: -----------------------] 1577s autopkgtest [23:13:27]: test gdr-subcommands: - - - - - - - - - - results - - - - - - - - - - 1577s gdr-subcommands PASS 1578s autopkgtest [23:13:28]: test gdr-unprocessable: preparing testbed 1578s Reading package lists... 1578s Building dependency tree... 1578s Reading state information... 1578s Starting pkgProblemResolver with broken count: 0 1578s Starting 2 pkgProblemResolver with broken count: 0 1578s Done 1579s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1580s autopkgtest [23:13:30]: test gdr-unprocessable: [----------------------- 1580s ++ set -o pipefail 1580s ++ . tests/lib-core 1580s ++ . tests/lib-restricts 1580s ++ trap ' 1580s rc=$? 1580s set +x 1580s test $rc = 0 || echo " 1580s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1580s 1580s Most relevant logs are just before assignment rc=$rc 1580s Will now do cleanup etc. 1580s " 1580s set -x 1580s set +e 1580s pwd 1580s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1580s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1580s set -e 1580s test $rc = 0 || t-report-failure 1580s ' EXIT 1580s ++ t-filter-out-git-hyphen-dir 1580s ++ local pathent 1580s +++ type -p git-rev-parse 1580s +++ : 1580s ++ pathent= 1580s ++ case "$pathent" in 1580s ++ return 1580s ++ t-set-intree 1580s ++ '[' x = x ']' 1580s ++ return 1580s ++ : -D 1580s ++ export DGIT_TEST_DEBUG 1580s ++ : x 1580s ++ export DGIT_TEST_DEBPUSH_DEBUG 1580s ++ : 1580s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1580s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1580s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1580s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1580s ++ export LC_CTYPE=C.UTF-8 1580s ++ LC_CTYPE=C.UTF-8 1580s ++ unset CDPATH 1580s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1580s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1580s +++ pwd 1580s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1580s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1580s ++ testname=gdr-unprocessable 1580s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1580s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1580s ++ bpd=.. 1580s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1580s ++ '[' x '!=' x ']' 1580s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s +++ pwd 1580s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ t-set-using-tmp 1580s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1580s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1580s ++ export 'DEBFULLNAME=dgit test git user' 1580s ++ DEBFULLNAME='dgit test git user' 1580s ++ git config --global user.email dgit-test@debian.example.net 1580s ++ git config --global user.name 'dgit test git user' 1580s ++ git config --global protocol.ext.allow always 1580s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1580s ++ env -0 1580s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1580s ++ export DEBCHANGE_VENDOR=dpkg 1580s ++ DEBCHANGE_VENDOR=dpkg 1580s ++ unset VISUAL 1580s ++ unset GIT_EDITOR 1580s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1580s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1580s ++ cat 1580s ++ schroot=build 1580s ++ : aq 1580s ++ : archive/test-dummy 1580s ++ : sid:unstable 1580s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1580s ++ git config --global dgit.default.old-dsc-distro test-dummy 1580s ++ for import in ${autoimport-gnupg} 1580s ++ case "$0" in 1580s ++ t-setup-import gnupg 1580s ++ local setupname=gnupg 1580s ++ local setupsrc 1580s ++ local lock 1580s ++ '[' x = x ']' 1580s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1580s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1580s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1580s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1580s cd "$1"; shift 1580s setupname="$1"; shift 1580s simport="$1"; shift 1580s if [ -e "$simport" ]; then exit 0; fi 1580s env - "$@" \ 1580s "tests/setup/$setupname" 1580s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1580s + cd /tmp/autopkgtest.XK8uun/build.980/src 1580s + shift 1580s + setupname=gnupg 1580s + shift 1580s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1580s + shift 1580s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1580s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-unprocessable-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-unprocessable-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-unprocessable-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-unprocessable -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-unprocessable' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-unprocessable-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1580s ++ set -o pipefail 1580s ++ . tests/lib-core 1580s ++ . tests/lib-restricts 1580s ++ trap ' 1580s rc=$? 1580s set +x 1580s test $rc = 0 || echo " 1580s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1580s 1580s Most relevant logs are just before assignment rc=$rc 1580s Will now do cleanup etc. 1580s " 1580s set -x 1580s set +e 1580s pwd 1580s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1580s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1580s set -e 1580s test $rc = 0 || t-report-failure 1580s ' EXIT 1580s ++ t-filter-out-git-hyphen-dir 1580s ++ local pathent 1580s +++ type -p git-rev-parse 1580s +++ : 1580s ++ pathent= 1580s ++ case "$pathent" in 1580s ++ return 1580s ++ t-set-intree 1580s ++ '[' x = x ']' 1580s ++ return 1580s ++ : -D 1580s ++ export DGIT_TEST_DEBUG 1580s ++ : x 1580s ++ export DGIT_TEST_DEBPUSH_DEBUG 1580s ++ : 1580s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1580s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1580s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1580s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1580s ++ export LC_CTYPE=C.UTF-8 1580s ++ LC_CTYPE=C.UTF-8 1580s ++ unset CDPATH 1580s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1580s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1580s +++ pwd 1580s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1580s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1580s ++ testname=gnupg 1580s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1580s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1580s ++ bpd=.. 1580s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1580s ++ '[' x '!=' x ']' 1580s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s +++ pwd 1580s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ t-set-using-tmp 1580s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1580s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1580s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1580s ++ export 'DEBFULLNAME=dgit test git user' 1580s ++ DEBFULLNAME='dgit test git user' 1580s ++ git config --global user.email dgit-test@debian.example.net 1580s ++ git config --global user.name 'dgit test git user' 1580s ++ git config --global protocol.ext.allow always 1580s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1580s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1580s ++ export DEBCHANGE_VENDOR=dpkg 1580s ++ DEBCHANGE_VENDOR=dpkg 1580s ++ unset VISUAL 1580s ++ unset GIT_EDITOR 1580s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1580s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1580s ++ cat 1580s ++ schroot=build 1580s ++ : aq 1580s ++ : archive/test-dummy 1580s ++ : sid:unstable 1580s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1580s ++ git config --global dgit.default.old-dsc-distro test-dummy 1580s ++ for import in ${autoimport-gnupg} 1580s ++ case "$0" in 1580s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1580s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1580s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1580s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1580s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1580s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1580s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1580s + setup=' 1580s export GNUPGHOME=$tmp/gnupg 1580s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1580s 1580s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1580s ssb rsa2048 2013-11-17 [E] 1580s 1580s sec rsa2048 2014-01-26 [SC] 1580s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1580s uid [ultimate] Populus Romanus (test key) 1580s ssb rsa2048 2014-01-26 [E] 1580s 1580s sec rsa2048 2014-01-26 [SC] 1580s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1580s uid [ unknown] Hannibal (test key) 1580s ssb rsa2048 2014-01-26 [E] 1580s 1580s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1580s export GNUPGHOME=$tmp/gnupg 1580s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1580s 1580s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 1580s delete mode 100644 debian/source/format 1580s + git tag v1.0 1580s + : 'fake up that our quilt-tip was descended from upstream' 1580s + git checkout quilt-tip 1580s Switched to branch 'quilt-tip' 1580s + git merge --no-edit -s ours upstream 1580s Merge made by the 'ours' strategy. 1580s + : 'fake up that our quilt-tip had the patch queue in it' 1580s + git checkout patch-queue/quilt-tip 1580s Switched to branch 'patch-queue/quilt-tip' 1580s + gbp pq export 1581s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1581s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1581s + git add debian/patches 1581s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 1581s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 1581s 4 files changed, 50 insertions(+) 1581s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1581s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1581s create mode 100644 debian/patches/series 1581s create mode 100644 debian/patches/subdir/addnewups 1581s + : 'make branch names more conventional' 1581s + git branch -D master 1581s Deleted branch master (was 17d67db). 1581s + git branch -m quilt-tip master 1581s + not-gdr-processable origin 1581s + git branch gdr-unprocessable/origin 1581s + t-git-debrebase analyse 1581s + local gdr=git-debrebase 1581s + : ' 1581s + grep 'Unknown Unprocessable' 1581s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1581s + git-debrebase --dgit=dgit -D analyse 1581s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 1581s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1581s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1581s git-debrebase = AddPatches {"Parents" => [{"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Differs" => 4}],"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","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Type" => "AddPatches"} 1581s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1581s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1581s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1581s git-debrebase = Pseudomerge {"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Overwritten" => [{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48,"Ix" => 1}],"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","Contributor" => {"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0},"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 1581s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1581s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1581s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Msg" => "Add *.o to .gitignore\n","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}]} 1581s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1581s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1581s git-debrebase = Mixed {"Parents" => [{"Ix" => 0,"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}],"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","Type" => "Mixed","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b"} 1581s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1581s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1581s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}],"Msg" => "echo EXAMPLE RULES TARGET\n","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Type" => "Packaging","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165"} 1581s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1581s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1581s git-debrebase = Packaging {"Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32,"Ix" => 0}],"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Type" => "Packaging","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Msg" => "WIP\n"} 1581s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1581s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1581s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}],"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Type" => "Packaging","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Msg" => "WIP\n","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n"} 1581s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1581s git-debrebase ** Unknown 1581s git-debrebase *** WALK BOMB unrecognised 1581s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1581s ' 1581s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1581s + : 'fake up an upstream 2.0' 1581s + git branch make-upstream upstream 1581s + t-make-new-upstream-tarball 2.0 1581s + local uv=2.0 1581s + git checkout make-upstream 1581s Switched to branch 'make-upstream' 1581s + echo 'upstream 2.0' 1581s + git commit -a -m 'upstream 2.0 tarball' 1581s [make-upstream 4db56a8] upstream 2.0 tarball 1581s 1 file changed, 1 insertion(+) 1581s + t-make-orig example 2.0 make-upstream 1581s + local p=example 1581s + local v=2.0 1581s + local tag=make-upstream 1581s + ust=example_2.0.orig.tar.gz 1581s + GZIP=-1 1581s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1581s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1581s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1581s + git branch -D quilt-tip-2 1581s Deleted branch quilt-tip-2 (was 99fcab4). 1581s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1581s + git branch -D gitish-only 1581s Deleted branch gitish-only (was 2b2ddc8). 1581s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1581s + git branch -D quilt-tip-1.1 1581s Deleted branch quilt-tip-1.1 (was 7fc34be). 1581s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1581s + git branch -D patch-queue/quilt-tip 1581s Deleted branch patch-queue/quilt-tip (was d843a68). 1581s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1581s + git branch -D indep-arch 1581s Deleted branch indep-arch (was e215729). 1581s + : 'see what gbp import-orig does' 1581s + git checkout master 1581s Switched to branch 'master' 1581s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1581s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1581s gbp:info: Source package is example 1581s gbp:info: Upstream version is 2.0 1581s gbp:info: Replacing upstream source on 'master' 1581s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1581s + not-gdr-processable merge 1581s + git branch gdr-unprocessable/merge 1581s + t-git-debrebase analyse 1581s + local gdr=git-debrebase 1581s + grep 'Unknown Unprocessable' 1581s + : ' 1581s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1581s + git-debrebase --dgit=dgit -D analyse 1581s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 1581s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1581s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1581s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1581s git-debrebase ** Unknown 1581s git-debrebase *** WALK BOMB unrecognised 1581s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1581s ' 1581s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 1581s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1581s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1581s + DEBEMAIL=dgit-tests@example.org 1581s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1581s + 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) 1581s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1581s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1581s 1 file changed, 6 insertions(+) 1581s + t-dch-commit-r 1581s + t-dch-r-rune t-dch-commit 1581s + local cmd=t-dch-commit 1581s + shift 1581s + local suite=unstable 1581s + t-dch-commit -r -D unstable '' 1581s + t-debchange -r -D unstable '' 1581s + DEBEMAIL=dgit-tests@example.org 1581s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1581s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1581s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1581s libdistro-info-perl is not installed, Debian release names are not known. 1581s libdistro-info-perl is not installed, Ubuntu release names are not known. 1581s + git commit -m 'dch -r -D unstable ' debian/changelog 1581s [master f31021f] dch -r -D unstable 1581s 1 file changed, 3 insertions(+), 2 deletions(-) 1581s + echo garbage 1581s + git add debian/patches/garbage 1581s + git commit -m 'add garbage' debian/patches/garbage 1581s [master eb10718] add garbage 1581s 1 file changed, 1 insertion(+) 1581s create mode 100644 debian/patches/garbage 1581s + t-archive-none example 1581s + t-select-package example 1581s + p=example 1581s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1581s + t-archive-none-aq 1581s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 1581s + : 1581s + local 'jsondelim=[' 1581s + local suitespec 1581s + for suitespec in $suitespecs 1581s + local suite=sid 1581s + local sname=unstable 1581s + t-aq-archive-updated sid example 1581s + local suite=sid 1581s + local p=example 1581s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1581s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1581s + perl -wne ' 1581s use JSON; 1581s use strict; 1581s our @v; 1581s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1581s push @v, { 1581s "version" => "$1", 1581s "sha256sum" => "$2", 1581s "component" => "$3", 1581s "filename" => "$4", 1581s }; 1581s END { 1581s my $json = JSON->new->canonical(); 1581s print $json->encode(\@v) or die $!; 1581s } 1581s ' 1581s + t-aq-archive-updated new example 1581s + local suite=new 1581s + local p=example 1581s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1581s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1581s + perl -wne ' 1581s use JSON; 1581s use strict; 1581s our @v; 1581s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1581s push @v, { 1581s "version" => "$1", 1581s "sha256sum" => "$2", 1581s "component" => "$3", 1581s "filename" => "$4", 1581s }; 1581s END { 1581s my $json = JSON->new->canonical(); 1581s print $json->encode(\@v) or die $!; 1581s } 1581s ' 1581s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1581s + cat 1581s + jsondelim=' },' 1581s + cat 1581s + t-git-none 1581s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1581s + set -e 1581s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1581s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1581s + t-dgit -wgf --gbp push-source --new 1581s + local dgit=dgit 1581s + pwd 1581s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1581s + : ' 1581s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1581s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 1582s | git rev-parse --show-toplevel 1582s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1582s | git config -z --get-regexp --local '.*' 1582s | git config -z --get-regexp --local '.*' 1582s | git config -z --get-regexp --global '.*' 1582s | git config -z --get-regexp --system '.*' 1582s format 3.0 (quilt), quilt mode gbp 1582s Format `3.0 (quilt)', need to check/update patch stack 1582s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1582s => `' 1582s + git diff --quiet HEAD 1582s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1582s canonical suite name for unstable is sid 1582s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1582s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1582s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1582s | git rev-parse 'HEAD~0' 1582s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1582s | git symbolic-ref -q HEAD 1582s => `refs/heads/master' 1582s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1582s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1582s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1582s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1582s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1582s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 08c011354ee692067d26bf969622eea0718430cc9202436724632f10cca15f81 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1582s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1582s >(no reflog) 1582s splitbrain cache miss 1582s CD work 1582s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1582s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1582s + git checkout -q -b dgit-view 1582s examining quilt state (multiple patches, gbp mode) 1582s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1582s CD fake 1582s | find -name .git -prune -print0 1582s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1582s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 1582s + git add -Af . 1582s | git write-tree 1582s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 1582s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1582s CD .. 1582s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1582s CD ../fake 1582s + git add -Af . 1582s | git write-tree 1582s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1582s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1582s CD ../work 1582s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 1582s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 1582s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 1582s => `' 1582s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 1582s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 1582s => `lib.c\x00new-upstream-file\x00src.c\x00' 1582s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1582s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 1582s => `lib.c\x00new-upstream-file\x00src.c\x00' 1582s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1582s differences @dl == ## ## == == ==. 1582s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 1582s dgit: quilt differences: src: == orig ## gitignores: == orig == 1582s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1582s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1582s => `1530000000 +0000' 1582s dgit view: creating patches-applied version using gbp pq 1582s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 1582s + git update-ref refs/heads/dgit-view HEAD 1582s + git checkout -q dgit-view 1582s | git rev-parse 'HEAD~0' 1582s => `45ea71a69fa522ce760afdab8a420200443753e9' 1582s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1582s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 1582s => `' 1582s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 08c011354ee692067d26bf969622eea0718430cc9202436724632f10cca15f81 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 1582s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 1582s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1582s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1582s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1582s | git rev-parse 'HEAD~0' 1582s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1582s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1582s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1582s dpkg-source: info: using source format '3.0 (quilt)' 1582s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1582s dpkg-source: info: using patch list from debian/patches/series 1582s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 1582s dpkg-source: info: building example in example_2.0-1.dsc 1582s CD work 1582s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1582s package seems new, not specifying -v 1582s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 1583s dpkg-genchanges: info: not including original source code in upload 1583s CD .. 1583s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1583s renaming (Files) example_2.0.orig.tar.gz 1583s renaming (Files) example_2.0-1.debian.tar.xz 1583s renaming (dsc) example_2.0-1.dsc 1583s renaming (changes) example_2.0-1_source.changes 1583s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1583s actually entering push 1583s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1583s => `0' 1583s + git config remote.dgit.skipdefaultupdate true 1583s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1583s get_archive_dsc: nothing in archive, returning undef 1583s no version available from the archive 1583s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1583s => `' 1583s previous reference hash= 1583s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1583s => `' 1583s fetch_from_archive: lastfetch= 1583s nothing found! 1583s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1583s + git check-ref-format archive/test-dummy/2.0-1 1583s | git symbolic-ref -q HEAD 1583s => `refs/heads/master' 1583s | git rev-parse 'HEAD~0' 1583s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1583s ffq_prev_branchinfo branch current refs/heads/master 1583s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1583s => `' 1583s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1583s => `' 1583s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1583s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1583s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1583s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1583s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1583s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 08c011354ee692067d26bf969622eea0718430cc9202436724632f10cca15f81 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1583s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1583s CD work 1583s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1583s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1583s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1583s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 1583s splitbrain_pseudomerge... 1583s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1583s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1583s => `' 1583s + git diff --quiet HEAD 1583s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 1583s => `' 1583s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1583s checking that example_2.0-1.dsc corresponds to HEAD 1583s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc 1583s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc) 1583s dpkg-source: info: extracting example in example-2.0 1583s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1583s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 1583s dpkg-source: info: using patch list from debian/patches/series 1583s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1583s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1583s dpkg-source: info: applying subdir/addnewups 1583s CD example-2.0 1583s | find -name .git -prune -print0 1583s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1583s + git add -Af . 1583s | git write-tree 1583s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1583s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1583s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1583s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1583s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1583s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 1583s files_compare_inputs example_2.0-1.dsc 1583s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 1583s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1583s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 1583s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 1583s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1583s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 1583s files_compare_inputs example_2.0-1.dsc Files 1583s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 1583s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 1583s files_compare_inputs example_2.0-1_source.changes 1583s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 1583s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 1583s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 1583s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 1583s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 1583s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 1583s files_compare_inputs example_2.0-1_source.changes Files 1583s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 1583s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 1583s checking origs needed (2.0)... 1583s checking origs needed placement 'devel extra'... 1583s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1583s origs example_2.0.orig.tar.gz is_orig 1583s -| sh -ec 'cd "$1"; shift 1583s 1583s find -name "$1" -print0 | 1583s xargs -0r sha256sum 1583s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1583s origs example_2.0.orig.tar.gz $#$have=-1 1583s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1583s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 1583s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1583s push_tagwants: $VAR1 = [ 1583s '2.0-1', 1583s '45ea71a69fa522ce760afdab8a420200443753e9', 1583s 'eb10718ab213ccfa83613ebbddefbffda941a548', 1583s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1583s ]; 1583s $VAR2 = [ 1583s { 1583s 'Tfn' => sub { "DUMMY" }, 1583s 'TagFn' => sub { "DUMMY" }, 1583s 'View' => 'dgit', 1583s 'TfSuffix' => '', 1583s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 1583s 'Tag' => 'archive/test-dummy/2.0-1' 1583s }, 1583s { 1583s 'View' => 'maint', 1583s 'TfSuffix' => '-maintview', 1583s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 1583s 'Tag' => 'test-dummy/2.0-1', 1583s 'Tfn' => sub { "DUMMY" }, 1583s 'TagFn' => sub { "DUMMY" } 1583s } 1583s ]; 1583s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1583s => `1530000000 +0000' 1583s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1583s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1583s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1583s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 1583s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1583s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 1583s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1583s => `50138fbdf02ea9852efb0650418443a1bd0b939a' 1583s + git verify-tag 50138fbdf02ea9852efb0650418443a1bd0b939a 1583s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1583s gpg: Signature made Mon Mar 31 23:13:33 2025 UTC 1583s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1583s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1583s gpg: WARNING: This key is not certified with a trusted signature! 1583s gpg: There is no indication that the signature belongs to the owner. 1583s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1583s + git update-ref refs/tags/archive/test-dummy/2.0-1 50138fbdf02ea9852efb0650418443a1bd0b939a 1583s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 1583s => `9682df92b2d226cb7c63bd0a4ae8a1cd378a8459' 1583s + git verify-tag 9682df92b2d226cb7c63bd0a4ae8a1cd378a8459 1583s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1583s gpg: Signature made Mon Mar 31 23:13:33 2025 UTC 1583s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1583s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1583s gpg: WARNING: This key is not certified with a trusted signature! 1583s gpg: There is no indication that the signature belongs to the owner. 1583s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1583s + git update-ref refs/tags/test-dummy/2.0-1 9682df92b2d226cb7c63bd0a4ae8a1cd378a8459 1583s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1583s => `0' 1583s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 1583s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 1583s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1583s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 1583s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 1583s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 1583s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 1583s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 1583s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1583s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1583s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1583s 1583s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 1583s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1583s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1584s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1584s 1584s Successfully signed dsc, changes files 1584s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 1584s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1584s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1584s D: Setting host argument. 1584s Checking signature on .changes 1584s Checking signature on .dsc 1584s Uploading to test-dummy (via local to localhost): 1584s Successfully uploaded packages. 1584s dgit ok: pushed and uploaded 2.0-1 1584s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1584s del_lrfetchrefs... 1584s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1584s ' 1584s + t-salsa-add-remote 1584s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1584s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1584s + set -e 1584s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1584s + git init --bare 1584s hint: Using 'master' as the name for the initial branch. This default branch name 1584s hint: is subject to change. To configure the initial branch name to use in all 1584s hint: of your new repositories, which will suppress this warning, call: 1584s hint: 1584s hint: git config --global init.defaultBranch 1584s hint: 1584s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1584s hint: 'development'. The just-created branch can be renamed via this command: 1584s hint: 1584s hint: git branch -m 1584s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example/ 1584s + git remote add origin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1584s + git push --set-upstream origin master 1584s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1584s * [new branch] master -> master 1584s Branch 'master' set up to track remote branch 'master' from 'origin'. 1584s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1584s + local 'mpat=E:identical in upstream files' 1584s + shift 1584s + set +o pipefail 1584s + LC_MESSAGES=C 1584s + LANGUAGE=C 1584s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1584s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1584s + local gdr=git-debrebase 1584s + : ' 1584s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1584s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1584s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1584s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 1584s docs/README | 1 + 1584s 1 file changed, 1 insertion(+) 1584s 1584s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1584s git-debrebase: identical in upstream files. See diffstat above, or run 1584s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 1584s + local 'ps=255 0' 1584s + set -o pipefail 1584s + case $ps in 1584s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1584s + local 'mpat=E:identical in upstream files' 1584s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1584s + local grepper=fgrep 1584s + case "$mpat" in 1584s + case "$mpat" in 1584s + grepper=egrep 1584s + mpat='identical in upstream files' 1584s + egrep -e 'identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1584s git-debrebase: identical in upstream files. See diffstat above, or run 1584s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1584s + local 'mpat=E:Unused patch file garbage will be discarded' 1584s + shift 1584s + set +o pipefail 1584s + LC_MESSAGES=C 1584s + LANGUAGE=C 1584s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1584s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1584s + local gdr=git-debrebase 1584s + : ' 1584s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1584s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1584s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1584s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1584s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1584s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1584s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1584s $VAR2 = bless( do{\(my $o = { 1584s 'is_pgp_signed' => 0, 1584s 'drop_empty' => 0, 1584s 'out_order' => [], 1584s 'name' => 'debian/changelog, entry no.1', 1584s 'allow_duplicate' => 0, 1584s 'fields' => { 1584s 'Source' => 'example', 1584s 'Version' => '2.0-1', 1584s 'Distribution' => 'unstable', 1584s 'Urgency' => 'medium', 1584s 'Maintainer' => 'dgit test git user ', 1584s 'Timestamp' => '1530000000', 1584s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1584s 'Changes' => ' 1584s example (2.0-1) unstable; urgency=medium 1584s 1584s [ Ian Jackson ] 1584s * new upstream (did gbp import-orig)' 1584s }, 1584s 'in_order' => [ 1584s 'Source', 1584s 'Version', 1584s 'Distribution', 1584s 'Urgency', 1584s 'Maintainer', 1584s 'Timestamp', 1584s 'Date', 1584s 'Changes' 1584s ], 1584s 'allow_pgp' => 1, 1584s 'keep_duplicate' => 0 1584s })}, 'Dpkg::Control::Hash' ); 1584s last finished-looking changelog entry: (2.0-1) unstable 1584s will stitch in dgit view, archive/test-dummy/2.0-1 1584s git-debrebase: snags: 1 overriden by individual -f options 1584s 1584s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1584s + local 'ps=255 0' 1584s + set -o pipefail 1584s + case $ps in 1584s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1584s + local 'mpat=E:Unused patch file garbage will be discarded' 1584s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1584s + local grepper=fgrep 1584s + case "$mpat" in 1584s + case "$mpat" in 1584s + grepper=egrep 1584s + mpat='Unused patch file garbage will be discarded' 1584s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1584s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1584s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1584s + local gdr=git-debrebase 1584s + : ' 1584s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1584s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1584s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1584s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1584s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1584s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1584s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1584s $VAR2 = bless( do{\(my $o = { 1584s 'allow_duplicate' => 0, 1584s 'is_pgp_signed' => 0, 1584s 'fields' => { 1584s 'Source' => 'example', 1584s 'Version' => '2.0-1', 1584s 'Distribution' => 'unstable', 1584s 'Urgency' => 'medium', 1584s 'Maintainer' => 'dgit test git user ', 1584s 'Timestamp' => '1530000000', 1584s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1584s 'Changes' => ' 1584s example (2.0-1) unstable; urgency=medium 1584s 1584s [ Ian Jackson ] 1584s * new upstream (did gbp import-orig)' 1584s }, 1584s 'allow_pgp' => 1, 1584s 'keep_duplicate' => 0, 1584s 'drop_empty' => 0, 1584s 'out_order' => [], 1584s 'name' => 'debian/changelog, entry no.1', 1584s 'in_order' => [ 1584s 'Source', 1584s 'Version', 1584s 'Distribution', 1584s 'Urgency', 1584s 'Maintainer', 1584s 'Timestamp', 1584s 'Date', 1584s 'Changes' 1584s ] 1584s })}, 'Dpkg::Control::Hash' ); 1584s last finished-looking changelog entry: (2.0-1) unstable 1584s will stitch in dgit view, archive/test-dummy/2.0-1 1584s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1585s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1585s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1585s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 1585s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1585s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1585s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1585s git-debrebase ffq check_specs * 1585s git-debrebase ffq merge master 1585s git-debrebase ffq check_remote origin remote fetch/merge branch 1585s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1585s OK, you are ahead of refs/remotes/origin/master 1585s git-debrebase ffq check_remote undef remote push branch 1585s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1585s OK, you are ahead of refs/remotes/dgit/dgit/sid 1585s git-debrebase: snags: 2 overriden by individual -f options 1585s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 1585s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 1585s git-debrebase >$ 1585s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 1585s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1585s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1585s ' 1585s + git branch converted-from-gbp 1585s + v=2.0-2 1585s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1585s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1585s + DEBEMAIL=dgit-tests@example.org 1585s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1585s + 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 1585s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1585s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1585s 1 file changed, 6 insertions(+) 1585s + t-dch-commit-r 1585s + t-dch-r-rune t-dch-commit 1585s + local cmd=t-dch-commit 1585s + shift 1585s + local suite=unstable 1585s + t-dch-commit -r -D unstable '' 1585s + t-debchange -r -D unstable '' 1585s + DEBEMAIL=dgit-tests@example.org 1585s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1585s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1585s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1585s libdistro-info-perl is not installed, Debian release names are not known. 1585s libdistro-info-perl is not installed, Ubuntu release names are not known. 1585s + git commit -m 'dch -r -D unstable ' debian/changelog 1585s [master 4af0243] dch -r -D unstable 1585s 1 file changed, 1 insertion(+), 1 deletion(-) 1585s + t-dgit -wgf push-source --new 1585s + local dgit=dgit 1585s + pwd 1585s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1585s + : ' 1585s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1585s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 1585s | git rev-parse --show-toplevel 1585s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1585s | git config -z --get-regexp --local '.*' 1585s | git config -z --get-regexp --local '.*' 1585s | git config -z --get-regexp --global '.*' 1585s | git config -z --get-regexp --system '.*' 1585s format 3.0 (quilt), quilt mode linear 1585s Format `3.0 (quilt)', need to check/update patch stack 1585s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1585s => `' 1585s + git diff --quiet HEAD 1585s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1585s canonical suite name for unstable is sid 1585s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1585s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1585s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1585s | git rev-parse 'HEAD~0' 1585s => `4af0243f9227b0d695fbff38df345aca23969e2e' 1585s | git symbolic-ref -q HEAD 1585s => `refs/heads/master' 1585s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1585s CD work 1585s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1585s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1585s examining quilt state (multiple patches, linear mode) 1585s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 1585s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 1585s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1585s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1586s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 1586s | git rev-parse 'HEAD~0' 1586s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1586s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1586s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1586s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1586s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1586s CD fake 1586s | find -name .git -prune -print0 1586s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1586s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 1586s + git add -Af . 1586s | git write-tree 1586s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 1586s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1586s CD .. 1586s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1586s CD ../fake 1586s + git add -Af . 1586s | git write-tree 1586s => `607612c46d7ea5b66697b830f1a50f069061d460' 1586s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1586s CD ../work 1586s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1586s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1586s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1586s => `: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' 1586s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 1586s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1586s => `' 1586s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1586s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 1586s => `lib.c\x00new-upstream-file\x00src.c\x00' 1586s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 1586s differences @dl ## ## == == == ==. 1586s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 1586s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1586s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1586s starting quiltify (multiple patches, linear mode) 1586s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 1586s => `debian/control'... 1586s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1586s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1586s => `' 1586s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1586s search finished hooray! 1586s quiltify linearisation planning successful, executing... 1586s + git checkout -q master 1586s | git status --ignored --porcelain 1586s => `?? .pc/' 1586s nothing quilty to commit, ok. 1586s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1586s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1586s | git rev-parse 'HEAD~0' 1586s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1586s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1586s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1586s CD work 1586s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1586s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1586s CD .. 1586s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1586s dpkg-source: info: using source format '3.0 (quilt)' 1586s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1586s dpkg-source: info: using patch list from debian/patches/series 1586s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 1586s dpkg-source: info: building example in example_2.0-2.dsc 1586s CD work 1586s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1586s package seems new, not specifying -v 1586s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 1586s dpkg-genchanges: info: not including original source code in upload 1586s CD .. 1586s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1586s renaming (Files) example_2.0.orig.tar.gz 1586s renaming (Files) example_2.0-2.debian.tar.xz 1586s renaming (dsc) example_2.0-2.dsc 1586s renaming (changes) example_2.0-2_source.changes 1586s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1586s actually entering push 1586s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1586s => `1' 1586s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1586s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1586s git_lrfetch_sane iteration 0 1586s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1586s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 1586s => 50138fbdf02ea9852efb0650418443a1bd0b939a refs/tags/archive/test-dummy/2.0-1 1586s => 9682df92b2d226cb7c63bd0a4ae8a1cd378a8459 refs/tags/test-dummy/2.0-1 1586s 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 1586s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1586s | git for-each-ref refs/dgit-fetch/test-dummy 1586s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 1586s |> 50138fbdf02ea9852efb0650418443a1bd0b939a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1586s |> 9682df92b2d226cb7c63bd0a4ae8a1cd378a8459 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1586s git_lrfetch_sane: tidying any old suite lrfetchrefs 1586s | git for-each-ref refs/dgit-fetch/sid 1586s git_lrfetch_sane: git fetch --no-insane emulation complete 1586s $VAR1 = { 1586s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '50138fbdf02ea9852efb0650418443a1bd0b939a', 1586s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '9682df92b2d226cb7c63bd0a4ae8a1cd378a8459', 1586s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9' 1586s }; 1586s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1586s |> 50138fbdf02ea9852efb0650418443a1bd0b939a tag refs/tags/archive/test-dummy/2.0-1 1586s currently refs/tags/archive/test-dummy/2.0-1=50138fbdf02ea9852efb0650418443a1bd0b939a 1586s |> 9682df92b2d226cb7c63bd0a4ae8a1cd378a8459 tag refs/tags/test-dummy/2.0-1 1586s currently refs/tags/test-dummy/2.0-1=9682df92b2d226cb7c63bd0a4ae8a1cd378a8459 1586s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1586s |> 50138fbdf02ea9852efb0650418443a1bd0b939a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1586s offered refs/tags/archive/test-dummy/2.0-1=50138fbdf02ea9852efb0650418443a1bd0b939a 1586s |> 9682df92b2d226cb7c63bd0a4ae8a1cd378a8459 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1586s offered refs/tags/test-dummy/2.0-1=9682df92b2d226cb7c63bd0a4ae8a1cd378a8459 1586s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1586s get_archive_dsc: nothing in archive, returning undef 1586s no version available from the archive 1586s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 1586s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 1586s 1586s Package not found in the archive, but has allegedly been pushed using dgit. 1586s Perhaps the upload is stuck in incoming. Using the version from git. 1586s 1586s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s fetch mergeinfos: 1586s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 1586s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 1586s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 1586s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 1586s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 1586s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 1586s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1586s + git check-ref-format archive/test-dummy/2.0-2 1586s | git symbolic-ref -q HEAD 1586s => `refs/heads/master' 1586s | git rev-parse 'HEAD~0' 1586s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1586s ffq_prev_branchinfo branch current refs/heads/master 1586s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1586s => `' 1586s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1586s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1586s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1586s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1586s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1586s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1586s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1586s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1586s | git status --ignored --porcelain 1586s => `' 1586s nothing quilty to commit, ok. 1586s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1586s => `' 1586s + git diff --quiet HEAD 1586s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1586s => `45ea71a69fa522ce760afdab8a420200443753e9' 1586s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 1586s => `' 1586s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1586s checking that example_2.0-2.dsc corresponds to HEAD 1586s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc 1587s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc) 1587s dpkg-source: info: extracting example in example-2.0 1587s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1587s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 1587s dpkg-source: info: using patch list from debian/patches/series 1587s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1587s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1587s dpkg-source: info: applying subdir/addnewups 1587s CD example-2.0 1587s | find -name .git -prune -print0 1587s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1587s + git add -Af . 1587s | git write-tree 1587s => `607612c46d7ea5b66697b830f1a50f069061d460' 1587s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1587s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1587s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1587s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1587s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1587s files_compare_inputs example_2.0-2.dsc 1587s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 1587s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1587s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 1587s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 1587s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1587s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 1587s files_compare_inputs example_2.0-2.dsc Files 1587s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 1587s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 1587s files_compare_inputs example_2.0-2_source.changes 1587s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 1587s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 1587s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 1587s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 1587s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 1587s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 1587s files_compare_inputs example_2.0-2_source.changes Files 1587s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 1587s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 1587s checking origs needed (2.0)... 1587s checking origs needed placement 'devel extra'... 1587s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1587s origs example_2.0.orig.tar.gz is_orig 1587s -| sh -ec 'cd "$1"; shift 1587s 1587s find -name "$1" -print0 | 1587s xargs -0r sha256sum 1587s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1587s origs example_2.0.orig.tar.gz $#$have=-1 1587s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1587s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 1587s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1587s push_tagwants: $VAR1 = [ 1587s '2.0-2', 1587s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1587s undef, 1587s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1587s ]; 1587s $VAR2 = [ 1587s { 1587s 'Tag' => 'archive/test-dummy/2.0-2', 1587s 'View' => 'dgit', 1587s 'TagFn' => sub { "DUMMY" }, 1587s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1587s 'TfSuffix' => '', 1587s 'Tfn' => sub { "DUMMY" } 1587s }, 1587s { 1587s 'TfSuffix' => '-dgit', 1587s 'Tfn' => sub { "DUMMY" }, 1587s 'Tag' => 'test-dummy/2.0-2', 1587s 'View' => 'dgit', 1587s 'TagFn' => sub { "DUMMY" }, 1587s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1587s } 1587s ]; 1587s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1587s => `1530000000 +0000' 1587s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1587s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1587s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1587s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1587s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1587s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1587s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1587s => `e461b135d52d5271644527e564b35d986b434ee7' 1587s + git verify-tag e461b135d52d5271644527e564b35d986b434ee7 1587s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1587s gpg: Signature made Mon Mar 31 23:13:37 2025 UTC 1587s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1587s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1587s gpg: WARNING: This key is not certified with a trusted signature! 1587s gpg: There is no indication that the signature belongs to the owner. 1587s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1587s + git update-ref refs/tags/archive/test-dummy/2.0-2 e461b135d52d5271644527e564b35d986b434ee7 1587s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1587s => `fc10507f23152762c735c0a57b23a3ad338be690' 1587s + git verify-tag fc10507f23152762c735c0a57b23a3ad338be690 1587s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1587s gpg: Signature made Mon Mar 31 23:13:37 2025 UTC 1587s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1587s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1587s gpg: WARNING: This key is not certified with a trusted signature! 1587s gpg: There is no indication that the signature belongs to the owner. 1587s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1587s + git update-ref refs/tags/test-dummy/2.0-2 fc10507f23152762c735c0a57b23a3ad338be690 1587s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1587s => `1' 1587s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 1587s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1587s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 1587s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 1587s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 1587s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1587s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 1587s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1587s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1587s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1587s 1587s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 1587s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1587s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1587s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1588s 1588s Successfully signed dsc, changes files 1588s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 1588s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1588s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1588s D: Setting host argument. 1588s Checking signature on .changes 1588s Checking signature on .dsc 1588s Package includes an .orig.tar.gz file although the debian revision suggests 1588s that it might not be required. Multiple uploads of the .orig.tar.gz may be 1588s rejected by the upload queue management software. 1588s Uploading to test-dummy (via local to localhost): 1588s Successfully uploaded packages. 1588s dgit ok: pushed and uploaded 2.0-2 1588s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1588s del_lrfetchrefs... 1588s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 1588s del_lrfetchrefs: 50138fbdf02ea9852efb0650418443a1bd0b939a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1588s del_lrfetchrefs: 9682df92b2d226cb7c63bd0a4ae8a1cd378a8459 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1588s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1588s ' 1588s + git push 1588s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1588s eb10718..6b22dd5 master -> master 1588s + cd .. 1588s + t-archive-process-incoming sid 1588s + local suite=sid 1588s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1588s + t-archive-query sid 1588s + local suite=sid 1588s + local dscf=main/example_2.0-2.dsc 1588s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 1588s + local suite=sid 1588s + local p=example 1588s + local v=2.0-2 1588s + local dscf=main/example_2.0-2.dsc 1588s + local sha 1588s ++ sha256sum 1588s + sha='f39fd557b73e6b1a7a35aeeaae6dee3a0f4ac36a1333c8cd3a4a916f8d011b7a -' 1588s + echo '2.0-2 f39fd557b73e6b1a7a35aeeaae6dee3a0f4ac36a1333c8cd3a4a916f8d011b7a main/example_2.0-2.dsc' 1588s + t-aq-archive-updated sid example 1588s + local suite=sid 1588s + local p=example 1588s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1588s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1588s + perl -wne ' 1588s use JSON; 1588s use strict; 1588s our @v; 1588s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1588s push @v, { 1588s "version" => "$1", 1588s "sha256sum" => "$2", 1588s "component" => "$3", 1588s "filename" => "$4", 1588s }; 1588s END { 1588s my $json = JSON->new->canonical(); 1588s print $json->encode(\@v) or die $!; 1588s } 1588s ' 1588s ++ 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 1588s ++ echo git mirror aq 1588s + 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' ' 1588s . $troot/lib-gdr 1588s t-tstunt-parsechangelog 1588s p=example 1588s t-git-next-date 1588s ' 1588s + local savevars= 1588s + 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' 1588s + local 'importeval= 1588s . $troot/lib-gdr 1588s t-tstunt-parsechangelog 1588s p=example 1588s t-git-next-date 1588s ' 1588s + local import=IMPORT.gdr-convert-gbp 1588s + exec 1588s + local vn 1588s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1588s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1588s print STDERR "saving-exporting $vn\n"; 1588s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1588s or die $!; 1588s } 1588s ' 1588s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1588s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1588s saving-exporting DGIT_TEST_REAL_GPG 1588s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1588s + set -e 1588s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1588s + 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 1588s + printf '\n%s\n' ' 1588s . $troot/lib-gdr 1588s t-tstunt-parsechangelog 1588s p=example 1588s t-git-next-date 1588s ' 1588s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1588s + rc=0 1588s + set +x 1588s + set +e 1588s + pwd 1588s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1588s + '[' x '!=' x ']' 1588s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1588s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1588s + set -e 1588s + test 0 = 0 1588s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1588s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1588s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1588s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1588s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1588s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1588s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1588s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1588s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1588s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1588s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1588s ++ . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1588s +++ : -D 1588s +++ export GDR_TEST_DEBUG 1588s +++ t-tstunt debchange 1588s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1588s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1588s +++ local var=PATH 1588s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1588s +++ eval ' 1588s case "$PATH" in 1588s "$tstunt:"*) ;; 1588s *":$tstunt:"*) ;; 1588s "") PATH="$tstunt" ;; 1588s *) PATH="$tstunt:$PATH" ;; 1588s esac 1588s export PATH 1588s ' 1588s ++++ case "$PATH" in 1588s ++++ export PATH 1588s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1588s +++ local var=PERLLIB 1588s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1588s +++ eval ' 1588s case "$PERLLIB" in 1588s "$tstunt:"*) ;; 1588s *":$tstunt:"*) ;; 1588s "") PERLLIB="$tstunt" ;; 1588s *) PERLLIB="$tstunt:$PERLLIB" ;; 1588s esac 1588s export PERLLIB 1588s ' 1588s ++++ case "$PERLLIB" in 1588s ++++ export PERLLIB 1588s +++ local f 1588s +++ for f in "$@" 1588s +++ t-tstunt--save-real debchange 1588s +++ local f=debchange 1588s +++ case "$f" in 1588s +++ local rc 1588s +++ local real 1588s +++ set +e 1588s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1588s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1588s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1588s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1588s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1588s ++++ type -p debchange 1588s +++ real=/usr/bin/debchange 1588s +++ rc=0 1588s +++ set -e 1588s +++ case $rc in 1588s +++ local varname=debchange 1588s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1588s +++ eval ' 1588s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1588s export DGIT_TEST_REAL_DEBCHANGE 1588s ' 1588s ++++ : /usr/bin/debchange 1588s ++++ export DGIT_TEST_REAL_DEBCHANGE 1588s +++ f=./debchange 1588s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1588s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1588s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1588s ++ t-tstunt-parsechangelog 1588s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1588s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1588s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1588s ++ local var=PATH 1588s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1588s ++ eval ' 1588s case "$PATH" in 1588s "$tstunt:"*) ;; 1588s *":$tstunt:"*) ;; 1588s "") PATH="$tstunt" ;; 1588s *) PATH="$tstunt:$PATH" ;; 1588s esac 1588s export PATH 1588s ' 1588s +++ case "$PATH" in 1588s +++ export PATH 1588s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1588s ++ local var=PERLLIB 1588s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1588s ++ eval ' 1588s case "$PERLLIB" in 1588s "$tstunt:"*) ;; 1588s *":$tstunt:"*) ;; 1588s "") PERLLIB="$tstunt" ;; 1588s *) PERLLIB="$tstunt:$PERLLIB" ;; 1588s esac 1588s export PERLLIB 1588s ' 1588s +++ case "$PERLLIB" in 1588s +++ export PERLLIB 1588s ++ local f 1588s ++ for f in "$@" 1588s ++ t-tstunt--save-real dpkg-parsechangelog 1588s ++ local f=dpkg-parsechangelog 1588s ++ case "$f" in 1588s ++ local rc 1588s ++ local real 1588s ++ set +e 1588s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1588s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1588s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1588s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1588s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1588s +++ type -p dpkg-parsechangelog 1588s ++ real=/usr/bin/dpkg-parsechangelog 1588s ++ rc=0 1588s ++ set -e 1588s ++ case $rc in 1588s ++ local varname=dpkg_parsechangelog 1588s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1588s ++ eval ' 1588s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1588s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1588s ' 1588s +++ : /usr/bin/dpkg-parsechangelog 1588s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1588s ++ f=./dpkg-parsechangelog 1588s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1588s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1588s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1588s ++ for f in "$@" 1588s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1588s ++ local f=Dpkg/Changelog/Parse.pm 1588s ++ case "$f" in 1588s ++ return 1588s ++ f=./Dpkg/Changelog/Parse.pm 1588s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1588s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1588s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1588s ++ p=example 1588s ++ t-git-next-date 1588s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1588s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1588s + cd example 1588s + t-dgit setup-mergechangelogs 1588s + local dgit=dgit 1588s + pwd 1588s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1588s + : ' 1588s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1588s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-mergechangelogs 1588s | git rev-parse --show-toplevel 1588s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1588s | git config -z --get-regexp --local '.*' 1588s | git config -z --get-regexp --local '.*' 1588s | git config -z --get-regexp --global '.*' 1588s | git config -z --get-regexp --system '.*' 1588s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 1588s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 1588s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1588s ' 1588s + mfmt='found unprocessable commit.*%s' 1588s + subcmd 1588s + cmd=("$@") 1588s + branch merge 'general two-parent merge' 1588s + branch=merge 1588s + git checkout gdr-unprocessable/merge 1588s Switched to branch 'gdr-unprocessable/merge' 1588s + msgcore='general two-parent merge' 1588s + expected- 1588s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 1588s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 1588s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1588s + shift 1588s + set +o pipefail 1588s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1588s + LC_MESSAGES=C 1588s + LANGUAGE=C 1588s + cmd 1588s + t-git-debrebase 1588s + local gdr=git-debrebase 1588s + : ' 1588s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1588s + git-debrebase --dgit=dgit -D 1588s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 1588s git-debrebase ffq check_specs * 1588s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 0 - 1588s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1588s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1588s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1588s git-debrebase ** Unknown 1588s git-debrebase *** WALK BOMB unrecognised 1588s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1588s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 1588s 1588s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 1588s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1588s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1588s + local 'ps=255 0' 1588s + set -o pipefail 1588s + case $ps in 1588s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1588s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1588s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1588s + local grepper=fgrep 1588s + case "$mpat" in 1588s + case "$mpat" in 1588s + grepper=egrep 1588s + mpat='found unprocessable commit.*general two-parent merge' 1588s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1588s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 1588s + branch origin 'origin commit' 1588s + branch=origin 1588s + git checkout gdr-unprocessable/origin 1588s Switched to branch 'gdr-unprocessable/origin' 1588s + msgcore='origin commit' 1588s + expected- 1588s ++ printf 'found unprocessable commit.*%s' 'origin commit' 1588s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 1588s + local 'mpat=E:found unprocessable commit.*origin commit' 1588s + shift 1588s + set +o pipefail 1588s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1588s + LC_MESSAGES=C 1588s + LANGUAGE=C 1588s + cmd 1588s + t-git-debrebase 1588s + local gdr=git-debrebase 1588s + : ' 1588s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1588s + git-debrebase --dgit=dgit -D 1588s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1588s git-debrebase ffq check_specs * 1588s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 1588s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1588s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1588s git-debrebase = AddPatches {"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","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","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e"} 1588s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1588s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1588s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1588s git-debrebase = Pseudomerge {"Parents" => [{"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"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","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Pseudomerge"} 1588s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1588s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1588s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Msg" => "Add *.o to .gitignore\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"} 1588s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1588s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1588s git-debrebase = Mixed {"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","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","Parents" => [{"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Ix" => 0}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Type" => "Mixed"} 1588s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1588s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1588s git-debrebase = Packaging {"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Parents" => [{"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0}],"Msg" => "echo EXAMPLE RULES TARGET\n","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Type" => "Packaging"} 1588s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1588s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1588s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Msg" => "WIP\n","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Ix" => 0,"Differs" => 32}],"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Type" => "Packaging","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 1588s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1588s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1588s git-debrebase = Packaging {"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Type" => "Packaging","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Msg" => "WIP\n","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0,"Differs" => 32}]} 1588s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1588s git-debrebase ** Unknown 1588s git-debrebase *** WALK BOMB unrecognised 1588s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1588s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1588s 1588s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 1588s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1588s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1588s + local 'ps=255 0' 1588s + set -o pipefail 1588s + case $ps in 1588s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1588s + local 'mpat=E:found unprocessable commit.*origin commit' 1588s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1588s + local grepper=fgrep 1588s + case "$mpat" in 1588s + case "$mpat" in 1588s + grepper=egrep 1588s + mpat='found unprocessable commit.*origin commit' 1588s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1588s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 1588s + subcmd quick 1588s + cmd=("$@") 1588s + branch merge 'general two-parent merge' 1588s + branch=merge 1588s + git checkout gdr-unprocessable/merge 1588s Switched to branch 'gdr-unprocessable/merge' 1588s + msgcore='general two-parent merge' 1588s + expected- 1588s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 1588s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 1588s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1588s + shift 1588s + set +o pipefail 1588s + LC_MESSAGES=C 1588s + LANGUAGE=C 1588s + cmd 1588s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1588s + t-git-debrebase quick 1588s + local gdr=git-debrebase 1588s + : ' 1588s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1588s + git-debrebase --dgit=dgit -D quick 1589s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 1589s git-debrebase ffq check_specs * 1589s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 0 - 1589s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1589s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1589s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1589s git-debrebase ** Unknown 1589s git-debrebase *** WALK BOMB unrecognised 1589s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1589s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 1589s 1589s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 1589s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1589s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1589s + local 'ps=255 0' 1589s + set -o pipefail 1589s + case $ps in 1589s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1589s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local grepper=fgrep 1589s + case "$mpat" in 1589s + case "$mpat" in 1589s + grepper=egrep 1589s + mpat='found unprocessable commit.*general two-parent merge' 1589s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 1589s + branch origin 'origin commit' 1589s + branch=origin 1589s + git checkout gdr-unprocessable/origin 1589s Switched to branch 'gdr-unprocessable/origin' 1589s + msgcore='origin commit' 1589s + expected- 1589s ++ printf 'found unprocessable commit.*%s' 'origin commit' 1589s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 1589s + local 'mpat=E:found unprocessable commit.*origin commit' 1589s + shift 1589s + set +o pipefail 1589s + LC_MESSAGES=C 1589s + LANGUAGE=C 1589s + cmd 1589s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + t-git-debrebase quick 1589s + local gdr=git-debrebase 1589s + : ' 1589s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1589s + git-debrebase --dgit=dgit -D quick 1589s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1589s git-debrebase ffq check_specs * 1589s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 1589s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1589s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1589s git-debrebase = AddPatches {"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Type" => "AddPatches","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0}]} 1589s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1589s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1589s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1589s git-debrebase = Pseudomerge {"Msg" => "Merge branch 'upstream' into quilt-tip\n","Contributor" => {"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0},"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Type" => "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" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 1589s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1589s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1589s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 1589s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1589s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1589s git-debrebase = Mixed {"Type" => "Mixed","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","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"} 1589s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1589s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1589s git-debrebase = Packaging {"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}],"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Type" => "Packaging","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Msg" => "echo EXAMPLE RULES TARGET\n"} 1589s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1589s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1589s git-debrebase = Packaging {"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"Msg" => "WIP\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Type" => "Packaging"} 1589s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1589s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1589s git-debrebase = Packaging {"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Msg" => "WIP\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Type" => "Packaging"} 1589s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1589s git-debrebase ** Unknown 1589s git-debrebase *** WALK BOMB unrecognised 1589s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1589s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1589s 1589s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 1589s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1589s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1589s + local 'ps=255 0' 1589s + set -o pipefail 1589s + case $ps in 1589s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local 'mpat=E:found unprocessable commit.*origin commit' 1589s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local grepper=fgrep 1589s + case "$mpat" in 1589s + case "$mpat" in 1589s + grepper=egrep 1589s + mpat='found unprocessable commit.*origin commit' 1589s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 1589s + subcmd new-upstream 2.0 upstream/2.0 1589s + cmd=("$@") 1589s + branch merge 'general two-parent merge' 1589s + branch=merge 1589s + git checkout gdr-unprocessable/merge 1589s Switched to branch 'gdr-unprocessable/merge' 1589s + msgcore='general two-parent merge' 1589s + expected- 1589s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 1589s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 1589s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1589s + shift 1589s + set +o pipefail 1589s + LC_MESSAGES=C 1589s + LANGUAGE=C 1589s + cmd 1589s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + t-git-debrebase new-upstream 2.0 upstream/2.0 1589s + local gdr=git-debrebase 1589s + : ' 1589s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1589s + git-debrebase --dgit=dgit -D new-upstream 2.0 upstream/2.0 1589s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 1589s git-debrebase ffq check_specs * 1589s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 0 - 1589s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1589s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1589s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1589s git-debrebase ** Unknown 1589s git-debrebase *** WALK BOMB unrecognised 1589s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1589s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 1589s 1589s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 1589s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1589s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1589s + local 'ps=255 0' 1589s + set -o pipefail 1589s + case $ps in 1589s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1589s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local grepper=fgrep 1589s + case "$mpat" in 1589s + case "$mpat" in 1589s + grepper=egrep 1589s + mpat='found unprocessable commit.*general two-parent merge' 1589s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 1589s + branch origin 'origin commit' 1589s + branch=origin 1589s + git checkout gdr-unprocessable/origin 1589s Switched to branch 'gdr-unprocessable/origin' 1589s + msgcore='origin commit' 1589s + expected- 1589s ++ printf 'found unprocessable commit.*%s' 'origin commit' 1589s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 1589s + local 'mpat=E:found unprocessable commit.*origin commit' 1589s + shift 1589s + set +o pipefail 1589s + LC_MESSAGES=C 1589s + LANGUAGE=C 1589s + cmd 1589s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + t-git-debrebase new-upstream 2.0 upstream/2.0 1589s + local gdr=git-debrebase 1589s + : ' 1589s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1589s + git-debrebase --dgit=dgit -D new-upstream 2.0 upstream/2.0 1589s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1589s git-debrebase ffq check_specs * 1589s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 1589s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1589s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1589s git-debrebase = AddPatches {"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Type" => "AddPatches","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}]} 1589s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1589s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1589s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1589s git-debrebase = Pseudomerge {"Parents" => [{"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0,"Differs" => 0},{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Ix" => 1,"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","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]],"Msg" => "Merge branch 'upstream' into quilt-tip\n"} 1589s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1589s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1589s git-debrebase = Upstream {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n","Type" => "Upstream","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}]} 1589s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1589s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1589s git-debrebase = Mixed {"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Type" => "Mixed","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Parents" => [{"Ix" => 0,"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}]} 1589s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1589s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1589s git-debrebase = Packaging {"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Type" => "Packaging","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Msg" => "echo EXAMPLE RULES TARGET\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}]} 1589s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1589s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1589s git-debrebase = Packaging {"Msg" => "WIP\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Type" => "Packaging","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32,"Ix" => 0}]} 1589s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1589s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1589s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}],"Type" => "Packaging","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Msg" => "WIP\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"} 1589s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1589s git-debrebase ** Unknown 1589s git-debrebase *** WALK BOMB unrecognised 1589s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1589s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1589s 1589s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 1589s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1589s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1589s + local 'ps=255 0' 1589s + set -o pipefail 1589s + case $ps in 1589s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local 'mpat=E:found unprocessable commit.*origin commit' 1589s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local grepper=fgrep 1589s + case "$mpat" in 1589s + case "$mpat" in 1589s + grepper=egrep 1589s + mpat='found unprocessable commit.*origin commit' 1589s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 1589s + subcmd make-patches 1589s + cmd=("$@") 1589s + branch merge 'general two-parent merge' 1589s + branch=merge 1589s + git checkout gdr-unprocessable/merge 1589s Switched to branch 'gdr-unprocessable/merge' 1589s + msgcore='general two-parent merge' 1589s + expected- 1589s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 1589s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 1589s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1589s + shift 1589s + set +o pipefail 1589s + LC_MESSAGES=C 1589s + LANGUAGE=C 1589s + cmd 1589s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + t-git-debrebase make-patches 1589s + local gdr=git-debrebase 1589s + : ' 1589s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1589s + git-debrebase --dgit=dgit -D make-patches 1589s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1589s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1589s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1589s git-debrebase ** Unknown 1589s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1589s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 1589s 1589s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 1589s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1589s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1589s + local 'ps=255 0' 1589s + set -o pipefail 1589s + case $ps in 1589s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1589s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local grepper=fgrep 1589s + case "$mpat" in 1589s + case "$mpat" in 1589s + grepper=egrep 1589s + mpat='found unprocessable commit.*general two-parent merge' 1589s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 1589s + branch origin 'origin commit' 1589s + branch=origin 1589s + git checkout gdr-unprocessable/origin 1589s Switched to branch 'gdr-unprocessable/origin' 1589s + msgcore='origin commit' 1589s + expected- 1589s ++ printf 'found unprocessable commit.*%s' 'origin commit' 1589s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 1589s + local 'mpat=E:found unprocessable commit.*origin commit' 1589s + shift 1589s + set +o pipefail 1589s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + LC_MESSAGES=C 1589s + LANGUAGE=C 1589s + cmd 1589s + t-git-debrebase make-patches 1589s + local gdr=git-debrebase 1589s + : ' 1589s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1589s + git-debrebase --dgit=dgit -D make-patches 1589s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1589s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1589s git-debrebase = AddPatches {"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","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","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0,"Differs" => 4}]} 1589s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1589s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1589s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1589s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Parents" => [{"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0},{"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","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","Msg" => "Merge branch 'upstream' into quilt-tip\n"} 1589s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1589s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1589s git-debrebase = Upstream {"Msg" => "Add *.o to .gitignore\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"Type" => "Upstream","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"} 1589s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1589s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1589s git-debrebase = Mixed {"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","Ix" => 0,"Differs" => 50}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"} 1589s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (ccfa28ce24478c3336e77e709106a16a158ac7eb) 1589s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1589s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1589s git-debrebase = Packaging {"Msg" => "echo EXAMPLE RULES TARGET\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}],"Type" => "Packaging","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"} 1589s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1589s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1589s git-debrebase = Packaging {"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Type" => "Packaging","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n"} 1589s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1589s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1589s git-debrebase = Packaging {"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Msg" => "WIP\n","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Type" => "Packaging"} 1589s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1589s git-debrebase ** Unknown 1589s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1589s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1589s 1589s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 1589s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1589s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1589s + local 'ps=255 0' 1589s + set -o pipefail 1589s + case $ps in 1589s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local 'mpat=E:found unprocessable commit.*origin commit' 1589s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + local grepper=fgrep 1589s + case "$mpat" in 1589s + case "$mpat" in 1589s + grepper=egrep 1589s + mpat='found unprocessable commit.*origin commit' 1589s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 1589s + subcmd breakwater 1589s + cmd=("$@") 1589s + branch merge 'general two-parent merge' 1589s + branch=merge 1589s + git checkout gdr-unprocessable/merge 1589s Switched to branch 'gdr-unprocessable/merge' 1589s + msgcore='general two-parent merge' 1589s + expected- 1589s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 1589s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 1589s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1589s + shift 1589s + set +o pipefail 1589s + LC_MESSAGES=C 1589s + LANGUAGE=C 1589s + cmd 1589s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1589s + t-git-debrebase breakwater 1589s + local gdr=git-debrebase 1589s + : ' 1589s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1589s + git-debrebase --dgit=dgit -D breakwater 1590s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1590s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1590s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1590s git-debrebase ** Unknown 1590s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1590s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 1590s 1590s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 1590s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1590s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1590s + local 'ps=255 0' 1590s + set -o pipefail 1590s + case $ps in 1590s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1590s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + local grepper=fgrep 1590s + case "$mpat" in 1590s + case "$mpat" in 1590s + grepper=egrep 1590s + mpat='found unprocessable commit.*general two-parent merge' 1590s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 1590s + branch origin 'origin commit' 1590s + branch=origin 1590s + git checkout gdr-unprocessable/origin 1590s Switched to branch 'gdr-unprocessable/origin' 1590s + msgcore='origin commit' 1590s + expected- 1590s ++ printf 'found unprocessable commit.*%s' 'origin commit' 1590s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 1590s + local 'mpat=E:found unprocessable commit.*origin commit' 1590s + shift 1590s + set +o pipefail 1590s + LC_MESSAGES=C 1590s + LANGUAGE=C 1590s + cmd 1590s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + t-git-debrebase breakwater 1590s + local gdr=git-debrebase 1590s + : ' 1590s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1590s + git-debrebase --dgit=dgit -D breakwater 1590s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1590s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1590s git-debrebase = AddPatches {"Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0,"Differs" => 4}]} 1590s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1590s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1590s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1590s git-debrebase = Pseudomerge {"Overwritten" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"Contributor" => {"Differs" => 0,"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},"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","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"} 1590s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1590s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1590s git-debrebase = Upstream {"Msg" => "Add *.o to .gitignore\n","Type" => "Upstream","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 1590s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1590s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1590s 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","Type" => "Mixed","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Parents" => [{"Differs" => 50,"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}]} 1590s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1590s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1590s 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","Type" => "Packaging","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}]} 1590s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1590s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1590s git-debrebase = Packaging {"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Msg" => "WIP\n","Type" => "Packaging"} 1590s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1590s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1590s git-debrebase = Packaging {"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Type" => "Packaging","Msg" => "WIP\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Parents" => [{"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32}]} 1590s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1590s git-debrebase ** Unknown 1590s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1590s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1590s 1590s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 1590s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1590s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1590s + local 'ps=255 0' 1590s + set -o pipefail 1590s + case $ps in 1590s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + local 'mpat=E:found unprocessable commit.*origin commit' 1590s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + local grepper=fgrep 1590s + case "$mpat" in 1590s + case "$mpat" in 1590s + grepper=egrep 1590s + mpat='found unprocessable commit.*origin commit' 1590s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 1590s + subcmd anchor 1590s + cmd=("$@") 1590s + branch merge 'general two-parent merge' 1590s + branch=merge 1590s + git checkout gdr-unprocessable/merge 1590s Switched to branch 'gdr-unprocessable/merge' 1590s + msgcore='general two-parent merge' 1590s + expected- 1590s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 1590s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 1590s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1590s + shift 1590s + set +o pipefail 1590s + LC_MESSAGES=C 1590s + LANGUAGE=C 1590s + cmd 1590s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + t-git-debrebase anchor 1590s + local gdr=git-debrebase 1590s + : ' 1590s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1590s + git-debrebase --dgit=dgit -D anchor 1590s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1590s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1590s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1590s git-debrebase ** Unknown 1590s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1590s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 1590s 1590s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 1590s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1590s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1590s + local 'ps=255 0' 1590s + set -o pipefail 1590s + case $ps in 1590s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 1590s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + local grepper=fgrep 1590s + case "$mpat" in 1590s + case "$mpat" in 1590s + grepper=egrep 1590s + mpat='found unprocessable commit.*general two-parent merge' 1590s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 1590s + branch origin 'origin commit' 1590s + branch=origin 1590s + git checkout gdr-unprocessable/origin 1590s Switched to branch 'gdr-unprocessable/origin' 1590s + msgcore='origin commit' 1590s + expected- 1590s ++ printf 'found unprocessable commit.*%s' 'origin commit' 1590s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 1590s + local 'mpat=E:found unprocessable commit.*origin commit' 1590s + shift 1590s + set +o pipefail 1590s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + LC_MESSAGES=C 1590s + LANGUAGE=C 1590s + cmd 1590s + t-git-debrebase anchor 1590s + local gdr=git-debrebase 1590s + : ' 1590s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1590s + git-debrebase --dgit=dgit -D anchor 1590s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1590s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1590s git-debrebase = AddPatches {"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Type" => "AddPatches","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445"} 1590s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1590s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1590s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1590s git-debrebase = Pseudomerge {"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Msg" => "Merge branch 'upstream' into quilt-tip\n","Contributor" => {"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0},"Parents" => [$VAR1->{"Contributor"},{"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48}],"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","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","Type" => "Pseudomerge"} 1590s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1590s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1590s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Parents" => [{"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0}],"Msg" => "Add *.o to .gitignore\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 1590s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1590s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1590s git-debrebase = Mixed {"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Type" => "Mixed","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Parents" => [{"Ix" => 0,"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}]} 1590s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1590s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1590s git-debrebase = Packaging {"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0}],"Msg" => "echo EXAMPLE RULES TARGET\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165"} 1590s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1590s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1590s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32,"Ix" => 0}],"Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 1590s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1590s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1590s git-debrebase = Packaging {"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Type" => "Packaging","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Msg" => "WIP\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056"} 1590s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1590s git-debrebase ** Unknown 1590s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1590s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1590s 1590s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 1590s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1590s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1590s + local 'ps=255 0' 1590s + set -o pipefail 1590s + case $ps in 1590s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + local 'mpat=E:found unprocessable commit.*origin commit' 1590s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s + local grepper=fgrep 1590s + case "$mpat" in 1590s + case "$mpat" in 1590s + grepper=egrep 1590s + mpat='found unprocessable commit.*origin commit' 1590s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1590s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 1590s + expected=ok 1590s + mfmts=(' Unprocessable (%s)') 1590s + subcmd analyse 1590s + cmd=("$@") 1590s + branch merge 'general two-parent merge' 1590s + branch=merge 1590s + git checkout gdr-unprocessable/merge 1590s Switched to branch 'gdr-unprocessable/merge' 1590s + msgcore='general two-parent merge' 1590s + expected-ok 1590s + f=../out.merge.analyse 1590s + tee ../out.merge.analyse 1590s + cmd 1590s + t-git-debrebase analyse 1590s + local gdr=git-debrebase 1590s + : ' 1590s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1590s + git-debrebase --dgit=dgit -D analyse 1590s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 1590s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1590s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1590s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1590s git-debrebase ** Unknown 1590s de5adc8d36110abf62d562d9a1985a4796748ece Unknowngit-debrebase *** WALK BOMB unrecognised 1590s Unprocessable (general two-parent merge) 1590s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1590s ' 1590s + for mfmt in "${mfmts[@]}" 1590s ++ printf ' Unprocessable (%s)' 'general two-parent merge' 1590s + grep ' Unprocessable (general two-parent merge)' ../out.merge.analyse 1590s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 1590s + branch origin 'origin commit' 1590s + branch=origin 1590s + git checkout gdr-unprocessable/origin 1590s Switched to branch 'gdr-unprocessable/origin' 1590s + msgcore='origin commit' 1590s + expected-ok 1590s + f=../out.origin.analyse 1590s + cmd 1590s + t-git-debrebase analyse 1590s + local gdr=git-debrebase 1590s + : ' 1590s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1590s + git-debrebase --dgit=dgit -D analyse 1590s + tee ../out.origin.analyse 1590s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 1590s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1590s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1590s git-debrebase = AddPatches {"Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Differs" => 4,"Ix" => 0}],"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e"} 1590s 3bc5395fa4571258183be3d3f389950314c53d4e AddPatchesgit-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1590s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1590s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1590s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},"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" => [{"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48}],"Msg" => "Merge branch 'upstream' into quilt-tip\n","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 1590s 1590s 901ede7c64dd2ca1f1375724351a1aed46807f79 Pseudomerge Contributor=1986506b09aedf1864a4e3228284a58c3db6ac7agit-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1590s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1590s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Parents" => [{"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Msg" => "Add *.o to .gitignore\n"} 1590s 1590s 1986506b09aedf1864a4e3228284a58c3db6ac7a Upstreamgit-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1590s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1590s git-debrebase = Mixed {"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","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}],"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"} 1590s 1590s ccfa28ce24478c3336e77e709106a16a158ac7eb Mixedgit-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1590s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1590s git-debrebase = Packaging {"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}],"Msg" => "echo EXAMPLE RULES TARGET\n","Type" => "Packaging","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n"} 1590s 1590s 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 Packaginggit-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1590s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1590s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32,"Ix" => 0}],"Msg" => "WIP\n"} 1590s 1590s a26f8e83ba01707d830f942dc143a46140a87643 Packaginggit-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1590s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1590s git-debrebase = Packaging {"Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32,"Ix" => 0}],"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Msg" => "WIP\n","Type" => "Packaging","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n"} 1590s 1590s 4d8f0e7980e2454b960fbd44cf76d11996098caa Packaginggit-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1590s git-debrebase ** Unknown 1590s git-debrebase *** WALK BOMB unrecognised 1590s 1590s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1590s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1590s ' 1590s + for mfmt in "${mfmts[@]}" 1590s ++ printf ' Unprocessable (%s)' 'origin commit' 1590s + grep ' Unprocessable (origin commit)' ../out.origin.analyse 1590s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1590s + mfmts=('branch not in git-debrebase form' 'found unprocessable commit, cannot cope: %s') 1590s + subcmd status 1590s + cmd=("$@") 1590s + branch merge 'general two-parent merge' 1590s + branch=merge 1590s + git checkout gdr-unprocessable/merge 1590s Switched to branch 'gdr-unprocessable/merge' 1590s + msgcore='general two-parent merge' 1590s + expected-ok 1590s + f=../out.merge.status 1590s + cmd 1590s + t-git-debrebase status 1590s + local gdr=git-debrebase 1590s + : ' 1590s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1590s + git-debrebase --dgit=dgit -D status 1590s + tee ../out.merge.status 1591s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1591s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1591s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1591s git-debrebase ** Unknown 1591s current branch contents, in git-debrebase terms: 1591s branch not in git-debrebase form 1591s found unprocessable commit, cannot cope: general two-parent merge 1591s de5adc8 Update upstream source from tag 'upstream/2.0' 1591s key git-debrebase commits: 1591s anchor is not well-defined 1591s breakwater is not well-defined 1591s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 1591s branch and ref status, in git-debrebase terms: 1591s stitched? (no record of git-debrebase work) 1591s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1591s ' 1591s + for mfmt in "${mfmts[@]}" 1591s ++ printf 'branch not in git-debrebase form' 'general two-parent merge' 1591s + grep 'branch not in git-debrebase form' ../out.merge.status 1591s branch not in git-debrebase form 1591s + for mfmt in "${mfmts[@]}" 1591s ++ printf 'found unprocessable commit, cannot cope: %s' 'general two-parent merge' 1591s + grep 'found unprocessable commit, cannot cope: general two-parent merge' ../out.merge.status 1591s found unprocessable commit, cannot cope: general two-parent merge 1591s + branch origin 'origin commit' 1591s + branch=origin 1591s + git checkout gdr-unprocessable/origin 1591s Switched to branch 'gdr-unprocessable/origin' 1591s + msgcore='origin commit' 1591s + expected-ok 1591s + f=../out.origin.status 1591s + cmd 1591s + t-git-debrebase status 1591s + local gdr=git-debrebase 1591s + : ' 1591s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1591s + git-debrebase --dgit=dgit -D status 1591s + tee ../out.origin.status 1591s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1591s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1591s git-debrebase = AddPatches {"Parents" => [{"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Differs" => 4}],"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","Type" => "AddPatches","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445"} 1591s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1591s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1591s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1591s 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","Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},"Type" => "Pseudomerge","Overwritten" => [{"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48}],"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 1591s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1591s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1591s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Msg" => "Add *.o to .gitignore\n","Parents" => [{"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0}],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"} 1591s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1591s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1591s git-debrebase = Mixed {"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Type" => "Mixed","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Parents" => [{"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Ix" => 0}],"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n"} 1591s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1591s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1591s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}],"Msg" => "echo EXAMPLE RULES TARGET\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Type" => "Packaging","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165"} 1591s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1591s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1591s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"Msg" => "WIP\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Type" => "Packaging","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 1591s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1591s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1591s git-debrebase = Packaging {"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Type" => "Packaging","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Msg" => "WIP\n","Parents" => [{"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32}]} 1591s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1591s git-debrebase ** Unknown 1591s current branch contents, in git-debrebase terms: 1591s branch not in git-debrebase form 1591s found unprocessable commit, cannot cope: origin commit 1591s 2767dfd WIP 1591s key git-debrebase commits: 1591s anchor is not well-defined 1591s breakwater is not well-defined 1591s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1591s branch and ref status, in git-debrebase terms: 1591s stitched? (no record of git-debrebase work) 1591s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1591s ' 1591s + for mfmt in "${mfmts[@]}" 1591s ++ printf 'branch not in git-debrebase form' 'origin commit' 1591s + grep 'branch not in git-debrebase form' ../out.origin.status 1591s branch not in git-debrebase form 1591s + for mfmt in "${mfmts[@]}" 1591s ++ printf 'found unprocessable commit, cannot cope: %s' 'origin commit' 1591s + grep 'found unprocessable commit, cannot cope: origin commit' ../out.origin.status 1591s found unprocessable commit, cannot cope: origin commit 1591s + t-ok 1591s + : ======================================== 1591s + t-check-only-bpd 1591s + '[' .. = .. ']' 1591s + return 1591s + t-fscks 1591s + shopt -s nullglob 1591s + for d in $tmp/*/.git $tmp/git/*.git 1591s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1591s + t-git-fsck 1591s ++ git rev-parse --git-dir 1591s + local fsckerrs=.git/dgit-test-fsck.errs 1591s + set +e 1591s + LC_MESSAGES=C 1591s + git fsck --no-dangling --strict 1591s + tee .git/dgit-test-fsck.errs 1591s + ps='0 0' 1591s + set -e 1591s + local pats 1591s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1591s + test '0 0' = '0 0' 1591s + pats+=(-e 'notice: HEAD points to an unborn branch') 1591s + pats+=(-e 'notice: No default references') 1591s + set +e 1591s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1591s + rc=1 1591s + set -e 1591s + case $rc in 1591s + for d in $tmp/*/.git $tmp/git/*.git 1591s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1591s + t-git-fsck 1591s ++ git rev-parse --git-dir 1591s + local fsckerrs=./dgit-test-fsck.errs 1591s + set +e 1591s + LC_MESSAGES=C 1591s + git fsck --no-dangling --strict 1591s + tee ./dgit-test-fsck.errs 1591s notice: HEAD points to an unborn branch (master) 1591s + ps='0 0' 1591s + set -e 1591s + local pats 1591s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1591s + test '0 0' = '0 0' 1591s + pats+=(-e 'notice: HEAD points to an unborn branch') 1591s + pats+=(-e 'notice: No default references') 1591s + set +e 1591s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1591s + rc=1 1591s + set -e 1591s + case $rc in 1591s + t-save-artifacts 1591s + artifacts=/tmp/autopkgtest.XK8uun/gdr-unprocessable-artifacts 1591s + '[' x/tmp/autopkgtest.XK8uun/gdr-unprocessable-artifacts = x ']' 1591s + '[' xtmp = x ']' 1591s + GZIP=-1v 1591s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-unprocessable-artifacts/gdr-unprocessable.tar.gz '--exclude=*.tar' . 1591s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1591s 80.5% 1591s + echo ok. 1591s ok. 1591s + rc=0 1591s + set +x 1591s + set +e 1591s + pwd 1591s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1591s + '[' x '!=' x ']' 1591s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1591s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1591s + set -e 1591s + test 0 = 0 1591s autopkgtest [23:13:41]: test gdr-unprocessable: -----------------------] 1592s gdr-unprocessable PASS 1592s autopkgtest [23:13:42]: test gdr-unprocessable: - - - - - - - - - - results - - - - - - - - - - 1592s autopkgtest [23:13:42]: test gdr-unprocessable-hints: preparing testbed 1592s Reading package lists... 1592s Building dependency tree... 1592s Reading state information... 1593s Starting pkgProblemResolver with broken count: 0 1593s Starting 2 pkgProblemResolver with broken count: 0 1593s Done 1593s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1594s autopkgtest [23:13:44]: test gdr-unprocessable-hints: [----------------------- 1594s ++ set -o pipefail 1594s ++ . tests/lib-core 1594s ++ . tests/lib-restricts 1594s ++ trap ' 1594s rc=$? 1594s set +x 1594s test $rc = 0 || echo " 1594s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1594s 1594s Most relevant logs are just before assignment rc=$rc 1594s Will now do cleanup etc. 1594s " 1594s set -x 1594s set +e 1594s pwd 1594s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1594s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1594s set -e 1594s test $rc = 0 || t-report-failure 1594s ' EXIT 1594s ++ t-filter-out-git-hyphen-dir 1594s ++ local pathent 1594s +++ type -p git-rev-parse 1594s +++ : 1594s ++ pathent= 1594s ++ case "$pathent" in 1594s ++ return 1594s ++ t-set-intree 1594s ++ '[' x = x ']' 1594s ++ return 1594s ++ : -D 1594s ++ export DGIT_TEST_DEBUG 1594s ++ : x 1594s ++ export DGIT_TEST_DEBPUSH_DEBUG 1594s ++ : 1594s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1594s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1594s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1594s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1594s ++ export LC_CTYPE=C.UTF-8 1594s ++ LC_CTYPE=C.UTF-8 1594s ++ unset CDPATH 1594s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1594s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1594s +++ pwd 1594s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1594s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1594s ++ testname=gdr-unprocessable-hints 1594s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1594s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1594s ++ bpd=.. 1594s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1594s ++ '[' x '!=' x ']' 1594s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s +++ pwd 1594s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ t-set-using-tmp 1594s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1594s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1594s ++ export 'DEBFULLNAME=dgit test git user' 1594s ++ DEBFULLNAME='dgit test git user' 1594s ++ git config --global user.email dgit-test@debian.example.net 1594s ++ git config --global user.name 'dgit test git user' 1594s ++ git config --global protocol.ext.allow always 1594s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1594s ++ env -0 1594s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1594s ++ export DEBCHANGE_VENDOR=dpkg 1594s ++ DEBCHANGE_VENDOR=dpkg 1594s ++ unset VISUAL 1594s ++ unset GIT_EDITOR 1594s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1594s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1594s ++ cat 1594s ++ schroot=build 1594s ++ : aq 1594s ++ : archive/test-dummy 1594s ++ : sid:unstable 1594s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1594s ++ git config --global dgit.default.old-dsc-distro test-dummy 1594s ++ for import in ${autoimport-gnupg} 1594s ++ case "$0" in 1594s ++ t-setup-import gnupg 1594s ++ local setupname=gnupg 1594s ++ local setupsrc 1594s ++ local lock 1594s ++ '[' x = x ']' 1594s ++ setupsrc=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ lock=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock 1594s ++ local simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1594s ++ '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1594s ++ with-lock-ex -w /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env bash -xec ' 1594s cd "$1"; shift 1594s setupname="$1"; shift 1594s simport="$1"; shift 1594s if [ -e "$simport" ]; then exit 0; fi 1594s env - "$@" \ 1594s "tests/setup/$setupname" 1594s ' x /tmp/autopkgtest.XK8uun/build.980/src gnupg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1594s + cd /tmp/autopkgtest.XK8uun/build.980/src 1594s + shift 1594s + setupname=gnupg 1594s + shift 1594s + simport=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg 1594s + shift 1594s + '[' -e /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gnupg ']' 1594s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=ppc64el 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.XK8uun/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.XK8uun/wrapper.sh --artifacts=/tmp/autopkgtest.XK8uun/gdr-unprocessable-hints-artifacts --chdir=/tmp/autopkgtest.XK8uun/build.980/src --env=AUTOPKGTEST_TESTBED_ARCH=ppc64el --env=AUTOPKGTEST_TEST_ARCH=ppc64el --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.XK8uun/gdr-unprocessable-hints-stderr --stdout=/tmp/autopkgtest.XK8uun/gdr-unprocessable-hints-stdout --tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-unprocessable-hints -- /tmp/autopkgtest.XK8uun/build.980/src/tests/tests/gdr-unprocessable-hints' GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.XK8uun/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.XK8uun/gdr-unprocessable-hints-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=ppc64el DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.XK8uun/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.XK8uun/build.980/src _=/usr/bin/env tests/setup/gnupg 1594s ++ set -o pipefail 1594s ++ . tests/lib-core 1594s ++ . tests/lib-restricts 1594s ++ trap ' 1594s rc=$? 1594s set +x 1594s test $rc = 0 || echo " 1594s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1594s 1594s Most relevant logs are just before assignment rc=$rc 1594s Will now do cleanup etc. 1594s " 1594s set -x 1594s set +e 1594s pwd 1594s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1594s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1594s set -e 1594s test $rc = 0 || t-report-failure 1594s ' EXIT 1594s ++ t-filter-out-git-hyphen-dir 1594s ++ local pathent 1594s +++ type -p git-rev-parse 1594s +++ : 1594s ++ pathent= 1594s ++ case "$pathent" in 1594s ++ return 1594s ++ t-set-intree 1594s ++ '[' x = x ']' 1594s ++ return 1594s ++ : -D 1594s ++ export DGIT_TEST_DEBUG 1594s ++ : x 1594s ++ export DGIT_TEST_DEBPUSH_DEBUG 1594s ++ : 1594s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1594s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1594s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1594s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1594s ++ export LC_CTYPE=C.UTF-8 1594s ++ LC_CTYPE=C.UTF-8 1594s ++ unset CDPATH 1594s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1594s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1594s +++ pwd 1594s ++ root=/tmp/autopkgtest.XK8uun/build.980/src 1594s ++ troot=/tmp/autopkgtest.XK8uun/build.980/src/tests 1594s ++ testname=gnupg 1594s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1594s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.XK8uun/build.980/src/tests 1594s ++ bpd=.. 1594s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1594s ++ '[' x '!=' x ']' 1594s ++ cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s +++ pwd 1594s ++ tmp=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ t-set-using-tmp 1594s ++ export HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ HOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ DGIT_TEST_TMP=/tmp/autopkgtest.XK8uun/autopkgtest_tmp 1594s ++ export GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1594s ++ GNUPGHOME=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/nonexistent 1594s ++ export 'DEBFULLNAME=dgit test git user' 1594s ++ DEBFULLNAME='dgit test git user' 1594s ++ git config --global user.email dgit-test@debian.example.net 1594s ++ git config --global user.name 'dgit test git user' 1594s ++ git config --global protocol.ext.allow always 1594s ++ test -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/.save-env 1594s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/ssh ssh 1594s ++ export DEBCHANGE_VENDOR=dpkg 1594s ++ DEBCHANGE_VENDOR=dpkg 1594s ++ unset VISUAL 1594s ++ unset GIT_EDITOR 1594s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1594s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming 1594s ++ cat 1594s ++ schroot=build 1594s ++ : aq 1594s ++ : archive/test-dummy 1594s ++ : sid:unstable 1594s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1594s ++ git config --global dgit.default.old-dsc-distro test-dummy 1594s ++ for import in ${autoimport-gnupg} 1594s ++ case "$0" in 1594s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1594s + cp /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/dm.txt /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/random_seed /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/build.980/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg 1594s + chmod go-rw /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/trustdb.gpg 1594s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1594s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg/dgit-test-global-lock 1594s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1594s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg-workarounds.log 1594s + setup=' 1594s export GNUPGHOME=$tmp/gnupg 1594s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1594s 1594s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 1594s ssb rsa2048 2013-11-17 [E] 1594s 1594s sec rsa2048 2014-01-26 [SC] 1594s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 1594s uid [ultimate] Populus Romanus (test key) 1594s ssb rsa2048 2014-01-26 [E] 1594s 1594s sec rsa2048 2014-01-26 [SC] 1594s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 1594s uid [ unknown] Hannibal (test key) 1594s ssb rsa2048 2014-01-26 [E] 1594s 1594s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 1594s export GNUPGHOME=$tmp/gnupg 1594s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 1594s 1594s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 1595s delete mode 100644 debian/source/format 1595s + git tag v1.0 1595s + : 'fake up that our quilt-tip was descended from upstream' 1595s + git checkout quilt-tip 1595s Switched to branch 'quilt-tip' 1595s + git merge --no-edit -s ours upstream 1595s Merge made by the 'ours' strategy. 1595s + : 'fake up that our quilt-tip had the patch queue in it' 1595s + git checkout patch-queue/quilt-tip 1595s Switched to branch 'patch-queue/quilt-tip' 1595s + gbp pq export 1595s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1595s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1595s + git add debian/patches 1595s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 1595s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 1595s 4 files changed, 50 insertions(+) 1595s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1595s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1595s create mode 100644 debian/patches/series 1595s create mode 100644 debian/patches/subdir/addnewups 1595s + : 'make branch names more conventional' 1595s + git branch -D master 1595s Deleted branch master (was 17d67db). 1595s + git branch -m quilt-tip master 1595s + not-gdr-processable origin 1595s + git branch gdr-unprocessable/origin 1595s + t-git-debrebase analyse 1595s + local gdr=git-debrebase 1595s + : ' 1595s + grep 'Unknown Unprocessable' 1595s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1595s + git-debrebase --dgit=dgit -D analyse 1595s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 1595s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1595s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1595s git-debrebase = AddPatches {"Type" => "AddPatches","Parents" => [{"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0}],"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","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"} 1595s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1595s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1595s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1595s git-debrebase = Pseudomerge {"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Parents" => [{"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0},{"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48}],"Type" => "Pseudomerge","Contributor" => $VAR1->{"Parents"}[0],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Overwritten" => [$VAR1->{"Parents"}[1]],"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"} 1595s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1595s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1595s 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","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Type" => "Upstream"} 1595s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1595s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1595s git-debrebase = Mixed {"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","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" => [{"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Ix" => 0}]} 1595s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1595s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1595s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}],"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Type" => "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"} 1595s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1595s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1595s git-debrebase = Packaging {"Msg" => "WIP\n","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"Type" => "Packaging"} 1595s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1595s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1595s git-debrebase = Packaging {"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Msg" => "WIP\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}],"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Type" => "Packaging"} 1595s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1595s git-debrebase ** Unknown 1595s git-debrebase *** WALK BOMB unrecognised 1595s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1595s ' 1595s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1595s + : 'fake up an upstream 2.0' 1595s + git branch make-upstream upstream 1595s + t-make-new-upstream-tarball 2.0 1595s + local uv=2.0 1595s + git checkout make-upstream 1595s Switched to branch 'make-upstream' 1595s + echo 'upstream 2.0' 1595s + git commit -a -m 'upstream 2.0 tarball' 1595s [make-upstream 4db56a8] upstream 2.0 tarball 1595s 1 file changed, 1 insertion(+) 1595s + t-make-orig example 2.0 make-upstream 1595s + local p=example 1595s + local v=2.0 1595s + local tag=make-upstream 1595s + ust=example_2.0.orig.tar.gz 1595s + GZIP=-1 1595s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1595s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1595s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1595s + git branch -D quilt-tip-2 1595s Deleted branch quilt-tip-2 (was 99fcab4). 1595s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1595s + git branch -D gitish-only 1595s Deleted branch gitish-only (was 2b2ddc8). 1595s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1595s + git branch -D quilt-tip-1.1 1595s Deleted branch quilt-tip-1.1 (was 7fc34be). 1595s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1595s + git branch -D patch-queue/quilt-tip 1595s Deleted branch patch-queue/quilt-tip (was d843a68). 1595s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1595s + git branch -D indep-arch 1595s Deleted branch indep-arch (was e215729). 1595s + : 'see what gbp import-orig does' 1595s + git checkout master 1595s Switched to branch 'master' 1595s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1595s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1595s gbp:info: Source package is example 1595s gbp:info: Upstream version is 2.0 1595s gbp:info: Replacing upstream source on 'master' 1595s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1595s + not-gdr-processable merge 1595s + git branch gdr-unprocessable/merge 1595s + t-git-debrebase analyse 1595s + grep 'Unknown Unprocessable' 1595s + local gdr=git-debrebase 1595s + : ' 1595s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1595s + git-debrebase --dgit=dgit -D analyse 1595s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 1595s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1595s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1595s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 1595s git-debrebase ** Unknown 1595s git-debrebase *** WALK BOMB unrecognised 1595s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1595s ' 1595s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 1595s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1595s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1595s + DEBEMAIL=dgit-tests@example.org 1595s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1595s + 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) 1595s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1595s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1595s 1 file changed, 6 insertions(+) 1595s + t-dch-commit-r 1595s + t-dch-r-rune t-dch-commit 1595s + local cmd=t-dch-commit 1595s + shift 1595s + local suite=unstable 1595s + t-dch-commit -r -D unstable '' 1595s + t-debchange -r -D unstable '' 1595s + DEBEMAIL=dgit-tests@example.org 1595s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1595s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1595s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1595s libdistro-info-perl is not installed, Debian release names are not known. 1595s libdistro-info-perl is not installed, Ubuntu release names are not known. 1595s + git commit -m 'dch -r -D unstable ' debian/changelog 1595s [master f31021f] dch -r -D unstable 1595s 1 file changed, 3 insertions(+), 2 deletions(-) 1595s + echo garbage 1595s + git add debian/patches/garbage 1595s + git commit -m 'add garbage' debian/patches/garbage 1595s [master eb10718] add garbage 1595s 1 file changed, 1 insertion(+) 1595s create mode 100644 debian/patches/garbage 1595s + t-archive-none example 1595s + t-select-package example 1595s + p=example 1595s + dgitrepo=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1595s + t-archive-none-aq 1595s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main 1595s + : 1595s + local 'jsondelim=[' 1595s + local suitespec 1595s + for suitespec in $suitespecs 1595s + local suite=sid 1595s + local sname=unstable 1595s + t-aq-archive-updated sid example 1595s + local suite=sid 1595s + local p=example 1595s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1595s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1595s + perl -wne ' 1595s use JSON; 1595s use strict; 1595s our @v; 1595s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1595s push @v, { 1595s "version" => "$1", 1595s "sha256sum" => "$2", 1595s "component" => "$3", 1595s "filename" => "$4", 1595s }; 1595s END { 1595s my $json = JSON->new->canonical(); 1595s print $json->encode(\@v) or die $!; 1595s } 1595s ' 1595s + t-aq-archive-updated new example 1595s + local suite=new 1595s + local p=example 1595s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1595s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/new 1595s + perl -wne ' 1595s use JSON; 1595s use strict; 1595s our @v; 1595s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1595s push @v, { 1595s "version" => "$1", 1595s "sha256sum" => "$2", 1595s "component" => "$3", 1595s "filename" => "$4", 1595s }; 1595s END { 1595s my $json = JSON->new->canonical(); 1595s print $json->encode(\@v) or die $!; 1595s } 1595s ' 1595s + ln -sf sid /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable 1595s + cat 1595s + jsondelim=' },' 1595s + cat 1595s + t-git-none 1595s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1595s + set -e 1595s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git 1595s + tar xf /tmp/autopkgtest.XK8uun/build.980/src/tests/git-template.tar 1595s + t-dgit -wgf --gbp push-source --new 1595s + local dgit=dgit 1595s + pwd 1595s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1595s + : ' 1595s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1595s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 1596s | git rev-parse --show-toplevel 1596s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1596s | git config -z --get-regexp --local '.*' 1596s | git config -z --get-regexp --local '.*' 1596s | git config -z --get-regexp --global '.*' 1596s | git config -z --get-regexp --system '.*' 1596s format 3.0 (quilt), quilt mode gbp 1596s Format `3.0 (quilt)', need to check/update patch stack 1596s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1596s => `' 1596s + git diff --quiet HEAD 1596s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1596s canonical suite name for unstable is sid 1596s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1596s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1596s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1596s | git rev-parse 'HEAD~0' 1596s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1596s | git symbolic-ref -q HEAD 1596s => `refs/heads/master' 1596s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1596s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1596s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1596s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1596s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1596s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - ae2f507cd837bb524a7e239e9a4a6112198cadc3944ce5268ea05e8c4a415b31 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1596s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1596s >(no reflog) 1596s splitbrain cache miss 1596s CD work 1596s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1596s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1596s + git checkout -q -b dgit-view 1596s examining quilt state (multiple patches, gbp mode) 1596s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1596s CD fake 1596s | find -name .git -prune -print0 1596s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1596s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 1596s + git add -Af . 1596s | git write-tree 1596s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 1596s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1596s CD .. 1596s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1596s CD ../fake 1596s + git add -Af . 1596s | git write-tree 1596s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1596s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 1596s CD ../work 1596s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 1596s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 1596s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 1596s => `' 1596s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 1596s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 1596s => `lib.c\x00new-upstream-file\x00src.c\x00' 1596s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1596s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 1596s => `lib.c\x00new-upstream-file\x00src.c\x00' 1596s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 1596s differences @dl == ## ## == == ==. 1596s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 1596s dgit: quilt differences: src: == orig ## gitignores: == orig == 1596s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 1596s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1596s => `1530000000 +0000' 1596s dgit view: creating patches-applied version using gbp pq 1596s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 1596s + git update-ref refs/heads/dgit-view HEAD 1596s + git checkout -q dgit-view 1596s | git rev-parse 'HEAD~0' 1596s => `45ea71a69fa522ce760afdab8a420200443753e9' 1596s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1596s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 1596s => `' 1596s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - ae2f507cd837bb524a7e239e9a4a6112198cadc3944ce5268ea05e8c4a415b31 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 1596s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work 1596s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1596s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1596s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1596s | git rev-parse 'HEAD~0' 1596s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1596s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1596s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1596s dpkg-source: info: using source format '3.0 (quilt)' 1596s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1596s dpkg-source: info: using patch list from debian/patches/series 1596s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 1596s dpkg-source: info: building example in example_2.0-1.dsc 1596s CD work 1596s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1596s package seems new, not specifying -v 1596s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 1597s dpkg-genchanges: info: not including original source code in upload 1597s CD .. 1597s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1597s renaming (Files) example_2.0.orig.tar.gz 1597s renaming (Files) example_2.0-1.debian.tar.xz 1597s renaming (dsc) example_2.0-1.dsc 1597s renaming (changes) example_2.0-1_source.changes 1597s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1597s actually entering push 1597s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1597s => `0' 1597s + git config remote.dgit.skipdefaultupdate true 1597s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1597s get_archive_dsc: nothing in archive, returning undef 1597s no version available from the archive 1597s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1597s => `' 1597s previous reference hash= 1597s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1597s => `' 1597s fetch_from_archive: lastfetch= 1597s nothing found! 1597s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1597s + git check-ref-format archive/test-dummy/2.0-1 1597s | git symbolic-ref -q HEAD 1597s => `refs/heads/master' 1597s | git rev-parse 'HEAD~0' 1597s => `eb10718ab213ccfa83613ebbddefbffda941a548' 1597s ffq_prev_branchinfo branch current refs/heads/master 1597s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1597s => `' 1597s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1597s => `' 1597s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1597s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1597s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 1597s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1597s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 1597s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - ae2f507cd837bb524a7e239e9a4a6112198cadc3944ce5268ea05e8c4a415b31 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 1597s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 1597s CD work 1597s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1597s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 1597s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 1597s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 1597s splitbrain_pseudomerge... 1597s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1597s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1597s => `' 1597s + git diff --quiet HEAD 1597s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 1597s => `' 1597s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1597s checking that example_2.0-1.dsc corresponds to HEAD 1597s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc 1597s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-1.dsc) 1597s dpkg-source: info: extracting example in example-2.0 1597s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1597s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 1597s dpkg-source: info: using patch list from debian/patches/series 1597s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1597s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1597s dpkg-source: info: applying subdir/addnewups 1597s CD example-2.0 1597s | find -name .git -prune -print0 1597s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1597s + git add -Af . 1597s | git write-tree 1597s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 1597s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1597s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1597s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1597s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1597s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 1597s files_compare_inputs example_2.0-1.dsc 1597s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 1597s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1597s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 1597s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 1597s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1597s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 1597s files_compare_inputs example_2.0-1.dsc Files 1597s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 1597s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 1597s files_compare_inputs example_2.0-1_source.changes 1597s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 1597s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 1597s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 1597s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 1597s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 1597s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 1597s files_compare_inputs example_2.0-1_source.changes Files 1597s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 1597s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 1597s checking origs needed (2.0)... 1597s checking origs needed placement 'devel extra'... 1597s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1597s origs example_2.0.orig.tar.gz is_orig 1597s -| sh -ec 'cd "$1"; shift 1597s 1597s find -name "$1" -print0 | 1597s xargs -0r sha256sum 1597s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1597s origs example_2.0.orig.tar.gz $#$have=-1 1597s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1597s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 1597s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1597s push_tagwants: $VAR1 = [ 1597s '2.0-1', 1597s '45ea71a69fa522ce760afdab8a420200443753e9', 1597s 'eb10718ab213ccfa83613ebbddefbffda941a548', 1597s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1597s ]; 1597s $VAR2 = [ 1597s { 1597s 'View' => 'dgit', 1597s 'Tfn' => sub { "DUMMY" }, 1597s 'Tag' => 'archive/test-dummy/2.0-1', 1597s 'TfSuffix' => '', 1597s 'TagFn' => sub { "DUMMY" }, 1597s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9' 1597s }, 1597s { 1597s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 1597s 'Tfn' => sub { "DUMMY" }, 1597s 'Tag' => 'test-dummy/2.0-1', 1597s 'View' => 'maint', 1597s 'TfSuffix' => '-maintview', 1597s 'TagFn' => sub { "DUMMY" } 1597s } 1597s ]; 1597s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1597s => `1530000000 +0000' 1597s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1597s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1597s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1597s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 1597s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1597s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 1597s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1597s => `1c419b2afb1bc71bb96c783f28b76be732cd7b45' 1597s + git verify-tag 1c419b2afb1bc71bb96c783f28b76be732cd7b45 1597s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1597s gpg: Signature made Mon Mar 31 23:13:47 2025 UTC 1597s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1597s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1597s gpg: WARNING: This key is not certified with a trusted signature! 1597s gpg: There is no indication that the signature belongs to the owner. 1597s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1597s + git update-ref refs/tags/archive/test-dummy/2.0-1 1c419b2afb1bc71bb96c783f28b76be732cd7b45 1597s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 1597s => `4e141297c99e961f9fb8e719459a56b2b46c430a' 1597s + git verify-tag 4e141297c99e961f9fb8e719459a56b2b46c430a 1597s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1597s gpg: Signature made Mon Mar 31 23:13:47 2025 UTC 1597s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1597s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1597s gpg: WARNING: This key is not certified with a trusted signature! 1597s gpg: There is no indication that the signature belongs to the owner. 1597s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1597s + git update-ref refs/tags/test-dummy/2.0-1 4e141297c99e961f9fb8e719459a56b2b46c430a 1597s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1597s => `0' 1597s + /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; cp -a _template example.git' 1597s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 1597s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1597s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 1597s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 1597s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 1597s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 1597s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 1597s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1597s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1597s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1597s 1597s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 1597s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1597s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1598s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1598s 1598s Successfully signed dsc, changes files 1598s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 1598s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1598s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1598s D: Setting host argument. 1598s Checking signature on .changes 1598s Checking signature on .dsc 1598s Uploading to test-dummy (via local to localhost): 1598s Successfully uploaded packages. 1598s dgit ok: pushed and uploaded 2.0-1 1598s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1598s del_lrfetchrefs... 1598s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1598s ' 1598s + t-salsa-add-remote 1598s + local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1598s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1598s + set -e 1598s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1598s + git init --bare 1598s hint: Using 'master' as the name for the initial branch. This default branch name 1598s hint: is subject to change. To configure the initial branch name to use in all 1598s hint: of your new repositories, which will suppress this warning, call: 1598s hint: 1598s hint: git config --global init.defaultBranch 1598s hint: 1598s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1598s hint: 'development'. The just-created branch can be renamed via this command: 1598s hint: 1598s hint: git branch -m 1598s Initialized empty Git repository in /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example/ 1598s + git remote add origin /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1598s + git push --set-upstream origin master 1598s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1598s * [new branch] master -> master 1598s Branch 'master' set up to track remote branch 'master' from 'origin'. 1598s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1598s + local 'mpat=E:identical in upstream files' 1598s + shift 1598s + set +o pipefail 1598s + LC_MESSAGES=C 1598s + LANGUAGE=C 1598s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1598s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1598s + local gdr=git-debrebase 1598s + : ' 1598s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1598s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1598s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1598s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 1598s docs/README | 1 + 1598s 1 file changed, 1 insertion(+) 1598s 1598s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1598s git-debrebase: identical in upstream files. See diffstat above, or run 1598s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 1598s + local 'ps=255 0' 1598s + set -o pipefail 1598s + case $ps in 1598s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1598s + local 'mpat=E:identical in upstream files' 1598s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1598s + local grepper=fgrep 1598s + case "$mpat" in 1598s + case "$mpat" in 1598s + grepper=egrep 1598s + mpat='identical in upstream files' 1598s + egrep -e 'identical in upstream files' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1598s git-debrebase: identical in upstream files. See diffstat above, or run 1598s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1598s + local 'mpat=E:Unused patch file garbage will be discarded' 1598s + shift 1598s + set +o pipefail 1598s + LC_MESSAGES=C 1598s + LANGUAGE=C 1598s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1598s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1598s + local gdr=git-debrebase 1598s + : ' 1598s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1598s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1598s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1598s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1598s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1598s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1598s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1598s $VAR2 = bless( do{\(my $o = { 1598s 'allow_pgp' => 1, 1598s 'out_order' => [], 1598s 'name' => 'debian/changelog, entry no.1', 1598s 'is_pgp_signed' => 0, 1598s 'drop_empty' => 0, 1598s 'allow_duplicate' => 0, 1598s 'fields' => { 1598s 'Source' => 'example', 1598s 'Version' => '2.0-1', 1598s 'Distribution' => 'unstable', 1598s 'Urgency' => 'medium', 1598s 'Maintainer' => 'dgit test git user ', 1598s 'Timestamp' => '1530000000', 1598s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1598s 'Changes' => ' 1598s example (2.0-1) unstable; urgency=medium 1598s 1598s [ Ian Jackson ] 1598s * new upstream (did gbp import-orig)' 1598s }, 1598s 'in_order' => [ 1598s 'Source', 1598s 'Version', 1598s 'Distribution', 1598s 'Urgency', 1598s 'Maintainer', 1598s 'Timestamp', 1598s 'Date', 1598s 'Changes' 1598s ], 1598s 'keep_duplicate' => 0 1598s })}, 'Dpkg::Control::Hash' ); 1598s last finished-looking changelog entry: (2.0-1) unstable 1598s will stitch in dgit view, archive/test-dummy/2.0-1 1598s git-debrebase: snags: 1 overriden by individual -f options 1598s 1598s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1598s + local 'ps=255 0' 1598s + set -o pipefail 1598s + case $ps in 1598s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1598s + local 'mpat=E:Unused patch file garbage will be discarded' 1598s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1598s + local grepper=fgrep 1598s + case "$mpat" in 1598s + case "$mpat" in 1598s + grepper=egrep 1598s + mpat='Unused patch file garbage will be discarded' 1598s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1598s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1598s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1598s + local gdr=git-debrebase 1598s + : ' 1598s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1598s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1598s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1598s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 1598s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 1598s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1598s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1598s $VAR2 = bless( do{\(my $o = { 1598s 'in_order' => [ 1598s 'Source', 1598s 'Version', 1598s 'Distribution', 1598s 'Urgency', 1598s 'Maintainer', 1598s 'Timestamp', 1598s 'Date', 1598s 'Changes' 1598s ], 1598s 'allow_pgp' => 1, 1598s 'out_order' => [], 1598s 'is_pgp_signed' => 0, 1598s 'drop_empty' => 0, 1598s 'keep_duplicate' => 0, 1598s 'name' => 'debian/changelog, entry no.1', 1598s 'fields' => { 1598s 'Source' => 'example', 1598s 'Version' => '2.0-1', 1598s 'Distribution' => 'unstable', 1598s 'Urgency' => 'medium', 1598s 'Maintainer' => 'dgit test git user ', 1598s 'Timestamp' => '1530000000', 1598s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1598s 'Changes' => ' 1598s example (2.0-1) unstable; urgency=medium 1598s 1598s [ Ian Jackson ] 1598s * new upstream (did gbp import-orig)' 1598s }, 1598s 'allow_duplicate' => 0 1598s })}, 'Dpkg::Control::Hash' ); 1598s last finished-looking changelog entry: (2.0-1) unstable 1598s will stitch in dgit view, archive/test-dummy/2.0-1 1598s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1599s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1599s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/debrebase/work 1599s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 1599s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1599s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1599s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1599s git-debrebase ffq check_specs * 1599s git-debrebase ffq merge master 1599s git-debrebase ffq check_remote origin remote fetch/merge branch 1599s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1599s OK, you are ahead of refs/remotes/origin/master 1599s git-debrebase ffq check_remote undef remote push branch 1599s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1599s OK, you are ahead of refs/remotes/dgit/dgit/sid 1599s git-debrebase: snags: 2 overriden by individual -f options 1599s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 1599s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 1599s git-debrebase >$ 1599s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 1599s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1599s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1599s ' 1599s + git branch converted-from-gbp 1599s + v=2.0-2 1599s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1599s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1599s + DEBEMAIL=dgit-tests@example.org 1599s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1599s + 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 1599s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1599s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1599s 1 file changed, 6 insertions(+) 1599s + t-dch-commit-r 1599s + t-dch-r-rune t-dch-commit 1599s + local cmd=t-dch-commit 1599s + shift 1599s + local suite=unstable 1599s + t-dch-commit -r -D unstable '' 1599s + t-debchange -r -D unstable '' 1599s + DEBEMAIL=dgit-tests@example.org 1599s + /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/debchange -r -D unstable '' 1599s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1599s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1599s libdistro-info-perl is not installed, Debian release names are not known. 1599s libdistro-info-perl is not installed, Ubuntu release names are not known. 1599s + git commit -m 'dch -r -D unstable ' debian/changelog 1599s [master 4af0243] dch -r -D unstable 1599s 1 file changed, 1 insertion(+), 1 deletion(-) 1599s + t-dgit -wgf push-source --new 1599s + local dgit=dgit 1599s + pwd 1599s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1599s + : ' 1599s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1599s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 1599s | git rev-parse --show-toplevel 1599s => `/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example' 1599s | git config -z --get-regexp --local '.*' 1599s | git config -z --get-regexp --local '.*' 1599s | git config -z --get-regexp --global '.*' 1599s | git config -z --get-regexp --system '.*' 1599s format 3.0 (quilt), quilt mode linear 1599s Format `3.0 (quilt)', need to check/update patch stack 1599s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1599s => `' 1599s + git diff --quiet HEAD 1599s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/suites... 1599s canonical suite name for unstable is sid 1599s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1599s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1599s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1599s | git rev-parse 'HEAD~0' 1599s => `4af0243f9227b0d695fbff38df345aca23969e2e' 1599s | git symbolic-ref -q HEAD 1599s => `refs/heads/master' 1599s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1599s CD work 1599s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1599s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1599s examining quilt state (multiple patches, linear mode) 1599s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 1599s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 1599s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 1599s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 1600s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 1600s | git rev-parse 'HEAD~0' 1600s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1600s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1600s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 1600s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 1600s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 1600s CD fake 1600s | find -name .git -prune -print0 1600s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1600s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 1600s + git add -Af . 1600s | git write-tree 1600s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 1600s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1600s CD .. 1600s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1600s CD ../fake 1600s + git add -Af . 1600s | git write-tree 1600s => `607612c46d7ea5b66697b830f1a50f069061d460' 1600s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 1600s CD ../work 1600s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1600s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 1600s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1600s => `: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' 1600s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 1600s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1600s => `' 1600s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1600s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 1600s => `lib.c\x00new-upstream-file\x00src.c\x00' 1600s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 1600s differences @dl ## ## == == == ==. 1600s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 1600s dgit: quilt differences: src: ## orig ## gitignores: == orig == 1600s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 1600s starting quiltify (multiple patches, linear mode) 1600s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 1600s => `debian/control'... 1600s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1600s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 1600s => `' 1600s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 1600s search finished hooray! 1600s quiltify linearisation planning successful, executing... 1600s + git checkout -q master 1600s | git status --ignored --porcelain 1600s => `?? .pc/' 1600s nothing quilty to commit, ok. 1600s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1600s + git pull --ff-only -q /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack/work master 1600s | git rev-parse 'HEAD~0' 1600s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1600s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1600s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 1600s CD work 1600s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1600s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1600s CD .. 1600s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 1600s dpkg-source: info: using source format '3.0 (quilt)' 1600s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 1600s dpkg-source: info: using patch list from debian/patches/series 1600s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 1600s dpkg-source: info: building example in example_2.0-2.dsc 1600s CD work 1600s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1600s package seems new, not specifying -v 1600s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 1600s dpkg-genchanges: info: not including original source code in upload 1600s CD .. 1600s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.. 1600s renaming (Files) example_2.0.orig.tar.gz 1600s renaming (Files) example_2.0-2.debian.tar.xz 1600s renaming (dsc) example_2.0-2.dsc 1600s renaming (changes) example_2.0-2_source.changes 1600s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1600s actually entering push 1600s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1600s => `1' 1600s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 1600s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 1600s git_lrfetch_sane iteration 0 1600s | git ls-remote -q --refs /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 1600s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 1600s => 1c419b2afb1bc71bb96c783f28b76be732cd7b45 refs/tags/archive/test-dummy/2.0-1 1600s => 4e141297c99e961f9fb8e719459a56b2b46c430a refs/tags/test-dummy/2.0-1 1600s 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 1600s + git fetch -p -n -q /tmp/autopkgtest.XK8uun/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' 1600s | git for-each-ref refs/dgit-fetch/test-dummy 1600s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 1600s |> 1c419b2afb1bc71bb96c783f28b76be732cd7b45 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1600s |> 4e141297c99e961f9fb8e719459a56b2b46c430a tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1600s git_lrfetch_sane: tidying any old suite lrfetchrefs 1600s | git for-each-ref refs/dgit-fetch/sid 1600s git_lrfetch_sane: git fetch --no-insane emulation complete 1600s $VAR1 = { 1600s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '1c419b2afb1bc71bb96c783f28b76be732cd7b45', 1600s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '4e141297c99e961f9fb8e719459a56b2b46c430a', 1600s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9' 1600s }; 1600s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 1600s |> 1c419b2afb1bc71bb96c783f28b76be732cd7b45 tag refs/tags/archive/test-dummy/2.0-1 1600s currently refs/tags/archive/test-dummy/2.0-1=1c419b2afb1bc71bb96c783f28b76be732cd7b45 1600s |> 4e141297c99e961f9fb8e719459a56b2b46c430a tag refs/tags/test-dummy/2.0-1 1600s currently refs/tags/test-dummy/2.0-1=4e141297c99e961f9fb8e719459a56b2b46c430a 1600s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 1600s |> 1c419b2afb1bc71bb96c783f28b76be732cd7b45 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1600s offered refs/tags/archive/test-dummy/2.0-1=1c419b2afb1bc71bb96c783f28b76be732cd7b45 1600s |> 4e141297c99e961f9fb8e719459a56b2b46c430a tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1600s offered refs/tags/test-dummy/2.0-1=4e141297c99e961f9fb8e719459a56b2b46c430a 1600s query: fetching file:///tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 1600s get_archive_dsc: nothing in archive, returning undef 1600s no version available from the archive 1600s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 1600s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 1600s 1600s Package not found in the archive, but has allegedly been pushed using dgit. 1600s Perhaps the upload is stuck in incoming. Using the version from git. 1600s 1600s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s fetch mergeinfos: 1600s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 1600s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 1600s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 1600s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 1600s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 1600s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 1600s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 1600s + git check-ref-format archive/test-dummy/2.0-2 1600s | git symbolic-ref -q HEAD 1600s => `refs/heads/master' 1600s | git rev-parse 'HEAD~0' 1600s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 1600s ffq_prev_branchinfo branch current refs/heads/master 1600s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 1600s => `' 1600s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 1600s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1600s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1600s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1600s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1600s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1600s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 1600s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 1600s | git status --ignored --porcelain 1600s => `' 1600s nothing quilty to commit, ok. 1600s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 1600s => `' 1600s + git diff --quiet HEAD 1600s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 1600s => `45ea71a69fa522ce760afdab8a420200443753e9' 1600s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 1600s => `' 1600s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/unpack 1600s checking that example_2.0-2.dsc corresponds to HEAD 1600s + dpkg-source -x -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc 1601s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/../example_2.0-2.dsc) 1601s dpkg-source: info: extracting example in example-2.0 1601s dpkg-source: info: unpacking example_2.0.orig.tar.gz 1601s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 1601s dpkg-source: info: using patch list from debian/patches/series 1601s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 1601s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 1601s dpkg-source: info: applying subdir/addnewups 1601s CD example-2.0 1601s | find -name .git -prune -print0 1601s + env PATH=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/powerpc64le-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/powerpc64le-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/powerpc64le-linux-gnu/perl-base:/usr/lib/powerpc64le-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.XK8uun/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 . 1601s + git add -Af . 1601s | git write-tree 1601s => `607612c46d7ea5b66697b830f1a50f069061d460' 1601s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 1601s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 1601s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 1601s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1601s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1601s files_compare_inputs example_2.0-2.dsc 1601s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 1601s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 1601s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 1601s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 1601s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 1601s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 1601s files_compare_inputs example_2.0-2.dsc Files 1601s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 1601s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 1601s files_compare_inputs example_2.0-2_source.changes 1601s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 1601s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 1601s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 1601s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 1601s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 1601s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 1601s files_compare_inputs example_2.0-2_source.changes Files 1601s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 1601s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 1601s checking origs needed (2.0)... 1601s checking origs needed placement 'devel extra'... 1601s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 1601s origs example_2.0.orig.tar.gz is_orig 1601s -| sh -ec 'cd "$1"; shift 1601s 1601s find -name "$1" -print0 | 1601s xargs -0r sha256sum 1601s ' x //tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 1601s origs example_2.0.orig.tar.gz $#$have=-1 1601s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 1601s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 1601s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 1601s push_tagwants: $VAR1 = [ 1601s '2.0-2', 1601s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1601s undef, 1601s '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag' 1601s ]; 1601s $VAR2 = [ 1601s { 1601s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1601s 'TfSuffix' => '', 1601s 'Tag' => 'archive/test-dummy/2.0-2', 1601s 'Tfn' => sub { "DUMMY" }, 1601s 'View' => 'dgit', 1601s 'TagFn' => sub { "DUMMY" } 1601s }, 1601s { 1601s 'TagFn' => sub { "DUMMY" }, 1601s 'View' => 'dgit', 1601s 'Tfn' => sub { "DUMMY" }, 1601s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 1601s 'Tag' => 'test-dummy/2.0-2', 1601s 'TfSuffix' => '-dgit' 1601s } 1601s ]; 1601s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 1601s => `1530000000 +0000' 1601s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp 1601s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1601s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 1601s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 1601s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1601s + sh -ec 'exec >/tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 1601s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 1601s => `ae70a584022129b12bd82010540053a0bb418d8a' 1601s + git verify-tag ae70a584022129b12bd82010540053a0bb418d8a 1601s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1601s gpg: Signature made Mon Mar 31 23:13:51 2025 UTC 1601s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1601s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1601s gpg: WARNING: This key is not certified with a trusted signature! 1601s gpg: There is no indication that the signature belongs to the owner. 1601s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1601s + git update-ref refs/tags/archive/test-dummy/2.0-2 ae70a584022129b12bd82010540053a0bb418d8a 1601s | git hash-object -w -t tag /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 1601s => `b1a1812d014c80ac9e05dc9ccdda8398f4dabef3' 1601s + git verify-tag b1a1812d014c80ac9e05dc9ccdda8398f4dabef3 1601s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1601s gpg: Signature made Mon Mar 31 23:13:51 2025 UTC 1601s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1601s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 1601s gpg: WARNING: This key is not certified with a trusted signature! 1601s gpg: There is no indication that the signature belongs to the owner. 1601s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 1601s + git update-ref refs/tags/test-dummy/2.0-2 b1a1812d014c80ac9e05dc9ccdda8398f4dabef3 1601s | /tmp/autopkgtest.XK8uun/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 1601s => `1' 1601s + git -c push.followTags=false push /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 1601s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1601s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 1601s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 1601s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 1601s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1601s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 1601s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1601s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1601s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1601s 1601s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 1601s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 1601s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1601s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.XK8uun/autopkgtest_tmp/gnupg' 1601s 1601s Successfully signed dsc, changes files 1601s + dput --config=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 1602s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1602s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 1602s D: Setting host argument. 1602s Checking signature on .changes 1602s Checking signature on .dsc 1602s Package includes an .orig.tar.gz file although the debian revision suggests 1602s that it might not be required. Multiple uploads of the .orig.tar.gz may be 1602s rejected by the upload queue management software. 1602s Uploading to test-dummy (via local to localhost): 1602s Successfully uploaded packages. 1602s dgit ok: pushed and uploaded 2.0-2 1602s CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1602s del_lrfetchrefs... 1602s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 1602s del_lrfetchrefs: 1c419b2afb1bc71bb96c783f28b76be732cd7b45 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 1602s del_lrfetchrefs: 4e141297c99e961f9fb8e719459a56b2b46c430a refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 1602s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1602s ' 1602s + git push 1602s To /tmp/autopkgtest.XK8uun/autopkgtest_tmp/salsa/example 1602s eb10718..6b22dd5 master -> master 1602s + cd .. 1602s + t-archive-process-incoming sid 1602s + local suite=sid 1602s + mv /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.XK8uun/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.XK8uun/autopkgtest_tmp/mirror/pool/main/ 1602s + t-archive-query sid 1602s + local suite=sid 1602s + local dscf=main/example_2.0-2.dsc 1602s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 1602s + local suite=sid 1602s + local p=example 1602s + local v=2.0-2 1602s + local dscf=main/example_2.0-2.dsc 1602s + local sha 1602s ++ sha256sum 1602s + sha='1cb56280a2432e58e8fa585d92cad93b0ca1ea976caa210477d8da5d76655df6 -' 1602s + echo '2.0-2 1cb56280a2432e58e8fa585d92cad93b0ca1ea976caa210477d8da5d76655df6 main/example_2.0-2.dsc' 1602s + t-aq-archive-updated sid example 1602s + local suite=sid 1602s + local p=example 1602s + local suitedir=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1602s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/aq/dsc_in_suite/sid 1602s + perl -wne ' 1602s use JSON; 1602s use strict; 1602s our @v; 1602s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 1602s push @v, { 1602s "version" => "$1", 1602s "sha256sum" => "$2", 1602s "component" => "$3", 1602s "filename" => "$4", 1602s }; 1602s END { 1602s my $json = JSON->new->canonical(); 1602s print $json->encode(\@v) or die $!; 1602s } 1602s ' 1602s ++ 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 1602s ++ echo git mirror aq 1602s + 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' ' 1602s . $troot/lib-gdr 1602s t-tstunt-parsechangelog 1602s p=example 1602s t-git-next-date 1602s ' 1602s + local savevars= 1602s + 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' 1602s + local 'importeval= 1602s . $troot/lib-gdr 1602s t-tstunt-parsechangelog 1602s p=example 1602s t-git-next-date 1602s ' 1602s + local import=IMPORT.gdr-convert-gbp 1602s + exec 1602s + local vn 1602s + perl -I/tmp/autopkgtest.XK8uun/build.980/src -MDebian::Dgit -we ' 1602s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1602s print STDERR "saving-exporting $vn\n"; 1602s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1602s or die $!; 1602s } 1602s ' 1602s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1602s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1602s saving-exporting DGIT_TEST_REAL_GPG 1602s saving-exporting DGIT_TEST_REAL_GPG_AGENT 1602s + set -e 1602s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1602s + 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 1602s + printf '\n%s\n' ' 1602s . $troot/lib-gdr 1602s t-tstunt-parsechangelog 1602s p=example 1602s t-git-next-date 1602s ' 1602s + mv -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1602s + rc=0 1602s + set +x 1602s + set +e 1602s + pwd 1602s /tmp/autopkgtest.XK8uun/autopkgtest_tmp 1602s + '[' x '!=' x ']' 1602s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1602s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1602s + set -e 1602s + test 0 = 0 1602s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp '!=' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp ']' 1602s + mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1602s + . /tmp/autopkgtest.XK8uun/autopkgtest_tmp/IMPORT.gdr-convert-gbp 1602s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1602s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1602s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1602s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1602s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 1602s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 1602s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1602s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 1602s ++ . /tmp/autopkgtest.XK8uun/build.980/src/tests/lib-gdr 1602s +++ : -D 1602s +++ export GDR_TEST_DEBUG 1602s +++ t-tstunt debchange 1602s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1602s +++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1602s +++ local var=PATH 1602s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1602s +++ eval ' 1602s case "$PATH" in 1602s "$tstunt:"*) ;; 1602s *":$tstunt:"*) ;; 1602s "") PATH="$tstunt" ;; 1602s *) PATH="$tstunt:$PATH" ;; 1602s esac 1602s export PATH 1602s ' 1602s ++++ case "$PATH" in 1602s ++++ export PATH 1602s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1602s +++ local var=PERLLIB 1602s +++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1602s +++ eval ' 1602s case "$PERLLIB" in 1602s "$tstunt:"*) ;; 1602s *":$tstunt:"*) ;; 1602s "") PERLLIB="$tstunt" ;; 1602s *) PERLLIB="$tstunt:$PERLLIB" ;; 1602s esac 1602s export PERLLIB 1602s ' 1602s ++++ case "$PERLLIB" in 1602s ++++ export PERLLIB 1602s +++ local f 1602s +++ for f in "$@" 1602s +++ t-tstunt--save-real debchange 1602s +++ local f=debchange 1602s +++ case "$f" in 1602s +++ local rc 1602s +++ local real 1602s +++ set +e 1602s ++++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1602s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1602s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1602s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1602s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1602s ++++ type -p debchange 1602s +++ real=/usr/bin/debchange 1602s +++ rc=0 1602s +++ set -e 1602s +++ case $rc in 1602s +++ local varname=debchange 1602s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1602s +++ eval ' 1602s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1602s export DGIT_TEST_REAL_DEBCHANGE 1602s ' 1602s ++++ : /usr/bin/debchange 1602s ++++ export DGIT_TEST_REAL_DEBCHANGE 1602s +++ f=./debchange 1602s +++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1602s +++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1602s +++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./debchange /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1602s ++ t-tstunt-parsechangelog 1602s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1602s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1602s ++ t-stunt-envvar PATH /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1602s ++ local var=PATH 1602s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1602s ++ eval ' 1602s case "$PATH" in 1602s "$tstunt:"*) ;; 1602s *":$tstunt:"*) ;; 1602s "") PATH="$tstunt" ;; 1602s *) PATH="$tstunt:$PATH" ;; 1602s esac 1602s export PATH 1602s ' 1602s +++ case "$PATH" in 1602s +++ export PATH 1602s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1602s ++ local var=PERLLIB 1602s ++ local tstunt=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt 1602s ++ eval ' 1602s case "$PERLLIB" in 1602s "$tstunt:"*) ;; 1602s *":$tstunt:"*) ;; 1602s "") PERLLIB="$tstunt" ;; 1602s *) PERLLIB="$tstunt:$PERLLIB" ;; 1602s esac 1602s export PERLLIB 1602s ' 1602s +++ case "$PERLLIB" in 1602s +++ export PERLLIB 1602s ++ local f 1602s ++ for f in "$@" 1602s ++ t-tstunt--save-real dpkg-parsechangelog 1602s ++ local f=dpkg-parsechangelog 1602s ++ case "$f" in 1602s ++ local rc 1602s ++ local real 1602s ++ set +e 1602s +++ p=:/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1602s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1602s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1602s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1602s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1602s +++ type -p dpkg-parsechangelog 1602s ++ real=/usr/bin/dpkg-parsechangelog 1602s ++ rc=0 1602s ++ set -e 1602s ++ case $rc in 1602s ++ local varname=dpkg_parsechangelog 1602s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1602s ++ eval ' 1602s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1602s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1602s ' 1602s +++ : /usr/bin/dpkg-parsechangelog 1602s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1602s ++ f=./dpkg-parsechangelog 1602s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1602s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/. 1602s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./. 1602s ++ for f in "$@" 1602s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1602s ++ local f=Dpkg/Changelog/Parse.pm 1602s ++ case "$f" in 1602s ++ return 1602s ++ f=./Dpkg/Changelog/Parse.pm 1602s ++ local d=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1602s ++ mkdir -p /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1602s ++ ln -sf /tmp/autopkgtest.XK8uun/build.980/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.XK8uun/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1602s ++ p=example 1602s ++ t-git-next-date 1602s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1602s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1602s + cd example 1602s + b=gdr-unprocessable/origin 1602s + git checkout gdr-unprocessable/origin 1602s Switched to branch 'gdr-unprocessable/origin' 1602s + t-expect-fail 'E:maybe you needed git-debrebase convert-from' t-git-debrebase quick 1602s + local 'mpat=E:maybe you needed git-debrebase convert-from' 1602s + shift 1602s + set +o pipefail 1602s + LC_MESSAGES=C 1602s + LANGUAGE=C 1602s + t-git-debrebase quick 1602s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s + local gdr=git-debrebase 1602s + : ' 1602s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1602s + git-debrebase --dgit=dgit -D quick 1602s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1602s git-debrebase ffq check_specs * 1602s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 1602s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1602s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1602s git-debrebase = AddPatches {"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"Type" => "AddPatches","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1602s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1602s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1602s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1602s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Msg" => "Merge branch 'upstream' into quilt-tip\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},{"Differs" => 48,"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"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","Contributor" => $VAR1->{"Parents"}[0],"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"} 1602s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1602s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1602s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add *.o to .gitignore\n","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","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"} 1602s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1602s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1602s git-debrebase = Mixed {"Type" => "Mixed","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","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"} 1602s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1602s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1602s 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"} 1602s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1602s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1602s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Type" => "Packaging","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Msg" => "WIP\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}]} 1602s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1602s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1602s git-debrebase = Packaging {"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Type" => "Packaging","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Msg" => "WIP\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}]} 1602s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1602s git-debrebase ** Unknown 1602s git-debrebase *** WALK BOMB unrecognised 1602s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1602s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1602s 1602s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 1602s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 1602s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1602s + local 'ps=255 0' 1602s + set -o pipefail 1602s + case $ps in 1602s + t-grep-mpat 'E:maybe you needed git-debrebase convert-from' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s + local 'mpat=E:maybe you needed git-debrebase convert-from' 1602s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s + local grepper=fgrep 1602s + case "$mpat" in 1602s + case "$mpat" in 1602s + grepper=egrep 1602s + mpat='maybe you needed git-debrebase convert-from' 1602s + egrep -e 'maybe you needed git-debrebase convert-from' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 1602s + git update-ref refs/ffq-prev/heads/gdr-unprocessable/origin master 1602s + t-expect-fail 'E:Consider git-debrebase scrap' t-git-debrebase quick 1602s + local 'mpat=E:Consider git-debrebase scrap' 1602s + shift 1602s + set +o pipefail 1602s + LC_MESSAGES=C 1602s + LANGUAGE=C 1602s + t-git-debrebase quick 1602s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s + local gdr=git-debrebase 1602s + : ' 1602s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1602s + git-debrebase --dgit=dgit -D quick 1602s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1602s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 1602s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1602s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1602s git-debrebase = AddPatches {"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0,"Differs" => 4}],"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"} 1602s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1602s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1602s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1602s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Pseudomerge","Overwritten" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","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"} 1602s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1602s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1602s git-debrebase = Upstream {"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Parents" => [{"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0,"Differs" => 2}],"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n","Type" => "Upstream"} 1602s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1602s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1602s git-debrebase = Mixed {"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","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}],"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"} 1602s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1602s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1602s git-debrebase = Packaging {"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32,"Ix" => 0}],"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Msg" => "echo EXAMPLE RULES TARGET\n","Type" => "Packaging"} 1602s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1602s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1602s 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"}],"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Type" => "Packaging","Msg" => "WIP\n"} 1602s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1602s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1602s git-debrebase = Packaging {"Msg" => "WIP\n","Type" => "Packaging","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}],"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n"} 1602s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1602s git-debrebase ** Unknown 1602s git-debrebase *** WALK BOMB unrecognised 1602s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1602s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1602s 1602s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 1602s git-debrebase: Branch/history seems mangled - no longer in gdr format. 1602s git-debrebase: See ILLEGAL OPERATIONS in git-debrebase(5). 1602s git-debrebase: Consider git-debrebase scrap, to throw away your recent work. 1602s + local 'ps=255 0' 1602s + set -o pipefail 1602s + case $ps in 1602s + t-grep-mpat 'E:Consider git-debrebase scrap' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s + local 'mpat=E:Consider git-debrebase scrap' 1602s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s + local grepper=fgrep 1602s + case "$mpat" in 1602s + case "$mpat" in 1602s + grepper=egrep 1602s + mpat='Consider git-debrebase scrap' 1602s + egrep -e 'Consider git-debrebase scrap' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s git-debrebase: Consider git-debrebase scrap, to throw away your recent work. 1602s + git update-ref -d refs/ffq-prev/heads/gdr-unprocessable/origin master 1602s + git update-ref refs/debrebase-last/heads/gdr-unprocessable/origin HEAD 1602s + t-expect-fail 'E:Branch/history seems mangled' t-git-debrebase quick 1602s + local 'mpat=E:Branch/history seems mangled' 1602s + shift 1602s + set +o pipefail 1602s + LC_MESSAGES=C 1602s + LANGUAGE=C 1602s + t-git-debrebase quick 1602s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s + local gdr=git-debrebase 1602s + : ' 1602s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1602s + git-debrebase --dgit=dgit -D quick 1602s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1602s git-debrebase ffq check_specs * 1602s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 1602s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1602s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1602s git-debrebase = AddPatches {"Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1602s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1602s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1602s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1602s 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","Overwritten" => [{"Differs" => 48,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Ix" => 1}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Pseudomerge","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},$VAR1->{"Overwritten"}[0]],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Contributor" => $VAR1->{"Parents"}[0]} 1602s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1602s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1602s git-debrebase = Upstream {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"Type" => "Upstream","Msg" => "Add *.o to .gitignore\n"} 1602s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1602s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1602s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","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"} 1602s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1602s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1602s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}],"Msg" => "echo EXAMPLE RULES TARGET\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"} 1602s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1602s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1602s git-debrebase = Packaging {"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","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"}],"Msg" => "WIP\n"} 1602s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1602s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1602s git-debrebase = Packaging {"Msg" => "WIP\n","Type" => "Packaging","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32,"Ix" => 0}],"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"} 1602s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1602s git-debrebase ** Unknown 1602s git-debrebase *** WALK BOMB unrecognised 1602s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1602s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1602s 1602s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 1602s git-debrebase: Branch/history seems mangled - no longer in gdr format. 1602s git-debrebase: See ILLEGAL OPERATIONS in git-debrebase(5). 1602s + local 'ps=255 0' 1602s + set -o pipefail 1602s + case $ps in 1602s + t-grep-mpat 'E:Branch/history seems mangled' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s + local 'mpat=E:Branch/history seems mangled' 1602s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s + local grepper=fgrep 1602s + case "$mpat" in 1602s + case "$mpat" in 1602s + grepper=egrep 1602s + mpat='Branch/history seems mangled' 1602s + egrep -e 'Branch/history seems mangled' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s git-debrebase: Branch/history seems mangled - no longer in gdr format. 1602s ++ grep 'git-debrebase scrap' ../t.output 1602s + test '' = '' 1602s + git update-ref refs/debrebase-last/heads/gdr-unprocessable/origin master 1602s + t-expect-fail 'E:Branch/history mangled, and diverged' t-git-debrebase quick 1602s + local 'mpat=E:Branch/history mangled, and diverged' 1602s + shift 1602s + set +o pipefail 1602s + LC_MESSAGES=C 1602s + LANGUAGE=C 1602s + t-git-debrebase quick 1602s + tee /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1602s + local gdr=git-debrebase 1602s + : ' 1602s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1602s + git-debrebase --dgit=dgit -D quick 1603s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1603s git-debrebase ffq check_specs * 1603s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 1603s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1603s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 1603s git-debrebase = AddPatches {"Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0}]} 1603s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1603s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1603s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 1603s git-debrebase = Pseudomerge {"Msg" => "Merge branch 'upstream' into quilt-tip\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0},{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48,"Ix" => 1}],"Type" => "Pseudomerge","Contributor" => $VAR1->{"Parents"}[0],"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","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"} 1603s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1603s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1603s 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" => [{"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 1603s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1603s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1603s git-debrebase = Mixed {"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Type" => "Mixed"} 1603s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1603s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1603s git-debrebase = Packaging {"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","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}],"Type" => "Packaging","Msg" => "echo EXAMPLE RULES TARGET\n"} 1603s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1603s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1603s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Type" => "Packaging","Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32,"Ix" => 0}]} 1603s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1603s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1603s git-debrebase = Packaging {"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","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","Msg" => "WIP\n"} 1603s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1603s git-debrebase ** Unknown 1603s git-debrebase *** WALK BOMB unrecognised 1603s git-debrebase CD /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1603s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 1603s 1603s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 1603s git-debrebase: Branch/history mangled, and diverged since last git-debrebase. 1603s git-debrebase: Maybe you reset to, or rebased from, somewhere inappropriate. 1603s + local 'ps=255 0' 1603s + set -o pipefail 1603s + case $ps in 1603s + t-grep-mpat 'E:Branch/history mangled, and diverged' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1603s + local 'mpat=E:Branch/history mangled, and diverged' 1603s + local file=/tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1603s + local grepper=fgrep 1603s + case "$mpat" in 1603s + case "$mpat" in 1603s + grepper=egrep 1603s + mpat='Branch/history mangled, and diverged' 1603s + egrep -e 'Branch/history mangled, and diverged' /tmp/autopkgtest.XK8uun/autopkgtest_tmp/t.output 1603s git-debrebase: Branch/history mangled, and diverged since last git-debrebase. 1603s ++ grep 'git-debrebase scrap' ../t.output 1603s + test '' = '' 1603s + t-ok 1603s + : ======================================== 1603s + t-check-only-bpd 1603s + '[' .. = .. ']' 1603s + return 1603s + t-fscks 1603s + shopt -s nullglob 1603s + for d in $tmp/*/.git $tmp/git/*.git 1603s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1603s + t-git-fsck 1603s ++ git rev-parse --git-dir 1603s + local fsckerrs=.git/dgit-test-fsck.errs 1603s + set +e 1603s + LC_MESSAGES=C 1603s + git fsck --no-dangling --strict 1603s + tee .git/dgit-test-fsck.errs 1603s + ps='0 0' 1603s + set -e 1603s + local pats 1603s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1603s + test '0 0' = '0 0' 1603s + pats+=(-e 'notice: HEAD points to an unborn branch') 1603s + pats+=(-e 'notice: No default references') 1603s + set +e 1603s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1603s + rc=1 1603s + set -e 1603s + case $rc in 1603s + for d in $tmp/*/.git $tmp/git/*.git 1603s + cd /tmp/autopkgtest.XK8uun/autopkgtest_tmp/git/example.git 1603s + t-git-fsck 1603s ++ git rev-parse --git-dir 1603s + local fsckerrs=./dgit-test-fsck.errs 1603s + set +e 1603s + LC_MESSAGES=C 1603s + git fsck --no-dangling --strict 1603s + tee ./dgit-test-fsck.errs 1603s notice: HEAD points to an unborn branch (master) 1603s + ps='0 0' 1603s + set -e 1603s + local pats 1603s + '[' -f /tmp/autopkgtest.XK8uun/autopkgtest_tmp/fsck.expected-errors ']' 1603s + test '0 0' = '0 0' 1603s + pats+=(-e 'notice: HEAD points to an unborn branch') 1603s + pats+=(-e 'notice: No default references') 1603s + set +e 1603s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 1603s + rc=1 1603s + set -e 1603s + case $rc in 1603s + t-save-artifacts 1603s + artifacts=/tmp/autopkgtest.XK8uun/gdr-unprocessable-hints-artifacts 1603s + '[' x/tmp/autopkgtest.XK8uun/gdr-unprocessable-hints-artifacts = x ']' 1603s + '[' xtmp = x ']' 1603s + GZIP=-1v 1603s + tar -C /tmp/autopkgtest.XK8uun/autopkgtest_tmp -zc -f /tmp/autopkgtest.XK8uun/gdr-unprocessable-hints-artifacts/gdr-unprocessable-hints.tar.gz '--exclude=*.tar' . 1603s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1603s 80.4% 1603s + echo ok. 1603s ok. 1603s + rc=0 1603s + set +x 1603s + set +e 1603s + pwd 1603s /tmp/autopkgtest.XK8uun/autopkgtest_tmp/example 1603s + '[' x '!=' x ']' 1603s + '[' x/tmp/autopkgtest.XK8uun/autopkgtest_tmp = x ']' 1603s + rm -rf /tmp/autopkgtest.XK8uun/autopkgtest_tmp/must-clean 1603s + set -e 1603s + test 0 = 0 1603s autopkgtest [23:13:53]: test gdr-unprocessable-hints: -----------------------] 1604s gdr-unprocessable-hints PASS 1604s autopkgtest [23:13:54]: test gdr-unprocessable-hints: - - - - - - - - - - results - - - - - - - - - - 1605s autopkgtest [23:13:55]: test gitattributes: preparing testbed 1670s autopkgtest [23:15:00]: testbed dpkg architecture: ppc64el 1670s autopkgtest [23:15:00]: testbed apt version: 2.4.13 1671s autopkgtest [23:15:01]: @@@@@@@@@@@@@@@@@@@@ test bed setup 1671s autopkgtest [23:15:01]: testbed release detected to be: jammy 1672s autopkgtest [23:15:02]: updating testbed package index (apt update) 1673s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 1673s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 1673s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 1673s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 1674s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 1674s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 1674s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.2 kB] 1674s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el Packages [170 kB] 1674s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el c-n-f Metadata [2476 B] 1674s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el Packages [1704 B] 1674s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted ppc64el c-n-f Metadata [116 B] 1674s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el Packages [85.0 kB] 1674s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/universe ppc64el c-n-f Metadata [2064 B] 1674s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse ppc64el c-n-f Metadata [116 B] 1676s Fetched 715 kB in 1s (669 kB/s) 1677s Reading package lists... 1677s autopkgtest [23:15:07]: upgrading testbed (apt dist-upgrade and autopurge) 1678s Reading package lists... 1678s Building dependency tree... 1678s Reading state information... 1678s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 1678s Starting 2 pkgProblemResolver with broken count: 0 1678s Done 1678s Entering ResolveByKeep 1678s 1679s The following NEW packages will be installed: 1679s linux-headers-5.15.0-136 linux-headers-5.15.0-136-generic 1679s linux-image-5.15.0-136-generic linux-modules-5.15.0-136-generic 1679s linux-modules-extra-5.15.0-136-generic 1679s The following packages will be upgraded: 1679s apt apt-utils libapt-pkg6.0 linux-generic linux-headers-generic 1679s linux-headers-virtual linux-image-generic linux-image-virtual linux-virtual 1679s 9 upgraded, 5 newly installed, 0 to remove and 0 not upgraded. 1679s Need to get 112 MB of archives. 1679s After this operation, 613 MB of additional disk space will be used. 1679s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el libapt-pkg6.0 ppc64el 2.4.14 [1030 kB] 1679s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt ppc64el 2.4.14 [1407 kB] 1679s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main ppc64el apt-utils ppc64el 2.4.14 [236 kB] 1679s Get:4 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-5.15.0-136-generic ppc64el 5.15.0-136.147 [22.0 MB] 1680s Get:5 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-5.15.0-136-generic ppc64el 5.15.0-136.147 [11.5 MB] 1681s Get:6 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-modules-extra-5.15.0-136-generic ppc64el 5.15.0-136.147 [60.3 MB] 1684s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-generic ppc64el 5.15.0.136.134 [1700 B] 1684s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-generic ppc64el 5.15.0.136.134 [2466 B] 1684s Get:9 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-virtual ppc64el 5.15.0.136.134 [1676 B] 1684s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-image-virtual ppc64el 5.15.0.136.134 [2464 B] 1684s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-virtual ppc64el 5.15.0.136.134 [1634 B] 1684s Get:12 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136 all 5.15.0-136.147 [12.3 MB] 1684s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-5.15.0-136-generic ppc64el 5.15.0-136.147 [3208 kB] 1685s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-headers-generic ppc64el 5.15.0.136.134 [2364 B] 1685s Fetched 112 MB in 6s (18.5 MB/s) 1685s (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 ... 66539 files and directories currently installed.) 1685s Preparing to unpack .../libapt-pkg6.0_2.4.14_ppc64el.deb ... 1685s Unpacking libapt-pkg6.0:ppc64el (2.4.14) over (2.4.13) ... 1686s Setting up libapt-pkg6.0:ppc64el (2.4.14) ... 1686s (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 ... 66539 files and directories currently installed.) 1686s Preparing to unpack .../apt_2.4.14_ppc64el.deb ... 1686s Unpacking apt (2.4.14) over (2.4.13) ... 1686s Setting up apt (2.4.14) ... 1686s (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 ... 66539 files and directories currently installed.) 1686s Preparing to unpack .../00-apt-utils_2.4.14_ppc64el.deb ... 1686s Unpacking apt-utils (2.4.14) over (2.4.13) ... 1686s Selecting previously unselected package linux-modules-5.15.0-136-generic. 1686s Preparing to unpack .../01-linux-modules-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1686s Unpacking linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 1687s Selecting previously unselected package linux-image-5.15.0-136-generic. 1687s Preparing to unpack .../02-linux-image-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1687s Unpacking linux-image-5.15.0-136-generic (5.15.0-136.147) ... 1687s Selecting previously unselected package linux-modules-extra-5.15.0-136-generic. 1687s Preparing to unpack .../03-linux-modules-extra-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1687s Unpacking linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 1690s Preparing to unpack .../04-linux-generic_5.15.0.136.134_ppc64el.deb ... 1690s Unpacking linux-generic (5.15.0.136.134) over (5.15.0.135.133) ... 1690s Preparing to unpack .../05-linux-image-generic_5.15.0.136.134_ppc64el.deb ... 1690s Unpacking linux-image-generic (5.15.0.136.134) over (5.15.0.135.133) ... 1690s Preparing to unpack .../06-linux-virtual_5.15.0.136.134_ppc64el.deb ... 1690s Unpacking linux-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 1690s Preparing to unpack .../07-linux-image-virtual_5.15.0.136.134_ppc64el.deb ... 1690s Unpacking linux-image-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 1690s Preparing to unpack .../08-linux-headers-virtual_5.15.0.136.134_ppc64el.deb ... 1690s Unpacking linux-headers-virtual (5.15.0.136.134) over (5.15.0.135.133) ... 1690s Selecting previously unselected package linux-headers-5.15.0-136. 1690s Preparing to unpack .../09-linux-headers-5.15.0-136_5.15.0-136.147_all.deb ... 1690s Unpacking linux-headers-5.15.0-136 (5.15.0-136.147) ... 1692s Selecting previously unselected package linux-headers-5.15.0-136-generic. 1692s Preparing to unpack .../10-linux-headers-5.15.0-136-generic_5.15.0-136.147_ppc64el.deb ... 1692s Unpacking linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 1692s Preparing to unpack .../11-linux-headers-generic_5.15.0.136.134_ppc64el.deb ... 1692s Unpacking linux-headers-generic (5.15.0.136.134) over (5.15.0.135.133) ... 1692s Setting up apt-utils (2.4.14) ... 1692s Setting up linux-headers-5.15.0-136 (5.15.0-136.147) ... 1692s Setting up linux-headers-5.15.0-136-generic (5.15.0-136.147) ... 1692s Setting up linux-headers-generic (5.15.0.136.134) ... 1692s Setting up linux-headers-virtual (5.15.0.136.134) ... 1692s Setting up linux-image-5.15.0-136-generic (5.15.0-136.147) ... 1694s I: /boot/vmlinux is now a symlink to vmlinux-5.15.0-136-generic 1694s I: /boot/initrd.img is now a symlink to initrd.img-5.15.0-136-generic 1694s Setting up linux-image-virtual (5.15.0.136.134) ... 1694s Setting up linux-modules-extra-5.15.0-136-generic (5.15.0-136.147) ... 1695s Setting up linux-virtual (5.15.0.136.134) ... 1695s Setting up linux-modules-5.15.0-136-generic (5.15.0-136.147) ... 1696s Setting up linux-image-generic (5.15.0.136.134) ... 1696s Setting up linux-generic (5.15.0.136.134) ... 1696s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 1696s Processing triggers for man-db (2.10.2-1) ... 1696s Processing triggers for linux-image-5.15.0-136-generic (5.15.0-136.147) ... 1697s /etc/kernel/postinst.d/initramfs-tools: 1697s update-initramfs: Generating /boot/initrd.img-5.15.0-136-generic 1697s No lz4 in /usr/bin:/sbin:/bin, using gzip 1719s /etc/kernel/postinst.d/zz-update-grub: 1719s Sourcing file `/etc/default/grub' 1719s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 1719s Sourcing file `/etc/default/grub.d/init-select.cfg' 1719s Generating grub configuration file ... 1719s Found linux image: /boot/vmlinux-5.15.0-136-generic 1719s Found initrd image: /boot/initrd.img-5.15.0-136-generic 1719s Found linux image: /boot/vmlinux-5.15.0-135-generic 1719s Found initrd image: /boot/initrd.img-5.15.0-135-generic 1719s Warning: os-prober will not be executed to detect other bootable partitions. 1719s Systems on them will not be added to the GRUB boot configuration. 1719s Check GRUB_DISABLE_OS_PROBER documentation entry. 1719s done 1721s Reading package lists... 1721s Building dependency tree... 1721s Reading state information... 1721s Starting pkgProblemResolver with broken count: 0 1721s Starting 2 pkgProblemResolver with broken count: 0 1721s Done 1721s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1721s autopkgtest [23:15:51]: rebooting testbed after setup commands that affected boot 1755s Reading package lists... 1755s Building dependency tree... 1755s Reading state information... 1755s Starting pkgProblemResolver with broken count: 0 1755s Starting 2 pkgProblemResolver with broken count: 0 1755s Done 1756s The following NEW packages will be installed: 1756s autoconf automake autopoint autotools-dev bsdgames build-essential 1756s chiark-utils-bin cpp cpp-11 debhelper debugedit devscripts dgit 1756s dgit-infrastructure dh-autoreconf dh-strip-nondeterminism dput dwz fakeroot 1756s faketime g++ g++-11 gcc gcc-11 gcc-11-base gettext git git-buildpackage 1756s git-man intltool-debian libarchive-zip-perl libasan6 libatomic1 1756s libb-hooks-op-check-perl libc-dev-bin libc6-dev libcc1-0 1756s libclass-method-modifiers-perl libclass-xsaccessor-perl libcrypt-dev 1756s libdbd-sqlite3-perl libdbi-perl libdebhelper-perl libdevel-callchecker-perl 1756s libdynaloader-functions-perl libencode-locale-perl liberror-perl 1756s libexporter-tiny-perl libfakeroot libfaketime libfile-dirlist-perl 1756s libfile-homedir-perl libfile-listing-perl libfile-stripnondeterminism-perl 1756s libfile-touch-perl libfile-which-perl libfl2 libgcc-11-dev libgomp1 1756s libhtml-parser-perl libhtml-tagset-perl libhtml-tree-perl 1756s libhttp-cookies-perl libhttp-date-perl libhttp-message-perl 1756s libhttp-negotiate-perl libimport-into-perl libio-html-perl libio-pty-perl 1756s libio-socket-ssl-perl libipc-run-perl libisl23 libitm1 libjson-perl 1756s liblist-moreutils-perl liblist-moreutils-xs-perl liblsan0 1756s liblwp-mediatypes-perl liblwp-protocol-https-perl libmodule-runtime-perl 1756s libmoo-perl libmpc3 libnet-http-perl libnet-ssleay-perl libnsl-dev 1756s libparams-classify-perl libquadmath0 librole-tiny-perl libstdc++-11-dev 1756s libsub-override-perl libsub-quote-perl libtext-csv-perl libtext-glob-perl 1756s libtimedate-perl libtirpc-dev libtool libtry-tiny-perl libtsan0 libubsan1 1756s liburi-perl libwww-curl-perl libwww-perl libwww-robotrules-perl 1756s linux-libc-dev m4 patchutils perl-openssl-defaults po-debconf 1756s python3-dateutil python3-debian python3-gpg rpcsvc-proto sqlite3 wamerican 1756s wdiff 1756s 0 upgraded, 115 newly installed, 0 to remove and 0 not upgraded. 1756s Need to get 69.8 MB of archives. 1756s After this operation, 267 MB of additional disk space will be used. 1756s Get:1 http://ftpmaster.internal/ubuntu jammy/main ppc64el m4 ppc64el 1.4.18-5ubuntu2 [214 kB] 1756s Get:2 http://ftpmaster.internal/ubuntu jammy/main ppc64el autoconf all 2.71-2 [338 kB] 1756s Get:3 http://ftpmaster.internal/ubuntu jammy/main ppc64el autotools-dev all 20220109.1 [44.9 kB] 1756s Get:4 http://ftpmaster.internal/ubuntu jammy/main ppc64el automake all 1:1.16.5-1.3 [558 kB] 1756s Get:5 http://ftpmaster.internal/ubuntu jammy/main ppc64el autopoint all 0.21-4ubuntu4 [422 kB] 1756s Get:6 http://ftpmaster.internal/ubuntu jammy/main ppc64el wamerican all 2020.12.07-2 [236 kB] 1756s Get:7 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfl2 ppc64el 2.6.4-8build2 [10.7 kB] 1756s Get:8 http://ftpmaster.internal/ubuntu jammy/universe ppc64el bsdgames ppc64el 2.17-29 [1117 kB] 1756s Get:9 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc-dev-bin ppc64el 2.35-0ubuntu3.9 [21.4 kB] 1756s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el linux-libc-dev ppc64el 5.15.0-136.147 [1313 kB] 1756s Get:11 http://ftpmaster.internal/ubuntu jammy/main ppc64el libcrypt-dev ppc64el 1:4.4.27-1 [142 kB] 1756s Get:12 http://ftpmaster.internal/ubuntu jammy/main ppc64el rpcsvc-proto ppc64el 1.4.2-0ubuntu6 [82.3 kB] 1756s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtirpc-dev ppc64el 1.3.2-2ubuntu0.1 [223 kB] 1756s Get:14 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnsl-dev ppc64el 1.3.0-2build2 [80.0 kB] 1756s Get:15 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libc6-dev ppc64el 2.35-0ubuntu3.9 [2053 kB] 1757s Get:16 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11-base ppc64el 11.4.0-1ubuntu1~22.04 [20.3 kB] 1757s Get:17 http://ftpmaster.internal/ubuntu jammy/main ppc64el libisl23 ppc64el 0.24-2build1 [833 kB] 1757s Get:18 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmpc3 ppc64el 1.2.1-2build1 [52.2 kB] 1757s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el cpp-11 ppc64el 11.4.0-1ubuntu1~22.04 [8800 kB] 1757s Get:20 http://ftpmaster.internal/ubuntu jammy/main ppc64el cpp ppc64el 4:11.2.0-1ubuntu1 [27.7 kB] 1757s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libcc1-0 ppc64el 12.3.0-1ubuntu1~22.04 [49.5 kB] 1757s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgomp1 ppc64el 12.3.0-1ubuntu1~22.04 [140 kB] 1757s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libitm1 ppc64el 12.3.0-1ubuntu1~22.04 [32.9 kB] 1757s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libatomic1 ppc64el 12.3.0-1ubuntu1~22.04 [10.6 kB] 1757s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libasan6 ppc64el 11.4.0-1ubuntu1~22.04 [2303 kB] 1757s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el liblsan0 ppc64el 12.3.0-1ubuntu1~22.04 [1090 kB] 1757s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libtsan0 ppc64el 11.4.0-1ubuntu1~22.04 [2278 kB] 1757s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libubsan1 ppc64el 12.3.0-1ubuntu1~22.04 [1001 kB] 1757s Get:29 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libquadmath0 ppc64el 12.3.0-1ubuntu1~22.04 [156 kB] 1757s Get:30 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libgcc-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [1477 kB] 1757s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el gcc-11 ppc64el 11.4.0-1ubuntu1~22.04 [17.7 MB] 1758s Get:32 http://ftpmaster.internal/ubuntu jammy/main ppc64el gcc ppc64el 4:11.2.0-1ubuntu1 [5152 B] 1758s Get:33 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el libstdc++-11-dev ppc64el 11.4.0-1ubuntu1~22.04 [2197 kB] 1758s Get:34 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el g++-11 ppc64el 11.4.0-1ubuntu1~22.04 [10.2 MB] 1758s Get:35 http://ftpmaster.internal/ubuntu jammy/main ppc64el g++ ppc64el 4:11.2.0-1ubuntu1 [1408 B] 1758s Get:36 http://ftpmaster.internal/ubuntu jammy/main ppc64el build-essential ppc64el 12.9ubuntu3 [4752 B] 1758s Get:37 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 1758s Get:38 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtool all 2.4.6-15build2 [164 kB] 1758s Get:39 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-autoreconf all 20 [16.1 kB] 1758s Get:40 http://ftpmaster.internal/ubuntu jammy/main ppc64el libarchive-zip-perl all 1.68-1 [90.2 kB] 1758s Get:41 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-override-perl all 0.09-2 [9532 B] 1758s Get:42 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 1758s Get:43 http://ftpmaster.internal/ubuntu jammy/main ppc64el dh-strip-nondeterminism all 1.13.0-1 [5344 B] 1758s Get:44 http://ftpmaster.internal/ubuntu jammy/main ppc64el debugedit ppc64el 1:5.0-4build1 [51.6 kB] 1758s Get:45 http://ftpmaster.internal/ubuntu jammy/main ppc64el dwz ppc64el 0.14-1build2 [124 kB] 1758s Get:46 http://ftpmaster.internal/ubuntu jammy/main ppc64el gettext ppc64el 0.21-4ubuntu4 [976 kB] 1758s Get:47 http://ftpmaster.internal/ubuntu jammy/main ppc64el intltool-debian all 0.35.0+20060710.5 [24.9 kB] 1758s Get:48 http://ftpmaster.internal/ubuntu jammy/main ppc64el po-debconf all 1.0.21+nmu1 [233 kB] 1758s Get:49 http://ftpmaster.internal/ubuntu jammy/main ppc64el debhelper all 13.6ubuntu1 [923 kB] 1758s Get:50 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfakeroot ppc64el 1.28-1ubuntu1 [33.8 kB] 1758s Get:51 http://ftpmaster.internal/ubuntu jammy/main ppc64el fakeroot ppc64el 1.28-1ubuntu1 [62.8 kB] 1758s Get:52 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-dirlist-perl all 0.05-2 [7100 B] 1758s Get:53 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-which-perl all 1.23-1 [13.8 kB] 1758s Get:54 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-homedir-perl all 1.006-1 [38.3 kB] 1758s Get:55 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-touch-perl all 0.12-1 [9024 B] 1758s Get:56 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-pty-perl ppc64el 1:1.15-2build2 [35.3 kB] 1758s Get:57 http://ftpmaster.internal/ubuntu jammy/main ppc64el libipc-run-perl all 20200505.0-1 [89.8 kB] 1758s Get:58 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 1758s Get:59 http://ftpmaster.internal/ubuntu jammy/main ppc64el libclass-xsaccessor-perl ppc64el 1.19-3build9 [36.6 kB] 1758s Get:60 http://ftpmaster.internal/ubuntu jammy/main ppc64el libb-hooks-op-check-perl ppc64el 0.22-1build5 [10.4 kB] 1758s Get:61 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 1758s Get:62 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdevel-callchecker-perl ppc64el 0.008-1ubuntu4 [14.7 kB] 1758s Get:63 http://ftpmaster.internal/ubuntu jammy/main ppc64el libparams-classify-perl ppc64el 0.015-1build5 [23.9 kB] 1758s Get:64 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmodule-runtime-perl all 0.016-1 [16.2 kB] 1758s Get:65 http://ftpmaster.internal/ubuntu jammy/main ppc64el libimport-into-perl all 1.002005-1 [11.0 kB] 1758s Get:66 http://ftpmaster.internal/ubuntu jammy/main ppc64el librole-tiny-perl all 2.002004-1 [16.3 kB] 1758s Get:67 http://ftpmaster.internal/ubuntu jammy/main ppc64el libsub-quote-perl all 2.006006-1 [19.5 kB] 1758s Get:68 http://ftpmaster.internal/ubuntu jammy/main ppc64el libmoo-perl all 2.005004-3 [48.0 kB] 1758s Get:69 http://ftpmaster.internal/ubuntu jammy/main ppc64el libencode-locale-perl all 1.05-1.1 [11.8 kB] 1758s Get:70 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtimedate-perl all 2.3300-2 [34.0 kB] 1758s Get:71 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-date-perl all 6.05-1 [9920 B] 1759s Get:72 http://ftpmaster.internal/ubuntu jammy/main ppc64el libfile-listing-perl all 6.14-1 [11.2 kB] 1759s Get:73 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tagset-perl all 3.20-4 [12.5 kB] 1759s Get:74 http://ftpmaster.internal/ubuntu jammy/main ppc64el liburi-perl all 5.10-1 [78.8 kB] 1759s Get:75 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-parser-perl ppc64el 3.76-1build2 [93.6 kB] 1759s Get:76 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhtml-tree-perl all 5.07-2 [200 kB] 1759s Get:77 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-html-perl all 1.004-2 [15.4 kB] 1759s Get:78 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 1759s Get:79 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-message-perl all 6.36-1 [76.8 kB] 1759s Get:80 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-cookies-perl all 6.10-1 [18.4 kB] 1759s Get:81 http://ftpmaster.internal/ubuntu jammy/main ppc64el libhttp-negotiate-perl all 6.01-1 [12.5 kB] 1759s Get:82 http://ftpmaster.internal/ubuntu jammy/main ppc64el perl-openssl-defaults ppc64el 5build2 [7540 B] 1759s Get:83 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-ssleay-perl ppc64el 1.92-1build2 [332 kB] 1759s Get:84 http://ftpmaster.internal/ubuntu jammy/main ppc64el libio-socket-ssl-perl all 2.074-2 [192 kB] 1759s Get:85 http://ftpmaster.internal/ubuntu jammy/main ppc64el libnet-http-perl all 6.22-1 [23.2 kB] 1759s Get:86 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 1759s Get:87 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtry-tiny-perl all 0.31-1 [21.8 kB] 1759s Get:88 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-robotrules-perl all 6.02-1 [12.6 kB] 1759s Get:89 http://ftpmaster.internal/ubuntu jammy/main ppc64el libwww-perl all 6.61-1 [141 kB] 1759s Get:90 http://ftpmaster.internal/ubuntu jammy/main ppc64el patchutils ppc64el 0.4.2-1build2 [86.6 kB] 1759s Get:91 http://ftpmaster.internal/ubuntu jammy/main ppc64el wdiff ppc64el 1.2.2-2build3 [29.5 kB] 1759s Get:92 http://ftpmaster.internal/ubuntu jammy/main ppc64el devscripts ppc64el 2.22.1ubuntu1 [1058 kB] 1759s Get:93 http://ftpmaster.internal/ubuntu jammy/main ppc64el liberror-perl all 0.17029-1 [26.5 kB] 1759s Get:94 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 1759s Get:95 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el git ppc64el 1:2.34.1-1ubuntu1.12 [4143 kB] 1759s Get:96 http://ftpmaster.internal/ubuntu jammy/main ppc64el python3-dateutil all 2.8.1-6 [78.4 kB] 1759s Get:97 http://ftpmaster.internal/ubuntu jammy/universe ppc64el git-buildpackage all 0.9.25 [799 kB] 1759s Get:98 http://ftpmaster.internal/ubuntu jammy/main ppc64el libexporter-tiny-perl all 1.002002-1 [36.2 kB] 1759s Get:99 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-xs-perl ppc64el 0.430-2build2 [42.5 kB] 1759s Get:100 http://ftpmaster.internal/ubuntu jammy/main ppc64el liblist-moreutils-perl all 0.430-2 [38.2 kB] 1759s Get:101 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-debian all 0.1.43ubuntu1.1 [107 kB] 1759s Get:102 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el python3-gpg ppc64el 1.16.0-1.2ubuntu4.2 [227 kB] 1759s Get:103 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el dput all 1.1.0ubuntu2.1 [44.7 kB] 1759s Get:104 http://ftpmaster.internal/ubuntu jammy/main ppc64el libjson-perl all 4.04000-1 [81.8 kB] 1759s Get:105 http://ftpmaster.internal/ubuntu jammy/main ppc64el libtext-glob-perl all 0.11-2 [8042 B] 1759s Get:106 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libwww-curl-perl ppc64el 4.17-7build2 [72.5 kB] 1759s Get:107 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libtext-csv-perl all 2.01-1 [108 kB] 1760s Get:108 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit all 9.15 [194 kB] 1760s Get:109 http://ftpmaster.internal/ubuntu jammy/main ppc64el libdbi-perl ppc64el 1.643-3build3 [748 kB] 1760s Get:110 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libdbd-sqlite3-perl ppc64el 1.70-3build1 [172 kB] 1760s Get:111 http://ftpmaster.internal/ubuntu jammy-updates/main ppc64el sqlite3 ppc64el 3.37.2-2ubuntu0.3 [880 kB] 1760s Get:112 http://ftpmaster.internal/ubuntu jammy/universe ppc64el chiark-utils-bin ppc64el 6.1.2+nmu1 [55.7 kB] 1760s Get:113 http://ftpmaster.internal/ubuntu jammy/universe ppc64el dgit-infrastructure all 9.15 [40.8 kB] 1760s Get:114 http://ftpmaster.internal/ubuntu jammy/universe ppc64el libfaketime ppc64el 0.9.8-9 [35.9 kB] 1760s Get:115 http://ftpmaster.internal/ubuntu jammy/universe ppc64el faketime ppc64el 0.9.8-9 [10.3 kB] 1760s Preconfiguring packages ... 1760s Fetched 69.8 MB in 4s (17.4 MB/s) 1761s Selecting previously unselected package m4. 1761s (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 ... 101007 files and directories currently installed.) 1761s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_ppc64el.deb ... 1761s Unpacking m4 (1.4.18-5ubuntu2) ... 1761s Selecting previously unselected package autoconf. 1761s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 1761s Unpacking autoconf (2.71-2) ... 1761s Selecting previously unselected package autotools-dev. 1761s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 1761s Unpacking autotools-dev (20220109.1) ... 1761s Selecting previously unselected package automake. 1761s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 1761s Unpacking automake (1:1.16.5-1.3) ... 1761s Selecting previously unselected package autopoint. 1761s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 1761s Unpacking autopoint (0.21-4ubuntu4) ... 1761s Selecting previously unselected package wamerican. 1761s Preparing to unpack .../005-wamerican_2020.12.07-2_all.deb ... 1761s Unpacking wamerican (2020.12.07-2) ... 1761s Selecting previously unselected package libfl2:ppc64el. 1761s Preparing to unpack .../006-libfl2_2.6.4-8build2_ppc64el.deb ... 1761s Unpacking libfl2:ppc64el (2.6.4-8build2) ... 1761s Selecting previously unselected package bsdgames. 1761s Preparing to unpack .../007-bsdgames_2.17-29_ppc64el.deb ... 1761s Unpacking bsdgames (2.17-29) ... 1761s Selecting previously unselected package libc-dev-bin. 1761s Preparing to unpack .../008-libc-dev-bin_2.35-0ubuntu3.9_ppc64el.deb ... 1761s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 1761s Selecting previously unselected package linux-libc-dev:ppc64el. 1761s Preparing to unpack .../009-linux-libc-dev_5.15.0-136.147_ppc64el.deb ... 1761s Unpacking linux-libc-dev:ppc64el (5.15.0-136.147) ... 1761s Selecting previously unselected package libcrypt-dev:ppc64el. 1761s Preparing to unpack .../010-libcrypt-dev_1%3a4.4.27-1_ppc64el.deb ... 1761s Unpacking libcrypt-dev:ppc64el (1:4.4.27-1) ... 1761s Selecting previously unselected package rpcsvc-proto. 1761s Preparing to unpack .../011-rpcsvc-proto_1.4.2-0ubuntu6_ppc64el.deb ... 1761s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 1761s Selecting previously unselected package libtirpc-dev:ppc64el. 1761s Preparing to unpack .../012-libtirpc-dev_1.3.2-2ubuntu0.1_ppc64el.deb ... 1761s Unpacking libtirpc-dev:ppc64el (1.3.2-2ubuntu0.1) ... 1761s Selecting previously unselected package libnsl-dev:ppc64el. 1761s Preparing to unpack .../013-libnsl-dev_1.3.0-2build2_ppc64el.deb ... 1761s Unpacking libnsl-dev:ppc64el (1.3.0-2build2) ... 1761s Selecting previously unselected package libc6-dev:ppc64el. 1761s Preparing to unpack .../014-libc6-dev_2.35-0ubuntu3.9_ppc64el.deb ... 1761s Unpacking libc6-dev:ppc64el (2.35-0ubuntu3.9) ... 1761s Selecting previously unselected package gcc-11-base:ppc64el. 1761s Preparing to unpack .../015-gcc-11-base_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1761s Unpacking gcc-11-base:ppc64el (11.4.0-1ubuntu1~22.04) ... 1761s Selecting previously unselected package libisl23:ppc64el. 1761s Preparing to unpack .../016-libisl23_0.24-2build1_ppc64el.deb ... 1761s Unpacking libisl23:ppc64el (0.24-2build1) ... 1761s Selecting previously unselected package libmpc3:ppc64el. 1761s Preparing to unpack .../017-libmpc3_1.2.1-2build1_ppc64el.deb ... 1761s Unpacking libmpc3:ppc64el (1.2.1-2build1) ... 1761s Selecting previously unselected package cpp-11. 1761s Preparing to unpack .../018-cpp-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1761s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 1761s Selecting previously unselected package cpp. 1761s Preparing to unpack .../019-cpp_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 1761s Unpacking cpp (4:11.2.0-1ubuntu1) ... 1762s Selecting previously unselected package libcc1-0:ppc64el. 1762s Preparing to unpack .../020-libcc1-0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking libcc1-0:ppc64el (12.3.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package libgomp1:ppc64el. 1762s Preparing to unpack .../021-libgomp1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking libgomp1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package libitm1:ppc64el. 1762s Preparing to unpack .../022-libitm1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking libitm1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package libatomic1:ppc64el. 1762s Preparing to unpack .../023-libatomic1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking libatomic1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package libasan6:ppc64el. 1762s Preparing to unpack .../024-libasan6_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking libasan6:ppc64el (11.4.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package liblsan0:ppc64el. 1762s Preparing to unpack .../025-liblsan0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking liblsan0:ppc64el (12.3.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package libtsan0:ppc64el. 1762s Preparing to unpack .../026-libtsan0_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking libtsan0:ppc64el (11.4.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package libubsan1:ppc64el. 1762s Preparing to unpack .../027-libubsan1_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking libubsan1:ppc64el (12.3.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package libquadmath0:ppc64el. 1762s Preparing to unpack .../028-libquadmath0_12.3.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking libquadmath0:ppc64el (12.3.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package libgcc-11-dev:ppc64el. 1762s Preparing to unpack .../029-libgcc-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking libgcc-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package gcc-11. 1762s Preparing to unpack .../030-gcc-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package gcc. 1762s Preparing to unpack .../031-gcc_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 1762s Unpacking gcc (4:11.2.0-1ubuntu1) ... 1762s Selecting previously unselected package libstdc++-11-dev:ppc64el. 1762s Preparing to unpack .../032-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking libstdc++-11-dev:ppc64el (11.4.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package g++-11. 1762s Preparing to unpack .../033-g++-11_11.4.0-1ubuntu1~22.04_ppc64el.deb ... 1762s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 1762s Selecting previously unselected package g++. 1762s Preparing to unpack .../034-g++_4%3a11.2.0-1ubuntu1_ppc64el.deb ... 1762s Unpacking g++ (4:11.2.0-1ubuntu1) ... 1762s Selecting previously unselected package build-essential. 1762s Preparing to unpack .../035-build-essential_12.9ubuntu3_ppc64el.deb ... 1762s Unpacking build-essential (12.9ubuntu3) ... 1762s Selecting previously unselected package libdebhelper-perl. 1762s Preparing to unpack .../036-libdebhelper-perl_13.6ubuntu1_all.deb ... 1762s Unpacking libdebhelper-perl (13.6ubuntu1) ... 1762s Selecting previously unselected package libtool. 1762s Preparing to unpack .../037-libtool_2.4.6-15build2_all.deb ... 1762s Unpacking libtool (2.4.6-15build2) ... 1762s Selecting previously unselected package dh-autoreconf. 1762s Preparing to unpack .../038-dh-autoreconf_20_all.deb ... 1762s Unpacking dh-autoreconf (20) ... 1762s Selecting previously unselected package libarchive-zip-perl. 1762s Preparing to unpack .../039-libarchive-zip-perl_1.68-1_all.deb ... 1762s Unpacking libarchive-zip-perl (1.68-1) ... 1763s Selecting previously unselected package libsub-override-perl. 1763s Preparing to unpack .../040-libsub-override-perl_0.09-2_all.deb ... 1763s Unpacking libsub-override-perl (0.09-2) ... 1763s Selecting previously unselected package libfile-stripnondeterminism-perl. 1763s Preparing to unpack .../041-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 1763s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 1763s Selecting previously unselected package dh-strip-nondeterminism. 1763s Preparing to unpack .../042-dh-strip-nondeterminism_1.13.0-1_all.deb ... 1763s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 1763s Selecting previously unselected package debugedit. 1763s Preparing to unpack .../043-debugedit_1%3a5.0-4build1_ppc64el.deb ... 1763s Unpacking debugedit (1:5.0-4build1) ... 1763s Selecting previously unselected package dwz. 1763s Preparing to unpack .../044-dwz_0.14-1build2_ppc64el.deb ... 1763s Unpacking dwz (0.14-1build2) ... 1763s Selecting previously unselected package gettext. 1763s Preparing to unpack .../045-gettext_0.21-4ubuntu4_ppc64el.deb ... 1763s Unpacking gettext (0.21-4ubuntu4) ... 1763s Selecting previously unselected package intltool-debian. 1763s Preparing to unpack .../046-intltool-debian_0.35.0+20060710.5_all.deb ... 1763s Unpacking intltool-debian (0.35.0+20060710.5) ... 1763s Selecting previously unselected package po-debconf. 1763s Preparing to unpack .../047-po-debconf_1.0.21+nmu1_all.deb ... 1763s Unpacking po-debconf (1.0.21+nmu1) ... 1763s Selecting previously unselected package debhelper. 1763s Preparing to unpack .../048-debhelper_13.6ubuntu1_all.deb ... 1763s Unpacking debhelper (13.6ubuntu1) ... 1763s Selecting previously unselected package libfakeroot:ppc64el. 1763s Preparing to unpack .../049-libfakeroot_1.28-1ubuntu1_ppc64el.deb ... 1763s Unpacking libfakeroot:ppc64el (1.28-1ubuntu1) ... 1763s Selecting previously unselected package fakeroot. 1763s Preparing to unpack .../050-fakeroot_1.28-1ubuntu1_ppc64el.deb ... 1763s Unpacking fakeroot (1.28-1ubuntu1) ... 1763s Selecting previously unselected package libfile-dirlist-perl. 1763s Preparing to unpack .../051-libfile-dirlist-perl_0.05-2_all.deb ... 1763s Unpacking libfile-dirlist-perl (0.05-2) ... 1763s Selecting previously unselected package libfile-which-perl. 1763s Preparing to unpack .../052-libfile-which-perl_1.23-1_all.deb ... 1763s Unpacking libfile-which-perl (1.23-1) ... 1763s Selecting previously unselected package libfile-homedir-perl. 1763s Preparing to unpack .../053-libfile-homedir-perl_1.006-1_all.deb ... 1763s Unpacking libfile-homedir-perl (1.006-1) ... 1763s Selecting previously unselected package libfile-touch-perl. 1763s Preparing to unpack .../054-libfile-touch-perl_0.12-1_all.deb ... 1763s Unpacking libfile-touch-perl (0.12-1) ... 1763s Selecting previously unselected package libio-pty-perl. 1763s Preparing to unpack .../055-libio-pty-perl_1%3a1.15-2build2_ppc64el.deb ... 1763s Unpacking libio-pty-perl (1:1.15-2build2) ... 1763s Selecting previously unselected package libipc-run-perl. 1763s Preparing to unpack .../056-libipc-run-perl_20200505.0-1_all.deb ... 1763s Unpacking libipc-run-perl (20200505.0-1) ... 1763s Selecting previously unselected package libclass-method-modifiers-perl. 1763s Preparing to unpack .../057-libclass-method-modifiers-perl_2.13-1_all.deb ... 1763s Unpacking libclass-method-modifiers-perl (2.13-1) ... 1763s Selecting previously unselected package libclass-xsaccessor-perl. 1763s Preparing to unpack .../058-libclass-xsaccessor-perl_1.19-3build9_ppc64el.deb ... 1763s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 1763s Selecting previously unselected package libb-hooks-op-check-perl. 1763s Preparing to unpack .../059-libb-hooks-op-check-perl_0.22-1build5_ppc64el.deb ... 1763s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 1763s Selecting previously unselected package libdynaloader-functions-perl. 1763s Preparing to unpack .../060-libdynaloader-functions-perl_0.003-1.1_all.deb ... 1763s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 1763s Selecting previously unselected package libdevel-callchecker-perl. 1763s Preparing to unpack .../061-libdevel-callchecker-perl_0.008-1ubuntu4_ppc64el.deb ... 1763s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 1763s Selecting previously unselected package libparams-classify-perl. 1763s Preparing to unpack .../062-libparams-classify-perl_0.015-1build5_ppc64el.deb ... 1763s Unpacking libparams-classify-perl (0.015-1build5) ... 1763s Selecting previously unselected package libmodule-runtime-perl. 1763s Preparing to unpack .../063-libmodule-runtime-perl_0.016-1_all.deb ... 1763s Unpacking libmodule-runtime-perl (0.016-1) ... 1763s Selecting previously unselected package libimport-into-perl. 1763s Preparing to unpack .../064-libimport-into-perl_1.002005-1_all.deb ... 1763s Unpacking libimport-into-perl (1.002005-1) ... 1763s Selecting previously unselected package librole-tiny-perl. 1763s Preparing to unpack .../065-librole-tiny-perl_2.002004-1_all.deb ... 1763s Unpacking librole-tiny-perl (2.002004-1) ... 1763s Selecting previously unselected package libsub-quote-perl. 1763s Preparing to unpack .../066-libsub-quote-perl_2.006006-1_all.deb ... 1763s Unpacking libsub-quote-perl (2.006006-1) ... 1763s Selecting previously unselected package libmoo-perl. 1763s Preparing to unpack .../067-libmoo-perl_2.005004-3_all.deb ... 1763s Unpacking libmoo-perl (2.005004-3) ... 1763s Selecting previously unselected package libencode-locale-perl. 1763s Preparing to unpack .../068-libencode-locale-perl_1.05-1.1_all.deb ... 1763s Unpacking libencode-locale-perl (1.05-1.1) ... 1763s Selecting previously unselected package libtimedate-perl. 1763s Preparing to unpack .../069-libtimedate-perl_2.3300-2_all.deb ... 1763s Unpacking libtimedate-perl (2.3300-2) ... 1763s Selecting previously unselected package libhttp-date-perl. 1763s Preparing to unpack .../070-libhttp-date-perl_6.05-1_all.deb ... 1763s Unpacking libhttp-date-perl (6.05-1) ... 1763s Selecting previously unselected package libfile-listing-perl. 1763s Preparing to unpack .../071-libfile-listing-perl_6.14-1_all.deb ... 1763s Unpacking libfile-listing-perl (6.14-1) ... 1763s Sel