Comment 4 for bug 414589

@Martin: Thanks for the feedback, so indeed, there was a 'bzr add'.

Marking high as it's a first line of defense against subsequent surprising behaviors (once the files are added, subsequent conflicts on the involved files become really obscure).