[13:56] <RobOakes> Is there someone here who might be willing to help me create a strategy for a complicated merge?
[13:56] <RobOakes> One of the projects I work on, LyX just switched to git for managing its source.
[13:57] <RobOakes> This has left me in a problem, though. I have a number of branches on launchpad with experimental features in bar.
[13:57] <RobOakes> I'm not able to pull updates in any more because they've abandoned the SVN repo which those branches are based on.
[13:58] <RobOakes> Is there a good way to start merging in updates from the git repository?
[14:02] <jelmer> RobOakes: not really, unfortunately
[14:02] <jelmer> the two histories have diverged
[14:02] <jelmer> s/have diverged/are completely unrelated/
[14:03] <RobOakes> :(
[14:03] <jelmer> you can of course e.g. manually apply and commit your local changes to the git tree
[14:04] <RobOakes> That is an option.
[14:04] <RobOakes> I just want to get the necessary changes into the git tree. This has completely stopped all development until i can find a solution.
[14:05] <jelmer> RobOakes: so you have local changes on top of a mirror of the old svn branch?
[14:05] <RobOakes> Yes.
[14:05] <RobOakes> I need to get those changes into a branch based on Git.
[14:06] <jelmer> RobOakes: I would indeed suggest getting the individual changes out of bzr and then applying those to git
[14:06] <jelmer> RobOakes: you can generate git compatible patches with bzr send
[14:06] <jelmer> "bzr send -o somedirectory --format=git"
[14:07] <RobOakes> Can bzr look at a working copy of the git directory and then diff the two?
[14:08] <jelmer> RobOakes: it can't diff the two, but you can use that command in your existing bzr branch
[14:08] <jelmer> (it can't diff the two since they're not related)
[14:09] <RobOakes> That will get some of the differences, but I've committed my changes over the past several months. I'm not sure how to get the history of all the different changes without running a diff operation of some sort.
[14:13] <jelmer> RobOakes: another option is to use bzr-git or fastexport to export the existing bzr branch to git and then use the git tools to stitch things together
[14:15] <RobOakes> That sounds promising. Is fastexport a separate plugin?
[14:17] <jelmer> RobOakes: yes
[14:17] <RobOakes> Okay. I'll look into that.
[14:38] <jam> jelmer: just saying hi, and seeing how your day has been going
[14:44] <jelmer> hey jam :)
[14:45] <jelmer> jam: it's been a bit quiet here, though I'm doing okay.
[14:45] <jelmer> How are things with you?
[14:47] <jam> pretty good, just finishing up my day and figured I'd wave hello
[15:29]  * LarstiQ waves at jam and jelmer too