Thread: How to merge Calibre updates to source code?
View Single Post
Old 11-16-2010, 07:03 AM   #1
kiwidude
Calibre Plugins Developer
kiwidude ought to be getting tired of karma fortunes by now.kiwidude ought to be getting tired of karma fortunes by now.kiwidude ought to be getting tired of karma fortunes by now.kiwidude ought to be getting tired of karma fortunes by now.kiwidude ought to be getting tired of karma fortunes by now.kiwidude ought to be getting tired of karma fortunes by now.kiwidude ought to be getting tired of karma fortunes by now.kiwidude ought to be getting tired of karma fortunes by now.kiwidude ought to be getting tired of karma fortunes by now.kiwidude ought to be getting tired of karma fortunes by now.kiwidude ought to be getting tired of karma fortunes by now.
 
Posts: 4,732
Karma: 2197770
Join Date: Oct 2010
Location: Australia
Device: Kindle Oasis
How to merge Calibre updates to source code?
Hi all,

Apologies for being a newbie to using Bazaar but here's the scenario.

I grabbed the latest Calibre source code a week or so ago and made a few tweaks/changes to it. BTW if Kovid answers this, forget my actions done on the interface thread to submit that patch, as I have "started again" with a fresh working directory from the latest revision at the time just using bzr merge lp:Calibre in a fresh directory.

Now I want to know what my best approach is when it comes time to get the latest source code version to pickup all the other fixes/changes in Calibre?

All my changes are uncommitted. I would like to merge the latest trunk into my work area, retaining/merging my changes. Could anyone please recommend an approach?

I tried "bzr merge --force" but that just says "nothing to do". Do I have to commit my changes and then do a merge or is it a different command line I should use? Any "best practice" recommendations?

Many thanks for your help.
kiwidude is offline   Reply With Quote