Tarmac should merge into a fresh branch

[Francis J. Lacoste]

When Tarmac reported conflicts when it merged my branch. My branch has trunk already merged in so is really conflict-free.
The conflicts are due because of built files in the branch. IOW, to ensure a clean merge, Tarmac should start from a fresh branch/checkout.

This is the error report I got:

Attempt to merge lp:~flacoste/oops-tools/buildoutification into lp:~launchpad-pqm/oops-tools/trunk failed due to merge conflicts:

deleting parent in lib
deleting parent in lib/zope
deleting parent in lib/zope/deprecation
deleting parent in lib/zope/i18nmessageid
deleting parent in lib/zope/interface
deleting parent in lib/zope/schema
deleting parent in lib/zope/testbrowser
deleting parent in lib/zope/testing

[Paul Hummer (rockstar)]

Did Tarmac explode beforehand? If so, the way it failed apparently never got to cleaning up the trunk, breaking the next commit.

It CAN use a fresh checkout, or it can be cached. I'll have to look at the codepaths again and make sure all failures still clean up the trunk.

[Francis J. Lacoste (flacoste)]

I don't know, it was the first failure I got and Matsubara did land successfully some changes earlier. There might have been failures in between, but I wouldn't know. If there is a log file that we should look into, I can ask a losa to peek.

[Francis J. Lacoste (flacoste)]

Ok, I can confirm that cleanup doesn't happen after an error. After each error I get, we needed to run make clean in the chroot so that the merge can complete successfully on the next attempt.

[Paul Hummer (rockstar)]

Fixed in revno 264