How to work with bzr-git after initial "bzr branch"

Asked by Eli Zaretskii

OK, so I successfully installed this plugin and performed the initial "bzr branch". How do I work with this branch from now on?

Questions:

1) How do I sync to upstream? "bzr info" says that this is a Bazaar branch, so is "bzr merge" the way to go? How about "bzr pull" or "bzr merge --pull" -- will these work as they do with "normal" Bazaar branches?

2) I understand that I cannot yet push to upstream. But can I commit locally to this branch? If so, will the normal "bzr ci" work, or do I need any special switches etc.?

3) If it is possible to commit locally, will "bzr merge" from upstream work in this branch, as it does with "normal" bzr branches?

4) Can I "bzr branch" from this branch to have a local branch, and will that new branch be a "normal" bzr branch? (That's assuming the branch created by bzr-git requires some special quirks to work with it.)

Thanks.

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Git Plugin Edit question
Assignee:
No assignee Edit question
Solved by:
Jelmer Vernooij
Solved:
Last query:
Last reply:
Revision history for this message
Best Jelmer Vernooij (jelmer) said :
#1

On Sat, 2011-03-12 at 15:53 +0000, Eli Zaretskii wrote:
> New question #148814 on Bazaar Git Plugin:
> https://answers.launchpad.net/bzr-git/+question/148814
>
> OK, so I successfully installed this plugin and performed the initial "bzr branch". How do I work with this branch from now on?

bzr-git adds support for Git formats/protocols to Bazaar. Everything
should work as you would expect for a "normal" Bazaar branch, with the
exception that you can't push from a native Bazaar branchinto Git at the
moment, you can only use "bzr dpush" for that.

> Questions:
> 1) How do I sync to upstream? "bzr info" says that this is a Bazaar branch, so is "bzr merge" the way to go? How about "bzr pull" or "bzr merge --pull" -- will these work as they do with "normal" Bazaar branches?
"bzr pull", as you would with a normal Bazaar branch.

> 2) I understand that I cannot yet push to upstream. But can I commit locally to this branch? If so, will the normal "bzr ci" work, or do I need any special switches etc.?
Yes, your local branch is a "normal" bazaar branch. There's nothing
special about it.

> 3) If it is possible to commit locally, will "bzr merge" from upstream work in this branch, as it does with "normal" bzr branches?
Yes.

> 4) Can I "bzr branch" from this branch to have a local branch, and will that new branch be a "normal" bzr branch? (That's assuming the branch created by bzr-git requires some special quirks to work with it.)
Yes. This branch is a normal branch, so any branch you create from it
will be "normal" too.

CHeers,

Jelmer

Revision history for this message
Eli Zaretskii (eliz) said :
#2

Thanks Jelmer Vernooij, that solved my question.