bzr-svn follow a change of svn layout repository / missing history before restructurering

[Jelmer Vernooij]

Hi Olivier,

On Wed, 2010-01-20 at 14:09 +0100, Olivier R-D wrote:
> doing a test with a simple subversion directory confirms that going to a 
> root layout to a trunk layout seems to confuse bzr-svn.
> bzr-svn misses all history before the layout change and doing a merge 
> with existing bzr branch does not seem possible.
> 
> If anybody has an idea to solve that I would be happy,
This isn't possible - the two branches have completely independent
revision graphs. 

The file ids should stay the same between layout changes, so you *may*
be able to use "bzr merge -r0..-1" to attempt to do a forced merge. It's
worth a try, but you might get a lot of conflicts if either of the
branches was pushed from Bazaar originally. 

Cheers,

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