On 14/11/17 22:47, Guido Günther wrote: > Hi, > > This wired and I wouldn't expect uncommitted changes but since I don't > know about your setup and what you're doing (the upstream repo > e.g. already has the version you're trying to import) you'd have to > provide better instructions to reproduce and tell me what you actually > think is wrong. With git-buildpackage 0.8.12.2 in Stretch, if I take Debian's guitarix up until 0.35.6, I can do
gbp --import-orig --uscan --merge-mode=replace and it will correctly import the new 0.36.0 upstream version, merge it to master and preserve the already existing contents at debian/*. With git-buildpackage 0.9.2 (today in Testing and Unstable), doing the same will overwrite the contents at debian/* with upstream sources, contrary to what --merge-mode=replace should do. Sadly I wanted to keep working on guitarix and submit a new upload, so I already committed 0.36.0 to the guitarix repo at https://anonscm.debian.org/cgit/pkg-multimedia/guitarix.git/ . > Can you reproduce this with other packages? I tried to reproduce it with git-buildpackage 0.9.1 against python-pyo and lv2proc packages, and it worked fine. So if you see no problem on gbp output as said, feel free to close the bug. Maybe it was a fluke caused by several people working in guitarix's repo. -- Víctor Cuadrado Juan m...@viccuad.me PGP key ID: 4096R: 0xA2591E231E251F36 Key fingerprint: E3C5 114C 0C5B 4C49 BA03 0991 A259 1E23 1E25 1F36 My signed E-Mails are trustworthy.
signature.asc
Description: OpenPGP digital signature
