Bug#642194: support for flowing debian branches

[Holger Levsen]

package: git-flow
severity: wishlist

Hi,

h01ger algernon, i have a git-flow question regarding debian branches...: 
develop, release/* and master is all handy+dandy, but how do you treat your 
debian branch/es(?) with it? do you have _one_ debian branch for all the flow 
branches or do you create debian/develop and debian/release/foo and 
debian/master branches?
algernon h01ger: at the moment, I only use a single debian branch for all my 
projects, because the packaging is quite trivial.
algernon h01ger: I'd use debian/develop  co, if I'd maintain backports, or 
would introduce larger changes to the packaging

h01ger algernon, hmmm. i can see now how to cycle through existing debian/* 
branches based on release/* branches to pick the right match automatically 
when triggered... :)
h01ger nice. thanks!
h01ger algernon, does git flow support flowing in debian/* branches too?
algernon [05:16:44] h01ger: afaik, it only supports either upstream flowing, 
OR debian/ flowing, not both at the same time.
algernon [05:17:40] h01ger: it stores its config in .git/config, so, unless 
you use two clones, it's either or, but not both
h01ger algernon, thats what i thought. git dflow or such could be made 
working...
algernon h01ger: please file a wishlist bug, and I'll see if I can figure 
out something

algernon the first thing that comes to mind is to teach git-flow to look for 
git-flow-$ext in the config too, so when one symlinks it to, say, git-flow-
debian, then git flow debian $blah will DTRT, and pick out its settings from 
the git-flow-debian section of .git/config
algernon this would be reasonably clean and easy to implement and push 
upstream, I think.
h01ger where blah=release,feature,etc?
h01ger algernon, mind if i just copy+paste these lines here into the bug 
report?
algernon h01ger: yeah, where blah=release,feature,etc; and go ahead!

Thanks for maintaining git-flow!


cheers,
Holger



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#642194: support for flowing debian branches

[Gergely Nagy]

tag 642194 + upstream pending
forwarded 642194 https://github.com/nvie/gitflow/issues/154
thanks

Hi!

The idea sounded so easy and tempting, that I went ahead and coded
it. It's available from my git repo[1], on the feature/config-alias
branch (also merged into the debian branch, which has been appropriately
updated), if you want to take it for a test ride.

I'll try to run it through upstream too, so the upload to unstable might
take a little while (though, if I get no response within two weeks, I'll
probably go ahead and upload it anyway).

 [1]: debcheckout git-flow

-- 
|8]




-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#642194: support for flowing debian branches

[Gergely Nagy]

 The idea sounded so easy and tempting, that I went ahead and coded
 it. It's available from my git repo[1], on the feature/config-alias
 branch (also merged into the debian branch, which has been appropriately
 updated), if you want to take it for a test ride.

Right! I only left out how to use it!

$ git config alias.dflow !GIT_FLOW_SELF=git-flow-debian git flow
$ git flow init  # To set up upstream workflow
$ git dflow init # To set up debian workflow

-- 
|8]




-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org