Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 3 and 15 (spanning 12 versions)
Revision 3 as of 2006-02-02 03:56:35
Size: 620
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:
In the simplist of terms, a branch is the place that [:Revision:revisions]s go to when [:Commit:commit] is run. The revisions stored in a branch are ordered according to their introduction. = Branch =
Line 3: Line 3:
[:StandaloneBranch:Standalone branches] are clearly a branch in every sense of the word as the full history for a branch is present. A [:RepositoryBranch:Repository branches] also qualifies as a branch, even though the tree does not have an integrated working tree. 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:
A [:Checkout:checkout], on the other hand, is technically not a branch because it does not contain all of the ordered revisions that make a branch a branch. 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.

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]]''.

== 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