983439 - AAPT should ignore mercurial merge conflict files

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Brad Lassey [:blassey] (use needinfo?)]

Attachment: ignore_hg_conflicts.patch

Comment 1

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8390875 [details] [diff] [review]
ignore_hg_conflicts.patch

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

If it works for you, it works for me.  If you can add to not_android_res_files as well (the syntax is irritatingly different -- shell glob) for landing, that would be good.

Comment 2

[Brad Lassey [:blassey] (use needinfo?)]

(In reply to Nick Alexander :nalexander from comment #1)
> Comment on attachment 8390875 [details] [diff] [review]
> ignore_hg_conflicts.patch
> 
> Review of attachment 8390875 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> If it works for you, it works for me.  If you can add to
> not_android_res_files as well (the syntax is irritatingly different -- shell
> glob) for landing, that would be good.

that syntax confuses the hell out of me, can you do the translation?

Comment 3

[Nick Alexander :nalexander [he/him]]

https://hg.mozilla.org/integration/fx-team/rev/be3ab4f30410

Comment 4

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/be3ab4f30410

Comment 5

[Brad Lassey [:blassey] (use needinfo?)]

thanks