Xcode: bzr & git...

[Jelmer Vernooij]

Hi Michael,

On Mon, Dec 10, 2012 at 03:41:49PM -0500, Michael Andronov wrote:
> Let me explain briefly my challenge:
> 
> Our small group started to use Xcode actively with the projects, which have
> been under bzr control.
> 
> Xcode seems to support git natively. ( With no apparent trace to set it up
> to use bzr).
> 
> I search bzr documentation and got impression that there are several
> approaches to use bzr & git together.
> But I got lost in details -- what is current status, what is working, what
> is not...
> 
> For example, my first 'naive' approach -- with bzr 2.5.1 on OSX ML - was to
> use --git flag,
> "
> bp:test michael$ bzr init --git
> Created a standalone tree (format: git)
> mbp:test michael$ bzr add test.txt
> adding test.txt
> mbp:test michael$ bzr commit -m "test"
> Committing to: /Volumes/Users/michael/test/
> 
> added test.txt
> bzr: ERROR: bzrlib.errors.NoSuchRevision:
> LocalGitRepository('file:///Volumes/Users/michael/test/') has no revision
> mandronov at vmware.com-20121210203337-qbhad4cub1gkr3gm
> ...
> "
That's using bzr-git to create a git repository and then also bzr-git
to commit the changes. The working tree support of bzr-git is still in its
very early days so I don't expect that to work reliably.

> Is there a 'common practice' to use bzr & git together? Under Xcode?
> ( At this point I have no intention to 'abandon' bzr and to migrate to
> git...).
There are some ways you can use them together, but how you would do
that depend on the circumstances.

bzr-git is mainly useful if you want to contribute to a project that
has a main repository in Git, while you work on it in Bazaar.

I'm not sure what the best way is to create a local git checkout of a
remote bzr branch. Perhaps something like
https://github.com/kfish/git-bzr ?

Cheers,

Jelmer