About merge-into: please note comment #2, which has exact steps to reproduce using merge-into (no cherrypick or merge from unrelated tree). So I don't see how merge-into can be listed as a work-around? (maybe I misunderstood)
A work-around would be very welcome though. Are you saying that the problem occurs when the files merged from externally are in the root? And that if instead we merge from an external repository where everything is in a subdirectory, then the problem will be worked around?
About merge-into: please note comment #2, which has exact steps to reproduce using merge-into (no cherrypick or merge from unrelated tree). So I don't see how merge-into can be listed as a work-around? (maybe I misunderstood)
A work-around would be very welcome though. Are you saying that the problem occurs when the files merged from externally are in the root? And that if instead we merge from an external repository where everything is in a subdirectory, then the problem will be worked around?
cd pbxt temporary- subdir storage/pbxt
bzr mkdir temporary-subdir
bzr mv `ls|grep -v temporary-subdir` temporary-subdir/
bzr commit
cd ../maria
bzr merge-into ../pbxt storage/
bzr mv storage/
bzr commit
And then for the next merge, simply
bzr merge lp:pbxt
Is this the workaround that was suggested?