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

alexeiserQuestion about the smart server jail, and how to "correctly" do auto push changes from one branch to a diverging parent05:21
=== AfC is now known as AfC|train
LarstiQccxCZ: hmm, shouldn't it pick up on openssh if BZR_SSH is unset?12:53
RobOakesMorning everyone. is there anyone who might be able to advise me on the best way to do a complicated merge?16:24
RobOakesI work on the LyX project and keep a local branch in Launchpad, using Bzr.16:24
RobOakesJust recently, the LyX main development team moved to git and abandoned their SVN repository.16:25
RobOakesEven though the git repository has a full SVN history, I am unable to merge it into my bar repo (based on the same SVN). It says that there is no common history.16:25
RobOakesBecause they are no longer pushing master updates to SVN, I don't have a way to continue work on my branch. Any ideas on how I can begin to pull changes from the git repo into my bar branch?16:26
RobOakesI'm using bar 2.516:39
aj_why the first time fetching of a branch is too slow in my system??18:48
aj_speed hardly reaches 15 KBps18:49
aj_anybody??18:59
=== yofel_ is now known as yofel

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