comparison en/ch05-collab.xml @ 773:3b640272a966

Progres on resolve
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 12 Apr 2009 00:05:30 -0700
parents b338f5490029
children e6c99cbd0abd 83540574ee49
comparison
equal deleted inserted replaced
772:dbe5f4bb6507 773:3b640272a966
21 the history of a repository, examine each change (comments and 21 the history of a repository, examine each change (comments and
22 diffs), and view the contents of each directory and file.</para> 22 diffs), and view the contents of each directory and file.</para>
23 23
24 <para id="x_44d">Also for human consumption, the web interface provides an 24 <para id="x_44d">Also for human consumption, the web interface provides an
25 RSS feed of the changes in a repository. This lets you 25 RSS feed of the changes in a repository. This lets you
26 <quote>subscribe</quote> to a repository using your favourite 26 <quote>subscribe</quote> to a repository using your favorite
27 feed reader, and be automatically notified of activity in that 27 feed reader, and be automatically notified of activity in that
28 repository as soon as it happens. I find this capability much 28 repository as soon as it happens. I find this capability much
29 more convenient than the model of subscribing to a mailing list 29 more convenient than the model of subscribing to a mailing list
30 to which notifications are sent, as it requires no additional 30 to which notifications are sent, as it requires no additional
31 configuration on the part of whoever is serving the 31 configuration on the part of whoever is serving the
107 situations.</para> 107 situations.</para>
108 108
109 <para id="x_456">As one example, many projects have a loose-knit group of 109 <para id="x_456">As one example, many projects have a loose-knit group of
110 collaborators who rarely physically meet each other. Some 110 collaborators who rarely physically meet each other. Some
111 groups like to overcome the isolation of working at a distance 111 groups like to overcome the isolation of working at a distance
112 by organising occasional <quote>sprints</quote>. In a sprint, 112 by organizing occasional <quote>sprints</quote>. In a sprint,
113 a number of people get together in a single location (a 113 a number of people get together in a single location (a
114 company's conference room, a hotel meeting room, that kind of 114 company's conference room, a hotel meeting room, that kind of
115 place) and spend several days more or less locked in there, 115 place) and spend several days more or less locked in there,
116 hacking intensely on a handful of projects.</para> 116 hacking intensely on a handful of projects.</para>
117 117
284 284
285 </sect2> 285 </sect2>
286 <sect2> 286 <sect2>
287 <title>The release train</title> 287 <title>The release train</title>
288 288
289 <para id="x_46c">Some projects are organised on a <quote>train</quote> 289 <para id="x_46c">Some projects are organized on a <quote>train</quote>
290 basis: a release is scheduled to happen every few months, and 290 basis: a release is scheduled to happen every few months, and
291 whatever features are ready when the <quote>train</quote> is 291 whatever features are ready when the <quote>train</quote> is
292 ready to leave are allowed in.</para> 292 ready to leave are allowed in.</para>
293 293
294 <para id="x_46d">This model resembles working with feature branches. The 294 <para id="x_46d">This model resembles working with feature branches. The