Hi kp, Thanks for the responses.
On Sat, 2014-02-08 at 00:13 +0100, KP Kirchdörfer wrote: > Hi David; > > Am Freitag, 7. Februar 2014, 21:09:32 schrieb David M Brooke: > > Hi leaf-devel, > > > > I've been busy with other things for a while and I haven't had much time > > for LEAF development. However there are a couple of new projects I'm > > doing with LEAF and some of the work is of general interest (though some > > of it probably isn't!). > > > > Since I last did much LEAF development I understand there are some new > > Git working practices as per the Git Workflows wiki page, so I'd like to > > check I understand those before I mess things up. > > > > I've just made a small change to samba for Trac ticket #93. That's a > > small bug-fix, so it belongs in "maint", right? > > Yes. Great btw you fixed it that fast. I did some research before raising the Trac ticket, and then writing the ticket helped me home-in on the likely cause so it was quick to fix. > > > What I did was: > > - Created a new local branch (called "trac#93") based on "maint" > > - Committed the code change against that new branch > > - Merged the bugfix branch back into "maint" (with "--no-ff") > > - Pushed the changes to the origin repo > > - Deleted the local branch "trac#93" > > Was that right? > > To me it looks and is mostly the same as I do. OK, good. > > > I also have a new Package (vnstat) which I'd like to add. That's not a > > bug-fix, so should I create my feature branch off "master" rather than > > "maint"? > > That's the way we intended it. OK, good. One further question - is it better to create the feature branch off the "head" of the "master" branch, or off some previous point on the "master" branch (e.g. the commit tagged with 5.0)? > > kp ------------------------------------------------------------------------------ Androi apps run on BlackBerry 10 Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now. http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
