On Mon, May 21, 2012 at 3:28 AM, Brian May
<br...@microcomaustralia.com.au> wrote:
> On 16 May 2012 19:45, Bastien ROUCARIES <roucaries.bast...@gmail.com> wrote:
>> You could use gitpkg with a quilt export hook. i use it regularly with
>> imagemagick and it work perfectly (it is gitpkg over git over svn).
>
> Out of curiosity, how do you use that and not have it include changes
> to debian/* ? That appeared to me my problem trying to use this
> method. Especially as some of my git commits change files both inside
> and outside debian/*
Ok step for imagemagick
1. git svn fetch #retrieve recent svn commit
2. git checkout 9682bf563240ad971717554bab3f69f7252767f5 # git
revision for svn commit 7980 aka version 6.7.7.0
3. git checkout -b upstream/6.7.7.0 # create an upstream branch for
revision 6.7.7.0
4. rm -rf * # clean up directory tree
5. tar --strip 1 -xaf ../imagemagick_6.7.7.0.orig.tar.bz2 # extract origin
6. git add . # add everything
7. git commit -a -m "add uptream tar.bz2"
8. pristine-tar commit ../imagemagick_6.7.7.0.orig.tar.bz2
upstream/6.7.7.0 # use pristine tar
9. git checkout -b debian-patches/6.7.7.0-1
10. git checkout -b debian/6.7.7.0-1 # create new debian branch
11. git checkout debian/6.7.6.8-1 # checkout previous debian tree
12. git merge --no-commit upstream/6.7.7.0 # merge but without commiting
13. find ./* -path './debian' -prune -o -path './.git' -prune -o
-exec rm -rf '{}' + # remove all except debian and git
14. tar --strip 1 -xaf ../imagemagick_6.7.7.0.orig.tar.bz2 # use upstream
15. git add .
16. git commit -a -m 'merge with upstream' # emulate git theirs but safer
now do your change on debian on debian/6.7.7.0-1 branch and change on
other directory on debian-patches/6.7.7.0-1 (you could use cherry
pick for back port of upstream or reusing previous patch queue)
Bastien
> Thanks
> --
> Brian May <br...@microcomaustralia.com.au>
>
>
> --
> To UNSUBSCRIBE, email to debian-devel-requ...@lists.debian.org
> with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
> Archive:
> http://lists.debian.org/CAA0ZO6DTeHx4Jve6RR=yns9zzt5j91ftx3bxodstogtvfnz...@mail.gmail.com
>
--
To UNSUBSCRIBE, email to debian-devel-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/cae2spaamxrxh3pbgribb3xf750s2y4kbgfzb59nhpezjolo...@mail.gmail.com
