Package: git-dpm Version: 0.9.1-1 Severity: normal -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
Dear Maintainer, To update to a new upstream release, I do this: $ git-dpm import-new-upstream --ptc --rebase-patched ../foo.orig.tar.gz Normally, if the patches rebase cleanly, everything is fine. However, if there are merge conflicts during rebase, you have to of course manually resolve them, followed by git add and git rebase --continue. Once all that's done and your patched branch is looking good, a git-dpm u-p will get you back on master, but the pristine-tar commit will *not* have happened. It's as if --ptc is ignored when - --rebase-patched inflicts merge conflicts. You can fix this manually with $ pristine-tar commit ../foo.orig.tar but you have to remember to do this, and if you don't you have the potential of messing up your master branch. In my case, quilt saw fuzz in the patch and there was no way to fix it. Checking out the patched branch and re-editing the file doesn't help, and neither does quilt refresh in master, nor rebasing patched against upstream. - -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 4.0.0-1-amd64 (SMP w/1 CPU core) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages git-dpm depends on: ii dpkg-dev 1.18.1 ii git 1:2.1.4-2.1 Versions of packages git-dpm recommends: ii bzip2 1.0.6-8 ii devscripts 2.15.4 ii sensible-utils 0.0.9 ii xz-utils 5.1.1alpha+20120614-2+b3 Versions of packages git-dpm suggests: ii pristine-tar 1.33 ii sharutils 1:4.15.1-1 - -- no debconf information -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJVbfVfAAoJEBJutWOnSwa/YZ8P/1TSTIqpbdl2G5w6FDYojwPg NABoTIkx5Itje0dASK4IguQsWkBiifShSEqvDv13XFNifaIgmK0hoHNET3tU8abu ewn2fFOCjSydXxmWf+qonE2XN0FwtR44QDDNmye+JL7vdCr44pWO57TZPKV2TWfu fEexTv9gSHOupjWRIrdJ4OQpKLuXPP/ixcB0ZZZluL/6Vu/hjmafGVmvPcf7o+fX Q277ZZT6A5+9Q/A5JfIAIU2cTuXLCJ8OQ0qCH3tldiS8TssgndUBokpQULk7q7y3 o1tQ3xRoVwavUku3FeUpBVvwZEE00RtJvYcS8gfJhUvh279pnVCdKA6oohqxz2ew vO4Vn5t6r7Br0+oMpKWoBRQDiVfIUbSiPWhgda5JeqWB0CbyMuL4dyJhoy1S3FnN LTTj6IaU3PPtMsz51YP6i8eQIXbx181M5hq/h3meuipFXliCyq5nvW3NrDpWbqF8 PAIsvPKovvQq7mKWPmNH6QO6V4fylv62KufbzPkRSu5JNR33TXqAWcm/OL39hs8F fUHbZjC8+ebClee8u527ZXJ48XMxVVeBzbHG6pU4VrMKQUEnS/H8KXL9csV2MbCa AYqgRyEkTu4EAbFYUSKd00JqYp79Dgy5Xw1/BaMYIbhzoUmN+0FXKLSvnuBxPOh7 aMA0ofW39uCIlmTfAMM4 =tae7 -----END PGP SIGNATURE----- -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
