[MERGE] Bazaar User Reference

[Paul Moore]

On 07/08/07, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> Paul Moore wrote:
> > Possibly part of the issue here
> > is that while there is a name for the idea of a checkout, there isn't
> > really a good name (that I know) for "my working directory that I just
> > ran bzr init in and am now using just like I used to but with version
> > control"
>
> Perhaps you're looking for "standalone tree"?  That is what "bzr info"
> will tell you you have:

Possibly. I'm not sure how that differs from a "branch". I think both
of these terms could stand a definition.

The following is a very basic draft - it's pretty much bound to be
wrong, as I don't believe I have a good understanding of the concepts
yet, but hopefully, it will be of use by providing something to
correct :-)

Branch
------

A branch consists of the state of a project, including all of its
history. All branches have a repository associated (which is where the
branch history is stored), but multiple branches may share the same
repository (a shared repository). Branches can be copied and merged

Related commands:
    init  Make a directory into a versioned branch
    branch  Create a new copy of a branch.
    merge  Perform a three-way merge.

Standalone Tree
---------------

A standalone tree is a working tree with an associated repository. It
is an independently usable branch, with no dependencies on any other.
Creating a standalone tree (via bzr init) is the quickest way to put
an existing project under version control.

Related Commands:
    init  Make a directory into a versioned branch

Hope this helps,
Paul.