Closed Bug 1392699 Opened 4 years ago Closed 4 years ago

Remove obsolete tab image overrides

Categories

(Firefox :: Theme, enhancement)

Product:
Firefox
Component:
Theme
Platform:
All
Windows
Type:
enhancement
Priority:
Not set
Severity:
normal

Tracking

()

Status:
RESOLVED FIXED
Milestone:
Firefox 57
Tracking Flags:
Tracking Status
firefox57 --- fixed

People

(Reporter: dao, Assigned: akriti.v10, Mentored)

References

Details

(Keywords: good-first-bug)

Attachments

(1 file)

Bug 1392699 - Removed obsolete image overrides
59 bytes, text/x-review-board-request
Details 
Hi Dao, I would like to work on this bug. Can you please assign this to me. 
Thanks!
Sure :)
Let me know if you have questions.
Assignee: nobody → akriti.v10
Comment on attachment 8900608 [details]
Bug 1392699 - Removed obsolete image overrides

https://reviewboard.mozilla.org/r/172030/#review177292

Thanks!
Attachment #8900608 - Flags: review+
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 12fc33298880 -d 5c8e8679ef69: rebasing 415516:12fc33298880 "Bug 1392699 - Removed obsolete tab image overrides. r=dao" (tip)
merging browser/themes/windows/jar.mn
warning: conflicts while merging browser/themes/windows/jar.mn! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
akriti, your patch doesn't apply cleanly. Could you please update your mozilla-central tree and resubmit the patch? Thanks.
Flags: needinfo?(akriti.v10)
This patch doesn't seem more up-to-date than the previous one. Still the same issue:

hg import https://reviewboard-hg.mozilla.org/gecko/rev/748b4d4beb2fe4eb98d24ac81ccaa20de3eff2ee
applying https://reviewboard-hg.mozilla.org/gecko/rev/748b4d4beb2fe4eb98d24ac81ccaa20de3eff2ee
patching file browser/themes/windows/jar.mn
Hunk #1 FAILED at 110
1 out of 1 hunks FAILED -- saving rejects to file browser/themes/windows/jar.mn.rej
abort: patch failed to apply
Is it an extra line issue?
Flags: needinfo?(akriti.v10)
Does that solve the problem?
(In reply to akriti verma from comment #11)
> Does that solve the problem?

No, the extra lines aren't useful, please remove them.

The reason why we can't apply your patch is that it's based on an old revision of browser/themes/windows/jar.mn. Please update your clone of mozilla-central using hg pull and hg update.
I did "hg update". This is the result i got

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "eb8631b37cd7: Bug 1392699 - New Patch."
1 other heads for branch "default"

I had done this earlier , just before submitting the second patch , but it doesn't seem to solve the problem.
You need to remove your own commits updating, or use hg pull --rebase: https://www.mercurial-scm.org/wiki/RebaseExtension
Pushed by dgottwald@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/68098e97eaf0
Removed obsolete image overrides r=dao
https://hg.mozilla.org/mozilla-central/rev/68098e97eaf0
Status: NEW → RESOLVED
Closed: 4 years ago
status-firefox57: affected → fixed
Resolution: --- → FIXED
Target Milestone: --- → Firefox 57
You need to log in before you can comment on or make changes to this bug.