27.06.2011 00:51, Erich Titl пишет: > Andrew > > on 26.06.2011 23:39, Andrew wrote: >> 27.06.2011 00:18, Erich Titl пишет: >>> Hi KP >>> >>> on 25.06.2011 20:10, KP Kirchdoerfer wrote: >>>> Hi David; >>>> >>> ... >>>> Correct, so git cherry-pick might be a solution for small changes. >>>> I've read it can lead to problems if one merges later, but our intention is >>>> not to merge 4.0-fixes with master. >>> What exactly is this branch for then, sounds like a dead end to me. >>> >> Right. This is for bugfixes of 4.0 version. Because on tagging release >> we freeze versions of all software in it, and no new functional should >> be added, all features that are under development will appear in next >> releases. > But this requires that bugfixes are done reduntantly unless they are > merged with the main branch. > > cheers > > Erich > Yes, patches from commits now are applied mostly manually - due to different dir structure. But possible 'git rebase' on stable branch should be successful - so if changes are placed in stable bugfix branch, master branch (and other branches) can be rebased and changes are merged into it.
------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
