Mercurial > hgbook
comparison en/ch06-collab.xml @ 739:a13813534ccd
Fix all xref to figs
| author | Dongsheng Song <dongsheng.song@gmail.com> |
|---|---|
| date | Tue, 17 Mar 2009 10:43:45 +0800 |
| parents | cfdb601a3c8b |
| children | d0160b0b1a9e |
comparison
equal
deleted
inserted
replaced
| 738:1a3d882149fd | 739:a13813534ccd |
|---|---|
| 269 <quote>master</quote> branch used by the entire project. | 269 <quote>master</quote> branch used by the entire project. |
| 270 People working on an individual branch are typically quite | 270 People working on an individual branch are typically quite |
| 271 isolated from developments on other branches.</para> | 271 isolated from developments on other branches.</para> |
| 272 | 272 |
| 273 <informalfigure id="fig.collab.feature-branches"> | 273 <informalfigure id="fig.collab.feature-branches"> |
| 274 <mediaobject><imageobject><imagedata | 274 <mediaobject> |
| 275 fileref="images/feature-branches.png"/></imageobject><textobject><phrase>XXX | 275 <imageobject><imagedata fileref="images/feature-branches.png"/> |
| 276 add text</phrase></textobject><caption><para>Feature | 276 </imageobject> |
| 277 branches</para></caption></mediaobject> | 277 <textobject><phrase>XXX add text</phrase></textobject> |
| 278 <caption><para id="fig.collab.feature-branches.caption">Feature | |
| 279 branches</para></caption> | |
| 280 </mediaobject> | |
| 278 </informalfigure> | 281 </informalfigure> |
| 279 | 282 |
| 280 <para>When a particular feature is deemed to be in suitable | 283 <para>When a particular feature is deemed to be in suitable |
| 281 shape, someone on that feature team pulls and merges from the | 284 shape, someone on that feature team pulls and merges from the |
| 282 master branch into the feature branch, then pushes back up to | 285 master branch into the feature branch, then pushes back up to |