comparison en/ch06-collab.xml @ 666:8fcd44708f41

Uncomment all the mangled interaction examples.

665:27043f385f3f

	branch will never affect a stable branch unless someone
	explicitly merges those changes in.</para>

      <para>Here's an example of how this can work in practice.  Let's
	say you have one <quote>main branch</quote> on a central
	server. <!-- &interaction.branching.init; --> People clone it,
	make changes locally, test them, and push them back.</para>

      <para>Once the main branch reaches a release milestone, you can
	use the <command role="hg-cmd">hg tag</command> command to
	give a permanent name to the milestone revision. <!--
	&interaction.branching.tag; --> Let's say some ongoing
	development occurs on the main branch. <!--
	&interaction.branching.main; --> Using the tag that was
	recorded at the milestone, people who clone that repository at
	any time in the future can use <command role="hg-cmd">hg
	  update</command> to get a copy of the working directory
	exactly as it was when that tagged revision was committed.
	<!-- &interaction.branching.update; --></para>

      <para>In addition, immediately after the main branch is tagged,
	someone can then clone the main branch on the server to a new
	<quote>stable</quote> branch, also on the server. <!--
	&interaction.branching.clone; --></para>

      <para>Someone who needs to make a change to the stable branch
	can then clone <emphasis>that</emphasis> repository, make
	their changes, commit, and push their changes back there. <!--
	&interaction.branching.stable; --> Because Mercurial
	repositories are independent, and Mercurial doesn't move
	changes around automatically, the stable and main branches are
	<emphasis>isolated</emphasis> from each other.  The changes
	that you made on the main branch don't <quote>leak</quote> to
	the stable branch, and vice versa.</para>

      <para>You'll often want all of your bugfixes on the stable
	branch to show up on the main branch, too.  Rather than
	rewrite a bugfix on the main branch, you can simply pull and
	merge changes from the stable to the main branch, and
	Mercurial will bring those bugfixes in for you. <!--
	&interaction.branching.merge; --> The main branch will still
	contain changes that are not on the stable branch, but it will
	also contain all of the bugfixes from the stable branch.  The
	stable branch remains unaffected by these changes.</para>

    </sect2>
    <sect2>
      <title>Feature branches</title>

666:8fcd44708f41

	branch will never affect a stable branch unless someone
	explicitly merges those changes in.</para>

      <para>Here's an example of how this can work in practice.  Let's
	say you have one <quote>main branch</quote> on a central
	server.</para>

      &interaction.branching.init;

      <para>People clone it, make changes locally, test them, and push
	them back.</para>

      <para>Once the main branch reaches a release milestone, you can
	use the <command role="hg-cmd">hg tag</command> command to
	give a permanent name to the milestone revision.</para>

	&interaction.branching.tag;

      <para>Let's say some ongoing
	development occurs on the main branch.</para>

      &interaction.branching.main;

      <para>Using the tag that was recorded at the milestone, people
	who clone that repository at any time in the future can use
	<command role="hg-cmd">hg update</command> to get a copy of
	the working directory exactly as it was when that tagged
	revision was committed.</para>

      &interaction.branching.update;

      <para>In addition, immediately after the main branch is tagged,
	someone can then clone the main branch on the server to a new
	<quote>stable</quote> branch, also on the server.</para>

      &interaction.branching.clone;

      <para>Someone who needs to make a change to the stable branch
	can then clone <emphasis>that</emphasis> repository, make
	their changes, commit, and push their changes back there.</para>

      &interaction.branching.stable;

      <para>Because Mercurial repositories are independent, and
	Mercurial doesn't move changes around automatically, the
	stable and main branches are <emphasis>isolated</emphasis>
	from each other.  The changes that you made on the main branch
	don't <quote>leak</quote> to the stable branch, and vice
	versa.</para>

      <para>You'll often want all of your bugfixes on the stable
	branch to show up on the main branch, too.  Rather than
	rewrite a bugfix on the main branch, you can simply pull and
	merge changes from the stable to the main branch, and
	Mercurial will bring those bugfixes in for you.</para>

	&interaction.branching.merge;

      <para>The main branch will still contain changes that are not on
	the stable branch, but it will also contain all of the
	bugfixes from the stable branch.  The stable branch remains
	unaffected by these changes.</para>

    </sect2>
    <sect2>
      <title>Feature branches</title>