XF 2.3 2.3 Outdated Templates - Merge feature issue?

[eDaddi]

I started testing upgrading my v2.2.16 sites to 2.3 upgrade and did it via CLI. Ended up with a few templates that were outdated as usual, all were easy fixes except PAGE_CONTAINER, thats a hot mess. I get it's a major update but never seen these kind of issues.

I'm wondering if I have an error within the merge feature. I have nearly 40 issues and many of them are significant large blocks of code to where I'm struggling to understand whats going on with all the scrolling around.

I'm also seeing a lot of the same code to be suggested for use within those large blocks. The

<header class="p-header" id="header">

code for example:
is also in another block much further down the page. I see this throughout these parent/custom blocks and I can't tell if XF 2.3 has moved lines of code around or if these are not parsing correct. I'm leaning towards something is wrong because I see so much of the same lines of code being added/moved all over the page.

Does the template merge feature aim to update the same line multiple times or will it compound multiple updates to only adjust a line once?

I'm wondering if I have to install a fresh 2.3 with my Style to understand what it's supposed to look like vs what these merges are trying to do.

FWIW - Displaying Line Numbers from the original template would be a great feature to add to aid in code comparison.

Any ideas?

 

[Russ]

PAGE_CONTAINER was altered quite a bit. I find it far easier (most times) on upgrades with larger changes like this one is to simply revert the template and re-apply whatever edit you had.

Since you have your 2.2.16 version, you can just open PAGE_CONTAINER on that and click "view custom changes", re-apply the edits on a freshly reverted 2.3 PAGE_CONTAINER.

 

[eDaddi]

PAGE_CONTAINER was altered quite a bit. I find it far easier (most times) are on upgrades with larger changes like this one is to simply revert the template and re-apply whatever edit you had.

Since you have your 2.2.16 version, you can just open PAGE_CONTAINER on that and click "view custom changes", re-apply the edits on a freshly reverted 2.3 PAGE_CONTAINER.

Thats a good idea.

I have a ton of mods that were done by add-ons. Will those automatically reapply or do I need to manually edit all of those as well?

 

[Paul B]

I find it far easier (most times) are on upgrades with larger changes like this one is to simply revert the template and re-apply whatever edit you had.

^ That.

 

[Paul B]

I have a ton of mods that were done by add-ons. Will those automatically reapply or do I need to manually edit all of those as well?

I assume they are template modifications, so they will apply automatically.