Closed Bug 983439 Opened 6 years ago Closed 6 years ago

AAPT should ignore mercurial merge conflict files

Categories

(Firefox for Android :: General, defect)

All
Android
defect
Not set

Tracking

()

RESOLVED FIXED
Firefox 30

People

(Reporter: blassey, Assigned: blassey)

Details

Attachments

(1 file)

No description provided.
Attachment #8390875 - Flags: review?(nalexander)
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.
Attachment #8390875 - Flags: review?(nalexander) → review+
(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?
Flags: needinfo?(nalexander)
https://hg.mozilla.org/integration/fx-team/rev/be3ab4f30410
Assignee: nobody → blassey.bugs
Status: NEW → ASSIGNED
Flags: needinfo?(nalexander)
OS: Mac OS X → Android
Hardware: x86 → All
https://hg.mozilla.org/mozilla-central/rev/be3ab4f30410
Status: ASSIGNED → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 30
thanks
You need to log in before you can comment on or make changes to this bug.