Hi, On Fri, Feb 22, 2019 at 12:54:22AM +0000, llu...@autistici.org wrote: > Now that my system is working properly I propose a solution for the > repository. It is based in git-revert the three branches (debian/master, > upstream and pristine-tar) and invoke gbp import-orig with option > --upstream-tag=upstream/0.3.8-aux. I paste a log of my proposal. > > Do you think it is adequate/correct? > > $ gbp clone g...@salsa.debian.org:python-team/applications/visualequation.git > gbp:info: Cloning from > 'g...@salsa.debian.org:python-team/applications/visualequation.git' > $ cd visualequation/ > (debian/master)]$ git revert HEAD > [debian/master 99ea7ee] Revert "Adding patches" > 3 files changed, 524 deletions(-) > delete mode 100644 > debian/patches/0001-Imported-Upstream-version-0.3.8.patch > delete mode 100644 > debian/patches/0002-modifying-d-changelog-for-new-upstream-release.patch > delete mode 100644 debian/patches/series > (debian/master)]$ git checkout upstream > Switched to branch 'upstream' > Your branch is up-to-date with 'origin/upstream'. > (upstream)]$ git revert HEAD
The last commits in upstream and pristine-tar branches look fine, no need to revert them. Just revert the last commit in debian/master (as you did above), then merge upstream/0.3.8 tag into debian/master and update the changelog. It should be enough. -- Dmitry Shachnev
signature.asc
Description: PGP signature
