Aaron Bentley wrote: > Carl Worth wrote: >> I'm noticing another terminology conflict here. The notion of "branch" >> in bzr is obviously very different than in git. For example the bzr >> man page has a sentence beginning with "if there is already a branch >> at the location but it has no working tree". I'm still not sure >> exactly what a bzr branch is, but it's clearly something different >> from a git branch, (which is absolutely nothing more than a name >> referencing a particular commit object). > > I got the impression there was also a local ordering of revisions. Is > that wrong? No, there is no such thing like local ordering of revisions. Each revision (commit) has link to its parent(s). Branch technically is just a reference to a particular commit object. The commit itself gives us sub-DAG of DAG of whole history, the DAG of all parents of said commit. Such lineage of commit pointed by branch is conceptually a branch; i.e. branch is DAG of development (not line of development, as there is no special meaning of first parent). You can have (in git repository) also reflog, which records values of branch-as-reference, or branch tip of branch-as-named-lineage. But for example fetch and fast-forward 5 commits in history is recorded as single event, single change in reflog. > A Bazaar branch is a directory inside a repository that contains: > - a name referencing a particular revision > - (optional) the location of the default branch to pull/merge from > - (optional) the location of the default branch to push to > - (optional) the policy for GPG signing > - (optional) an alternate committer-id to use for this branch > - (optional) a nickname for the branch > - other configuration options Erm, wasn't revno to revid mapping also part of bzr "branch"? We store configuration per repository, not per branch, although there is some branch specific configuration. [...] > This layout is an imitation of Git, as I understand it: > Repository: > ~/repo > > Branches: > ~/repo/origin > ~/repo/master > > Workingtree: > ~/repo Workingtree: ~/ if I understand notation correctly. >> One, it intrudes on my branch namespace, (note that >> in many commands above I have to use things like "../b" where I'd like >> to just name my branch "b". > > While "bzr merge ../b" is a minor inconvenience, I think that "bzr merge > http://bazaar-vcs.org/bzr/bzr.dev"; is a big win. Gaah, it's even more inconvenient. Certainly more than using name of branch itself, like in git. >> Two, it prevents bzr from having any >> notion of "all branches" in places where git takes advantage of it, >> (such as git-clone and "gitk --all"). > > No, it doesn't. Bazaar can easily list all the branches in a > repository, just by starting with the repository root, and recursing > through all the subdirectories, looking for branches. Is there a command to list all branches in bzr? Is there a command to copy (clone in SCM jargon) whole repository with all branches? > That said, we do have mentality that branches, not repositories, are > what's important to users in day-to-day use. Thats opposite to git view. In git, working area is associated with repository (clone of repository), not branch. We copy whole repositories (sometimes only part of repository), not branches. >>> What's nice is being able see the revno 753 and knowing that "diff -r >>> 752..753" will show the changes it introduced. Checking the revo on a >>> branch mirror and knowing how out-of-date it is. >> >> With git I get to see a revision number of b62710d4 and know that >> "diff b62710d4^ b62710d4" will show its changes, though much more >> likely just "show b62710d4". I really cannot fathom a place where >> arithmetic on revision numbers does something useful that git revision >> specifications don't do just as easily. Anybody have an example for >> me? > > My understanding is that ^ is treated as a special metacharacter by some > shells, which is why bzr revision specs are more long-winded. Which shells? If I understand it '^' was chosen (for example as NOT operator for specify sub-DAG instead of '!') because of no problems for shell expansion. And considering that many git commands are/were written in shell, one certainly would notice that. -- Jakub Narebski Poland - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html