On Sun, 2009-11-29 at 17:22 +0100, Krzysztof Kosiński wrote:

OK the problem is that I used a too-new repo format on my side. However when I do this: bzr init-repo --knit inkscape2 cd inkscape2 bzr co lp:inkscape trunk

I get:

bzr: ERROR: KnitRepository('file:///home/tweenk/src/inkscape2/.bzr/repository/') is not compatible with RemoteRepository(bzr+ssh://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/.bzr/) different rich-root support

What is the correct format to use for the local repository?

The easy way to do it would just be to "bzr branch lp:inkscape" and take it in the format that it is provided. That's what I did.

Cheers, Josh

On Sun, 29 Nov 2009 18:35:40 +0100 Krzysztof Kosiński <tweenk.pl@...400...> wrote:

That's OK, but I would also like to have a local shared repository to speed up things like local branching. Is this possible with the current setup?

I think you do:

bzr init-repo inkscape-repo cd inkscape-repo bzr branch lp:inkscape

which creates a "shared repository" directory 'inkscape-repo' (or whatever name you like) containing the branch 'inkscape', but with all the bzr data shared in the 'inkscape-repo' directory.

So then, in the 'inkscape-repo' directory,

bzr branch inkscape bug-53453

creates a branch called 'bug-53453'based on the inkscape branch, really fast.

When you're done in bug-53453, after a final commit there, I usually do something like

cd .../inkscape-repo/inkscape bzr merge ../bug-53453 bzr commit --fixes xxx -m'fixed blah blah' bzr push

at that point you can delete the 'bug-53453' directory if you want.

Also, in the mean time, doing `bzr pull` in 'inkscape', to keep that up to date, and `bzr merge ../inkscape; bzr commit -m'merged trunk'` in bug-53453 to get those updates in my bug branch.

Cheers -Terry