generalize stream to refer to any set of branches.// This simple generalization
results in a more powerful and flexible model.
-There is one particularly useful type of stream. Say we have a branch called
+There is one particularly useful type of stream. Say we have a branch called
//trunk//. We can open new branches from the trunk, and later we can merge the
branches back to it. This is in fact a common branching and merging
pattern. All branches from the same trunk plus the trunk itself natually form
a stream, and we call it ##**natural stream**##. We don't have to do something
-special to create a natural stream, which
coexists with the corresponding branch.
+special to create a natural stream, which .
In contrast, the master, develop, feature, release, hotfix, and
support are preexisting streams, and they are sortof artificial. Hgflow has been
enhanced to support natural streams since v0.9. Let's see how it can be used.
You can call <feature/A> as a substream of <feature>. Branches in <feature/A> are,
-of course, also in <feature>. So you can
also operate the branches in <feature/A> at
+of course, also in <feature>. So you can operate branches in <feature/A> at
the level of <feature>. For example, you can finish the <feature-prefix>/A/a1 branch
as a regular branch in <feature>.
This feature needs the [[http://mercurial.selenic.com/wiki/MqExtension|mq extension]].
-From version 0.8 to 0.9, the configuration file
name has been changed to .flow (was .hgflow in versions 0.8 and ealier).
+From version 0.8 to 0.9, the configuration file has been ed to .flow (was .hgflow in versions 0.8 and ealier).
Use ##**hg flow upgrade**## to make the change for your repository.