/srv/irclogs.ubuntu.com/2012/04/25/#bzr.txt

=== mrevell_ is now known as mrevell
RobOakesIs there someone here who might be willing to help me create a strategy for a complicated merge?13:56
RobOakesOne of the projects I work on, LyX just switched to git for managing its source.13:56
RobOakesThis has left me in a problem, though. I have a number of branches on launchpad with experimental features in bar.13:57
RobOakesI'm not able to pull updates in any more because they've abandoned the SVN repo which those branches are based on.13:57
RobOakesIs there a good way to start merging in updates from the git repository?13:58
jelmerRobOakes: not really, unfortunately14:02
jelmerthe two histories have diverged14:02
jelmers/have diverged/are completely unrelated/14:02
RobOakes:(14:03
jelmeryou can of course e.g. manually apply and commit your local changes to the git tree14:03
RobOakesThat is an option.14:04
RobOakesI just want to get the necessary changes into the git tree. This has completely stopped all development until i can find a solution.14:04
jelmerRobOakes: so you have local changes on top of a mirror of the old svn branch?14:05
RobOakesYes.14:05
RobOakesI need to get those changes into a branch based on Git.14:05
jelmerRobOakes: I would indeed suggest getting the individual changes out of bzr and then applying those to git14:06
jelmerRobOakes: you can generate git compatible patches with bzr send14:06
jelmer"bzr send -o somedirectory --format=git"14:06
RobOakesCan bzr look at a working copy of the git directory and then diff the two?14:07
jelmerRobOakes: it can't diff the two, but you can use that command in your existing bzr branch14:08
jelmer(it can't diff the two since they're not related)14:08
RobOakesThat 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:09
jelmerRobOakes: 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 together14:13
RobOakesThat sounds promising. Is fastexport a separate plugin?14:15
jelmerRobOakes: yes14:17
RobOakesOkay. I'll look into that.14:17
jamjelmer: just saying hi, and seeing how your day has been going14:38
jelmerhey jam :)14:44
jelmerjam: it's been a bit quiet here, though I'm doing okay.14:45
jelmerHow are things with you?14:45
jampretty good, just finishing up my day and figured I'd wave hello14:47
=== yofel_ is now known as yofel
* LarstiQ waves at jam and jelmer too15:29
=== deryck is now known as deryck[lunch]
=== deryck[lunch] is now known as deryck
=== xlq is now known as vork

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!