On 15-5-2014 18:55, Johan Engelen wrote:

And again and again, we have proven that we are not capable of maintaining a clean history by using bzr merge.

Let me add that I for one am certainly not capable of doing that without spending too much time trying to bend my mind around bzr cmdline syntax, etc.

-Johan

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,

2014-05-15 18:55 GMT+02:00 Johan Engelen <jbc.engelen@...2592...>:

Hi all, Look here: http://bazaar.launchpad.net/~inkscape.dev/inkscape/experimental/changes rev 13365 managed to 'rename' my earlier commit to include poppler in win64 build.

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.

Whatever you think about better workflows, it is paramount to maintain a clean version history. And again and again, we have proven that we are not capable of maintaining a clean history by using bzr merge.

Somebody forgot to set this again: http://wiki.inkscape.org/wiki/index.php/Working_with_Bazaar#Append-only_bran...

I fixed this so it shouldn't be a problem anymore.

Regards, Krzysztof