739924 - Please remove testing/peptest/tests/firefox/server/mozilla.org/index.html.orig

Status: RESOLVED FIXED

(Testing Graveyard :: Peptest, defect)

Description

[Henri Sivonen (:hsivonen)]

Please remove/rename testing/peptest/tests/firefox/server/mozilla.org/index.html.orig

It conflicts with patch reject naming conventions and is masked by an ignore pattern in hg, which leads to confusing situations after find . | grep "\.orig$" | xargs rm

Comment 1

[Ed Morley [:emorley]]

Was added by mcote in https://hg.mozilla.org/integration/mozilla-inbound/rev/121ada16c793 / bug 719618.

index.html also exists (albeit the file is slightly different ([1] vs [2]). I would think the .orig just needs to be removed, not renamed (and the difference confirmed intentional).

Seems like development in that bug was done on github, is this an issue with one of the github->hg tools that people use? I was under the impression mercurial wouldn't let you hg add add a .orig normally (I'm quite possibly wrong however...).

[1] https://hg.mozilla.org/integration/mozilla-inbound/diff/121ada16c793/testing/peptest/tests/firefox/server/mozilla.org/index.html

[2] https://hg.mozilla.org/integration/mozilla-inbound/diff/121ada16c793/testing/peptest/tests/firefox/server/mozilla.org/index.html.orig

Comment 2

[Mark Côté [:mcote]]

Attachment: Remove testing/peptest/tests/firefox/server/index.html.org

Yeah I dunno how that happened exactly. Something went wrong during a git->hg merge. The file is not needed.

Comment 3

[Joel Maher ( :jmaher ) (UTC -8)]

Comment on attachment 610127 [details] [diff] [review]
Remove testing/peptest/tests/firefox/server/index.html.org

Review of attachment 610127 [details] [diff] [review]:
-----------------------------------------------------------------

so you are just removing the file, not renaming it?

Comment 4

[Joel Maher ( :jmaher ) (UTC -8)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2961cc555792

Comment 5

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/2961cc555792