On Thu, 2014-05-15 at 18:55 +0200, Johan Engelen wrote:
My recommendation to not waste too many brain cycles: don't merge. You can create you own branch, fine, just don't merge it in. Just create a separate trunk/experimental checkout and copy your changes in, then commit.
Actually, say one has a trunk branch checkout...
~/inkscape/trunk $ cd .. ~/inkscape $ bzr branch trunk experimental ~/inkscape $ cd experimental ~/inkscape/experimental $ DO MODIFICATIONS ~/inkscape/experimental $ bzr push :parent
IF FAILS (i.e. trunk has changed): ~/inkscape/experimental $ cd ../trunk ~/inkscape/trunk $ bzr merge ../experimental ~/inkscape/trunk $ bzr commit && bzr push
It's useful to use folders as branches in this way instead of trying to remember all the files that one modified in the course of some work.
Martin,