Merge calendar view files
Categories
(Calendar :: General, task)
Tracking
(thunderbird_esr78 unaffected)
| Tracking | Status | |
|---|---|---|
| thunderbird_esr78 | --- | unaffected |
People
(Reporter: darktrojan, Assigned: darktrojan)
References
Details
There's no good reason for calendar-multiday-base-view.js and calendar-multiday-view.js to be separate files. In fact, it's quite annoying. Ditto calendar-month-base-view.js/calendar-month-view.js.
In this bug I'll merge them using a series of hg commits:
- Move one file to a new location.
- In a separate commit from the same base, move the other file to the same location.
- Merge the two commits.
- Rename the new file back to one of the original locations.
This process preserves the history of both files.
|
Assignee | |
Comment 1•3 years ago
|
||
I can't really ask for review on this, so here's a Try run proving it works and a NI? requesting permission to do it.
calendar-month-view.js after merging
calendar-multiday-view.js after merging
|
||
Comment 2•3 years ago
|
||
Sounds good. Maybe you want to document the commands you used?
|
|
Assignee | |
Comment 3•3 years ago
|
||
Here's what I did, paraphrased:
hg up [parent_revision] # Revision to be the parent
hg mv calendar-month-base-view.js calendar-month-view.js.temp
hg mv calendar-multiday-base-view.js calendar-multiday-view.js.temp
hg commit
hg up [parent_revision] # Same as before
hg mv calendar-month-view.js calendar-month-view.js.temp
hg mv calendar-multiday-view.js calendar-multiday-view.js.temp
hg commit
hg merge [first_commit] # Merge the files together
# Tidy up
hg resolve --mark
hg commit
hg mv calendar-multiday-view.js.temp calendar-multiday-view.js
hg mv calendar-month-view.js.temp calendar-month-view.js
hg commit
I've realised that only the last commit shows up on TreeHerder for the Try run I did. That's because I screwed it up and had to push again.
Pushed by geoff@darktrojan.net:
https://hg.mozilla.org/comm-central/rev/1850d4a1e20d
part 1 - Move -base-view.js files to a temporary location. rs=mkmelin
https://hg.mozilla.org/comm-central/rev/f88ff93e9e2e
part 2 - Move -view.js files to a temporary location. rs=mkmelin
https://hg.mozilla.org/comm-central/rev/1264a6d8cacd
part 3 - Merge. rs=mkmelin
https://hg.mozilla.org/comm-central/rev/d2c857060287
part 4 - Move merged files back to their original location. rs=mkmelin
|
|
Assignee | |
Updated•3 years ago
|
Description
•