bzr graft or equivalent?

[Fernando Perez]

Guillermo Gonzalez wrote:

> Hi Fernando,
> 
> I don't know if this match your needs, but you can do a merge of both
> branches, i.e:
> 
>  $ bzr merge -r 0..-1 ../ipython-current
> 
> Hope this help to solve your problem.

Thanks, I'd tried a bunch of variations on this but not quite this exact form,
I'm not sure why...

Unfortunately this generates a conflict for every single file, and basically I
end up with every file/directory as .moved.  I can resolve those conflicts by
nuking the .moved files, and that seems to be an OK solution for now.  Even if
Launchpad will show the recent history 'collapsed', at least the local view
(bzr viz) does display all the intermediate commits correctly.

Thanks again, I greatly appreciate it.  I wonder what exactly I'd done, because
at the beginning I pretty much tried exactly that as my first merge attempt,
but no variation on merge ever succeeded.   I started trying increasingly
esoteric solutions instead, none of which worked.  Oh well, regardless, this
is great.  At least we get to keep the whole history, even if it gets 'folded'
a bit.

Cheers,

f