[#12507] - 3.6.4: Correcting encoding mismatch for helpsites.xml
- Closed
- 22 Oct 2016
- Medium
- Build: staging
- # 12507
- Diff
- infograf768:helpsites_encoding
- Success continuous-integration/drone the build was successful Details
- Success continuous-integration/travis-ci/pr The Travis CI build passed Details
User tests: Successful: Unsuccessful:
Changed the encoding of the file as Français was badly displayed.
You can merge. I am creating the same in joomlaupdate now.
Votes
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Labels |
Added:
?
|
||
| Category | ⇒ | Administration |
I have tested this item
see #12515
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/12507.
| Status | Pending | ⇒ | Ready to Commit |
RTC based on testing. Thanks!
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/12507.
| Labels |
Added:
?
|
||
| Labels |
Added:
?
Removed: ? |
||
| Milestone |
Added: |
||
| Milestone |
Added: |
||
| Milestone |
Removed: |
||
brianteeman
- | Status | Ready to Commit | ⇒ | Closed |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2016-10-22 20:32:57 |
| Closed_By | ⇒ | zero-24 |
| Labels |
Removed:
?
|
||
wow - yeah something very very broken with this PR now :)
It's because he changed the base branch and because JMs PR was based on the 3.6.4 branch it drug all the other commits from there over too.
Yes i have changed the base so i can merge it into staging and not the 3.6.4 branch. Is there any better way instend of changing the base (that broken this PR)?
Manually commit it (with proper author attributes). It's like opening a PR designed for something in the 3.7.x branch against staging when your branch was branched from 3.7.x, the PR is going to show all the commits not in the target branch. So similar thing here; the PR was against the 3.6.4 branch which has commits not in staging then you changed the base branch so it included those commits not in staging because JM branched from the 3.6.4 branch.
Manually commit it (with proper author attributes).
Ok thanks. And thanks for the help / explanation.
The other way to think of it. You're proposing to merge a remote branch into a base branch. That remote branch has certain commits not in the base branch, and that is what you want to merge. So when you change the base branch you want to merge that remote branch into, you're changing the commits you're proposing be merged potentially.
It's kinda how git works at the underlying layer. You aren't explicitly sending a pull request for X commits. GitHub's UI just does a great job showing that stuff.
that was supposed to be mer ged in 3.6.4...
George told me this should not go into 3.6.4
He was mistaking. It had to go into 3.6.4. It is related to joomla/update.joomla.org#27
@rdeutz can make new packs with this change. It is not a big deal. I had already told him.
I thought 3.6.4 was resolving security issues only... Although this probably is a small change with no knock on effects, after all the other rush "just merge this because it will make no difference" when we release security releases have always come back to bite in the arse!
We decided not to merge it, all good.
mantainers please remove 3.7.0 label here
I have tested this item✅ successfully on 037bd4a
on review
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/12507.