projects / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| 7c673cae FG |
1 | <html> |
| 2 | <head> | |
| 3 | <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> | |
| 4 | <title>Method in use</title> | |
| 5 | <link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css"> | |
| 6 | <meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> | |
| 7 | <link rel="home" href="../../index.html" title="Chapter 1. Phoenix 3.2.0"> | |
| 8 | <link rel="up" href="../maintenance.html" title="Maintenance"> | |
| 9 | <link rel="prev" href="my_understanding_of_how_maintenance_works.html" title="My Understanding of how maintenance works"> | |
| 10 | <link rel="next" href="experience.html" title="Experience"> | |
| 11 | </head> | |
| 12 | <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> | |
| 13 | <table cellpadding="2" width="100%"><tr> | |
| 14 | <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td> | |
| 15 | <td align="center"><a href="../../../../../../index.html">Home</a></td> | |
| 16 | <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td> | |
| 17 | <td align="center"><a href="http://www.boost.org/users/people.html">People</a></td> | |
| 18 | <td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td> | |
| 19 | <td align="center"><a href="../../../../../../more/index.htm">More</a></td> | |
| 20 | </tr></table> | |
| 21 | <hr> | |
| 22 | <div class="spirit-nav"> | |
| 23 | <a accesskey="p" href="my_understanding_of_how_maintenance_works.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../maintenance.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="experience.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a> | |
| 24 | </div> | |
| 25 | <div class="section"> | |
| 26 | <div class="titlepage"><div><div><h3 class="title"> | |
| 27 | <a name="phoenix.maintenance.method_in_use"></a><a class="link" href="method_in_use.html" title="Method in use">Method in use</a> | |
| 28 | </h3></div></div></div> | |
| 29 | <div class="itemizedlist"><ul class="itemizedlist" type="disc"> | |
| 30 | <li class="listitem"> | |
| 31 | I have been using the <a href="http://nvie.com/posts/a-successful-git-branching-model/" target="_top">git | |
| 32 | branching model</a> to maintain the Boost Phoenix. | |
| 33 | </li> | |
| 34 | <li class="listitem"> | |
| 35 | I have been making most of the changes on branch develop or on branches | |
| 36 | from it. | |
| 37 | <div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"> | |
| 38 | I test the changes on the develop branch. | |
| 39 | </li></ul></div> | |
| 40 | </li> | |
| 41 | <li class="listitem"> | |
| 42 | When I want to move things from develop to master I first branch from | |
| 43 | develop a new branch which I give a version number of my own within Phoenix. | |
| 44 | <div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"> | |
| 45 | I can then test that before merging it into master. | |
| 46 | </li></ul></div> | |
| 47 | </li> | |
| 48 | <li class="listitem"> | |
| 49 | I now also have a separate branch for developing and testing documentation | |
| 50 | changes. | |
| 51 | <div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"> | |
| 52 | I move selected changes from documentation onto the develop branch | |
| 53 | and then onto master branch. | |
| 54 | </li></ul></div> | |
| 55 | </li> | |
| 56 | </ul></div> | |
| 57 | </div> | |
| 58 | <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr> | |
| 59 | <td align="left"></td> | |
| 60 | <td align="right"><div class="copyright-footer">Copyright © 2002-2005, 2010, 2014, 2015 Joel de Guzman, Dan Marsden, Thomas | |
| 61 | Heller, John Fletcher<p> | |
| 62 | Distributed under the Boost Software License, Version 1.0. (See accompanying | |
| 63 | file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>) | |
| 64 | </p> | |
| 65 | </div></td> | |
| 66 | </tr></table> | |
| 67 | <hr> | |
| 68 | <div class="spirit-nav"> | |
| 69 | <a accesskey="p" href="my_understanding_of_how_maintenance_works.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../maintenance.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="experience.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a> | |
| 70 | </div> | |
| 71 | </body> | |
| 72 | </html> |