Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 2 and 4 (spanning 2 versions)
Revision 2 as of 2006-02-02 03:49:11
Size: 478
Comment:
Revision 4 as of 2006-02-02 07:56:58
Size: 821
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
A branch is the ordered collection of [:Revision:revision]s. for a [:WorkingTree:working tree]. Two different types of branches are planned for Bazaar-NG -- [:StandaloneBranch:standalone branches] and [:RepositoryBranch:repository branches]. /!\ NOTE: checkouts and repositories do not exist yet
Line 3: Line 3:
In the case of standalone branches, the working tree is present for the user to work on. In the case of repository branches, the working tree is disassociated and can be represented as a [:Checkout:checkout] and merged to and from. 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.

Branches may or may not come with a [:WorkingTree:working tree]. [:Checkout:checkout]s and [:StandaloneBranch:Standalone branches] both provide you with working tree to hack on your code with. Technically a checkout is not a branch because it does not contain all of the ordered revisions that make a branch a branch.

Another type of branch is a [:RepositoryBranch:Repository branch]. These types of branches are tucked away inside of a repository and should not be hacked on directly. Instead, either branch from them, or make a checkout for them that you can hack.

NOTE: checkouts and repositories do not exist yet

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.

Branches may or may not come with a [:WorkingTree:working tree]. [:Checkout:checkout]s and [:StandaloneBranch:Standalone branches] both provide you with working tree to hack on your code with. Technically a checkout is not a branch because it does not contain all of the ordered revisions that make a branch a branch.

Another type of branch is a [:RepositoryBranch:Repository branch]. These types of branches are tucked away inside of a repository and should not be hacked on directly. Instead, either branch from them, or make a checkout for them that you can hack.