Xavier Maillard <[EMAIL PROTECTED]> writes:

> Hi,
>
> Since Richard's decision on moving GNU Emacs revision control
> from CVS to BZR, I am looking for a good howto for it.

(If I were you, I'd wait a few days/weeks before investing time on
Emacs+bzr. RMS decided, but from the discussions I've seen, it's far
from a consensus, so that might change, who knows)

> I am really used to Git now and I am failing at doing some
> (simple ?) things like:
>
> 1. branching. In git, a simple git checkout -b <branchname>
> <fromwhat> would have done it. In bzr, things seem uncommon to
> me.

Bzr uses one directory per branch (the advantage is that each branch
has its own URL). So, you

bzr branch where-your-old-branch-lives new-branch

By default, this will duplicate the checkout _and_ the repository. To
save disk-space and time, use shared repositories
( http://bazaar-vcs.org/SharedRepository ). You can use a single
checkout, and "bzr switch" to have it point to different branches if
you want.

> 2. choosing atomicity of my commits. For example with Git, I can
> choose precisely what "diffs" will be part of a commit. I can
> even select inside a "file" what diffed portion I want to add to
> the index. How is it done with bzr ?

File-based selective commits are just

$ bzr commit file1 file2

(as most other systems). AFAIK, there's no equivalent of "git add -i"
or fine-granularity commit tool, but there's a "shelf" command in the
bzrtools plugin, that allow you to put some changes appart while you
commit.

Most of the time, I find the "partial revert + full-tree commit"
better than "partial commit", since the first ensures that what you
commit actually existed on disk at some point in time, and therefore
gives you an opportunity to test it.

> 3. how do you do the equivalent of "git rebase" ?
> 5. is there a bisect tool ?

http://bazaar-vcs.org/BzrPlugins

(bisect and rebase, but I've never actually used them)

> 4. how do you send your patch(es) by e-mail ?

bzr send (never used either, the command appeared relatively recently,
and I'm using bzr less and less).

> 6. how do you amend a commit ?

bzr uncommit
bzr commit

I don't think there's a direct equivalent of commit --amend.

-- 
Matthieu

_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev

Reply via email to