Converting Subversion checkouts (not repositories) to Bazaar

[Jelmer Vernooij]

On Mon, 2010-01-04 at 08:17 -0500, Barry Warsaw wrote
> Then I hit a rough patch, for which I'd like to get some advice.  Imagine a
> fairly simple home directory layout like this:
> 
> $HOME
>   .bashrc
>   .emacs
>   .lotsofstuff
>   docs/
>   env/
>   extras/
> 
> All the dot files, the docs, env, and extras directories are under Subversion.
> My home directory actually lives under an svn directory like .../base so the
> docs, env, and extras are siblings of base in the repo.  This allows me to
> e.g. not check out docs on every desktop I use[1].
> 
> The svn->bzr conversion problem comes when I want to overlay my shiny new
> Bazaar branch over the existing Subversion checkout.  I get tons of conflicts,
> with many .diverted files, even though the contents of those files are
> unchanged.  One poor solution was to e.g. mv docs{,.aside}, then re-checkout
> docs from Bazaar, and manually ensure that docs.aside was synchronized with
> docs (some files in docs hadn't been committed to the svn repo yet).  This was
> more painful in some directories and I rather dread the work to convert my
> $HOME.
> 
> I tried bzr branch --use-existing-dir, but that did not seem to make any
> difference.  I probably don't understand what --u-e-d is supposed to do.
We're close to being able to just run "bzr upgrade --2a" in a svn
checkout to convert it to a bzr checkout. 

Cheers,

Jelmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100105/faa46706/attachment.pgp