Bug#900781: git-buildpackage: import-orig does 'reset --hard' at then end, voiding the previously run 'pq import'

2021-08-13 Thread Guido Günther
Hi, On Tue, Jun 05, 2018 at 02:42:50PM +0200, Julien Muchembled wrote: > Le 06/05/18 à 14:20, Guido Günther a écrit : > > Does this work as you'd expect it: > > > > $ gbp clone g...@salsa.debian.org:python-team/modules/zc-lockfile.git > > $ gbp pq import > > $ git co debian/master > > $ gbp

Bug#900781: git-buildpackage: import-orig does 'reset --hard' at then end, voiding the previously run 'pq import'

2018-06-05 Thread Guido Günther
Hi, On Tue, Jun 05, 2018 at 02:42:50PM +0200, Julien Muchembled wrote: > Le 06/05/18 à 14:20, Guido Günther a écrit : > > Does this work as you'd expect it: > > > > $ gbp clone g...@salsa.debian.org:python-team/modules/zc-lockfile.git > > $ gbp pq import > > $ git co debian/master > > $ gbp

Bug#900781: git-buildpackage: import-orig does 'reset --hard' at then end, voiding the previously run 'pq import'

2018-06-05 Thread Julien Muchembled
Le 06/05/18 à 14:20, Guido Günther a écrit : > Does this work as you'd expect it: > > $ gbp clone g...@salsa.debian.org:python-team/modules/zc-lockfile.git > $ gbp pq import > $ git co debian/master > $ gbp import-orig >

Bug#900781: git-buildpackage: import-orig does 'reset --hard' at then end, voiding the previously run 'pq import'

2018-06-05 Thread Guido Günther
Hi, On Tue, Jun 05, 2018 at 12:22:59PM +0200, Julien Muchembled wrote: > $ gbp clone g...@salsa.debian.org:python-team/modules/zc-lockfile.git > gbp:info: Cloning from > 'g...@salsa.debian.org:python-team/modules/zc-lockfile.git' > $ cd zc-lockfile > $ git branch > * debian/master >

Bug#900781: git-buildpackage: import-orig does 'reset --hard' at then end, voiding the previously run 'pq import'

2018-06-05 Thread Julien Muchembled
$ gbp clone g...@salsa.debian.org:python-team/modules/zc-lockfile.git gbp:info: Cloning from 'g...@salsa.debian.org:python-team/modules/zc-lockfile.git' $ cd zc-lockfile $ git branch * debian/master pristine-tar upstream $ gbp pq import gbp:info: Trying to apply patches at

Bug#900781: git-buildpackage: import-orig does 'reset --hard' at then end, voiding the previously run 'pq import'

2018-06-04 Thread Guido Günther
Hi, On Mon, Jun 04, 2018 at 10:00:23PM +0200, Julien Muchembled wrote: > Package: git-buildpackage > Version: 0.9.9 > Severity: normal > Tags: upstream > > Both the git-buildpackage documentation and > https://wiki.debian.org/Python/GitPackagingPQ > > invite the user to first run 'gbp pq

Bug#900781: git-buildpackage: import-orig does 'reset --hard' at then end, voiding the previously run 'pq import'

2018-06-04 Thread Julien Muchembled
Package: git-buildpackage Version: 0.9.9 Severity: normal Tags: upstream Both the git-buildpackage documentation and https://wiki.debian.org/Python/GitPackagingPQ invite the user to first run 'gbp pq import' before using 'import-orig'. However, since the 'replace' merge mode, which is