Closed
Bug 983439
Opened 11 years ago
Closed 11 years ago
AAPT should ignore mercurial merge conflict files
Categories
(Firefox for Android Graveyard :: General, defect)
Tracking
(Not tracked)
RESOLVED
FIXED
Firefox 30
People
(Reporter: blassey, Assigned: blassey)
Details
Attachments
(1 file)
|
810 bytes,
patch
|
nalexander
:
review+
|
Details | Diff | Splinter Review |
No description provided.
Attachment #8390875 -
Flags: review?(nalexander)
|
||
Comment 1•11 years ago
|
||
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+
|
Assignee | |
Comment 2•11 years ago
|
||
(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)
|
|
||
Comment 3•11 years ago
|
||
Assignee: nobody → blassey.bugs
Status: NEW → ASSIGNED
Flags: needinfo?(nalexander)
OS: Mac OS X → Android
Hardware: x86 → All
|
||
Comment 4•11 years ago
|
||
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 30
|
|
Assignee | |
Comment 5•11 years ago
|
||
thanks
|
||
Updated•4 years ago
|
Product: Firefox for Android → Firefox for Android Graveyard
You need to log in
before you can comment on or make changes to this bug.
Description
•