On Fri, Apr 27, 2012 at 12:30:12PM +0200, Raphaël Hertzog wrote:
> Package: git-buildpackage
> Version: 0.6.0~git20120415
> Severity: wishlist
>
> Sometimes I'd like to maintain a local fork of an official Debian package.
> So I use git-import-dsc to import it in a git repository and maintain it
> with git-buildpackage.
>
> Now there's a new upstream version that has been packaged by Debian and I
> want to update my local fork. git-import-dsc offers me no way to do this,
> it will always overwrite my local changes.
>
> Instead I have to use "git-import-dsc --debian-branch=debian" to maintain
> a clean history of the debian changes and then merge this branch in my
> local branch.
>
> It would be nice if this workflow could be officially supported by
> git-buildpackage either with a new command:
>
> $ git-sync-package <git-import-dsc options>
>
> It would ensure that the .dsc is a newer version of the external package
> that is tracked. The default branch used for this tool would be
> something like "upstream-%(vendor)" with vendor being "distribution" by
> default.
> Both should be configurable with a command line option.
>
> With an --import option, it would only update the upstream-distro
> branch and not merge the result.
I do see the need for this although It might be preferable to add this
to git-import-dsc itself.
>
>
> PS: I would suggest to rename "--(git-)?debian-* to --(git-)?vendor-*"
> it would be less confusing when git-buildpackage is used in a derivative
> tracking debian...
The plan is to call this the packaging branch:
https://github.com/marquiz/git-buildpackage-rpm/commit/5555df9c6a155922c7f3d0ad99dccb9c69f14df5
Cheers,
-- Guido
>
> -- System Information:
> Debian Release: wheezy/sid
> APT prefers stable-updates
> APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500,
> 'unstable'), (500, 'testing'), (500, 'stable'), (150, 'experimental')
> Architecture: i386 (x86_64)
>
> Kernel: Linux 3.2.0-2-amd64 (SMP w/2 CPU cores)
> Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
>
> Versions of packages git-buildpackage depends on:
> ii devscripts 2.11.6
> ii git 1:1.7.10-1
> ii python 2.7.2-10
> ii python-dateutil 1.5-1
> ii python2.6 2.6.7-4
> ii python2.7 2.7.3~rc2-2.1
>
> Versions of packages git-buildpackage recommends:
> ii cowbuilder 0.69
> ii pristine-tar 1.24
>
> Versions of packages git-buildpackage suggests:
> ii python-notify 0.1.1-3
> ii unzip 6.0-6
>
> -- no debconf information
>
>
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
