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
> 
>  * branch            upstream   -> 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

Attachment: 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

Reply via email to