changes made to robots.txt in bug 883013 are being replaced by the SiteMapIndex extension.
this is tricky because bzr is seeing the modified robots.txt as local modifications, and isn't replacing it even though it's different from what's in the repo. i've committed a change to robots.txt to make bzr mirror what's currently on the webheads: Committing to: bzr+ssh://firstname.lastname@example.org/bmo/4.2/ modified robots.txt Committed revision 8864. but this resulted in bzr throwing a text conflict during updating: + bzr pull --overwrite [01:20:03] M robots.txt [01:20:03] Text conflict in robots.txt [01:20:03] 1 conflicts encountered. i asked :ashish to do "bzr revert robots.txt" then run the push script again, which fixed the file. once this has happened, i'll commit the fix for this and we should be on track again. when this is pushed into production we'll probably hit the merge conflict issue then, and assuming 'bzr revert' fixes it, we'll have to take the same steps during the push. i also cross-checked all files on the webheads to see if any other were impacted by checksetup-only changes, none were found.
Committing to: bzr+ssh://email@example.com/bmo/4.2/ modified robots.txt modified extensions/SiteMapIndex/Extension.pm modified extensions/SiteMapIndex/robots.txt Committed revision 8866.