Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 8 and 15 (spanning 7 versions)
Revision 8 as of 2006-02-08 14:51:11
Size: 950
Editor: AaronBentley
Comment:
Revision 15 as of 2009-05-14 18:26:54
Size: 1119
Editor: localhost
Comment: converted to 1.6 markup
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
/!\ NOTE: checkouts and repositories do not exist yet = Branch =
Line 3: Line 3:
In the simplist of terms, a branch is the information stored along with a [:WorkingTree:working tree] that gives you access to revision control. One of the most important pieces of a branch is the record of all of the previous [:Revision:revisions] that the working tree has ever had. In the simplest of terms, a '''branch''' is the record of all the commits that have been done. Every [[WorkingTree|working tree]] has a branch, but it may be in a different location. The actual revisions produced by the commits are stored in a repository, which is sometimes shared with other branches.
Line 5: Line 5:
 This is misleading, because branches do not need working trees, and several checkouts may refer to a single branch. -AaronBentley A frequent activity done by users within the working tree of a branch is to [[Merge|merge]] another branch. In this way users can share changes between two branches -- even if the branch is run by someone else.
Line 7: Line 7:
Another frequent activity done by users within the working tree of a branch is to [:Merge:merge] another branch. In this way users can share changes between two branches -- even if the branch is run by someone else. Bazaar's default behavior is to put the repository, branch, and working tree all in the same place. This combination is called a ''[[StandaloneTree|standalone tree]]''. If there is no tree, it is called a ''[[StandaloneBranch|standalone branch]]''. If the repository is shared with other branches, it is called a ''[[RepositoryBranch|repository branch]]''. A working tree in a different location from its branch is called a ''[[Checkout|checkout]]''.
Line 9: Line 9:
Sometimes a branch, named a [:StandaloneBranch:standalone branch] will directly store its own [:Revision:revisions]. At other times, such as when a branch is a [:Checkout:checkout] or is a part of a [:Repository:repository], the revisions elsewhere. == See also ==

 * [[StandaloneBranch|Standalone branch]]
 * [[RepositoryBranch|Repository branch]]

----
CategoryTerm

Branch

In the simplest of terms, a branch is the record of all the commits that have been done. Every working tree has a branch, but it may be in a different location. The actual revisions produced by the commits are stored in a repository, which is sometimes shared with other branches.

A frequent activity done by users within the working tree of a branch is to merge another branch. In this way users can share changes between two branches -- even if the branch is run by someone else.

Bazaar's default behavior is to put the repository, branch, and working tree all in the same place. This combination is called a standalone tree. If there is no tree, it is called a standalone branch. If the repository is shared with other branches, it is called a repository branch. A working tree in a different location from its branch is called a checkout.

See also


CategoryTerm