On 10/22/2015 05:34 PM, Jeremy Lainé wrote: > Hi all, > > I had not followed the transition to git too closely and had assumed the > new repos were to be managed with git-buildpackage. So I imported a new > upstream version of python-netfilter using git-buildpackage, only to > realise I am supposed to use git-dpm. Now my repo is in a state which > git-dpm cannot handle.. Any ideas how to roll back to a sane state? > Could the repo be reset to its state post SVN conversion? > > Jeremy >
I would make a copy of screwed up repository and try to rollback to the previous version in all branches by using git reset --hard HEAD^ How did you import the new upstream ? with gbp import-orig ? Regards, Alex
