[Git-dpm-user] Is this a workable workflow ?

[Louis Bouchard]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hello everyone,

I'm still exploring the capacities of git-dpm and I have some doubts on the
workflow that I intend to use. Sorry of the long email.

All my upstream commits and debian specific work ends up in my MASTER branch.
I branch out to dev & then rebase or merge. Right now, git-dpm is not used on
that project so the quilt patches are versioned under git.

I was thinking of using "packaging branches" that would hold the git-dpm
history. Something like  :

 $ git checkout master
 $ git checkout -b debian/1.5.7-1
 $ git-dpm init ../tmp/{project}_1.5.7.orig.tar.gz debian/1.5.7-1

My concern is what to do with my debian specific changes that live in MASTER
when I need to bring them in the package ? Just cherry-pick them in the
"packaging branch" ?

Then what if git-dpm creates a quilt patch in one packaging branch : how
should I keep track of this patch in the MASTER branch ? Or should I ?

The intent is to keep the history of the packaging separate from the main
debian development branch but also have the patches in the MASTER branch which
is published.

Does it all make sense or I'm making this too complicated and should simply
apply git-dpm on MASTER ?

Kind regards,

...Louis

- -- 
Louis Bouchard
Software engineer, Cloud & Sustaining eng.
Canonical Ltd
Ubuntu developer                       Debian Maintainer
GPG : 429D 7A3B DD05 B6F8 AF63  B9C4 8B3D 867C 823E 7A61
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJU0PtUAAoJEIs9hnyCPnphXesP/3NAElLvPQnDz5JXf3zLpnmN
tGcCqTCgzxGqfjoRZIGgrDIYOb1C0Tus3ciloSR8fWkWhezOhXFH1nyYs+2QytqU
wsgcH+ly+U+JSK4Ifhn8+uufcyJv4Bz3l8peiSepWud3gkVHA4U4+OUcXd6c9FGj
7H2CvXCXJUvXeH1zp9KvIDP3dffAroNkTVnUXvEYLYfUWYGCkBfXnOQpZBeOS+Bx
U18QK7l+8IjV/ul/XrZ1QvXO2RxHa6gUr3ptkElnClF1Bs9NpoWljUCoSDiwkhIL
VWkuRaQdO1hpiEN+I0JVt8n+3ZOjU9YLRRt4jBcInr6gG3j6YbgP7BBlzYBJrmtL
5I0zEIsvKhU3Nt0ZdeljQLEZR9CWDIDpw76w1T3SqEZHFMjKwzQcDyoyJIjTElLw
1IcvS8u8kv6DLWfVWjjAjbKfd9t+s4dHk3XAWEekia/vtka1FNs6p32MzWK1p0hm
m/+J6luoiYiIS3zfmZAh1MFnt9IAWkz7uUnERFSkV3FG/cGXE90iGL/mapQQLDRm
tRqBnRYlbK0mEOOVXI3A0NsciLBd/q7vykPGbcOybnB6/Ggj97sbtEnym/twBxKe
Ap54TPTkcH/H2N2JsKvnjtiSOcRtxckkhpS1QtydpDv37k4x4mgKG4BS2KJpAQZk
FO1psH/BWF/AKo8ez7Jj
=WUva
-----END PGP SIGNATURE-----