Comment 5 for bug 120968

bug 127115 is now fixed, but as of 0.91 this one is not.

There is a workaround for this: do a blank (or non-blank) commit on the main branch before doing the local commits.