Bazaar Git Plugin

How to track branches other than "master"?

Asked by Eli Zaretskii

After "git-import" and "bzr checkout" in those branches I'm interested in, how do I track changes for those non-master branches in the upstream repository?

"bzr pull" in the directories corresponding to the non-master branches errors out saying that the branches diverged; evidently, it is trying to pull from "master", which is not what I meant.

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
Jelmer Vernooij (jelmer) said : 		#1

This should be fixed in bzr-git trunk. It will only work for new branches though, as old ones will still have the incorrect parent set.

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

What do you mean by "new branches"? Would deleting the entire imported git repo and doing "bzr git-import" again allow me to track all the branches?

Revision history for this message
Best Jelmer Vernooij (jelmer) said : 		#3

On Thu 22 Sep 2011 08:01:12 PM CEST, Eli Zaretskii wrote:
> Question #171522 on Bazaar Git Plugin changed:
> https://answers.launchpad.net/bzr-git/+question/171522
>
> Eli Zaretskii posted a new comment:
> What do you mean by "new branches"? Would deleting the entire imported
> git repo and doing "bzr git-import" again allow me to track all the
> branches?
 Yes.

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

Thanks Jelmer Vernooij, that solved my question.

Revision history for this message
Jelmer Vernooij (jelmer) said : 		#5

Just to clarify in case others are reading this; you will also need bzr 2.5 in addition to bzr-git >= 0.6.3.

Revision history for this message
nancy jane (nancyjane7) said : 		#6

After 'git-import' and 'bzr checkout' for the branches, to track changes in non-master branches, use 'bzr merge' within the respective branch directories. This will merge changes from the upstream repository into your local non-master branch. 'bzr pull' attempts to pull from the default branch (usually 'master'), hence the divergence error. for more check https://lesturf.com/100-things-to-do-when-youre-stuck-at-home/