"bzr git-import" and multiple branches

Jelmer Vernooij jelmer at samba.org
Sun Apr 8 13:32:31 UTC 2012


On Sun, Apr 08, 2012 at 03:42:16PM +0300, Eli Zaretskii wrote:
> > Date: Sun, 8 Apr 2012 11:34:28 +0200
> > From: Jelmer Vernooij <jelmer at samba.org>
> > Cc: bazaar at lists.canonical.com
> > 
> > Specifying --force should fix it
> Thanks, that works.  Although, I wonder why does it even require
> the --force switch, as the 'switch' command is a natural thing in
> co-located branches, isn't it?  And the branches will always be
> divergent, I think.  So I think this shouldn't trigger an error in
> a co-located branch.
When switching between colocated branches, I agree.

However, if the current branch is not a branch reference then
switching away can mean you lose references to the current branches'
tip.

> > though we should obviously also fix the error message.
> Yes, please.  Better yet, don't error out at all in this case.
> 
> Also, the final message is confusing:
> 
>   Switched to branch: D:/gnu/bzr/gawk-branches/
> 
> It doesn't mention the name of the branch, which is what the user
> would be looking for.
It's on the todo list for colocated branches. We're happy to provide
some pointers if you feel like hacking on this.

Cheers,

Jelmer



More information about the bazaar mailing list