Re: [Git-dpm-user] import new .dsc complains upstream not uptodate
* Paul Elliott [120402 05:05]: > When I try to import new .dsc file it complains upstream exists and is not > uptodate. But the results of pull --rebase show it is uptodate! I see there is a bug in the code that it considers it out-of-date even if it is not (unless there are no patches). You can just delete the git branch 'upstream' and do a import-dsc. (Once the upstream branch is properly recorded in master:debian/.git-dpm the upstream branch is not needed by git-dpm and is only there to help the user, git-dpm import-dsc should delete the upstream branch unless it is not the expected value (but that check seems to have a bug...)). Bernhard R. Link ___ Git-dpm-user mailing list Git-dpm-user@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/git-dpm-user
[Git-dpm-user] import new .dsc complains upstream not uptodate
I created a package with import-dsc --ptc Made a lot of modifications to it. I then found out I needed to create a dfsg package. I created dfsg package externally to git-dpm using current as starting point. New package has a complete new tarball with new name! When I try to import new .dsc file it complains upstream exists and is not uptodate. But the results of pull --rebase show it is uptodate! How do I import a new .dfsg package without deleting previous history? Help! > pelliott@hrnowl:/home/pelliott/develop/git/pyswisseph/pyswisseph.git$ git > pull --rebase origin upstream From > ssh://git.debian.org/git/collab-maint/pyswisseph > > * branchupstream -> FETCH_HEAD > > Current branch upstream is up to date. > pelliott@hrnowl:/home/pelliott/develop/git/pyswisseph/pyswisseph.git$ git > checkout master Switched to branch 'master' > pelliott@hrnowl:/home/pelliott/develop/git/pyswisseph/pyswisseph.git$ > git-dpm import-dsc --ptc ../mod4/pyswisseph_1.77.00.0+dfsg-1.dsc git-dpm: > ERROR: branch upstream exists and not up to date. Do something against > this first (for example deleting it if you do not care for its contents). -- Paul Elliott 1(512)837-1096 pelli...@blackpatchpanel.com PMB 181, 11900 Metric Blvd Suite J http://www.free.blackpatchpanel.com/pme/ Austin TX 78758-3117 signature.asc Description: This is a digitally signed message part. ___ Git-dpm-user mailing list Git-dpm-user@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/git-dpm-user
