• This site uses cookies. By continuing to use this site, you are agreeing to our use of cookies. Learn more.

XF 1.2 Outdated templates and 1.2

John

Well-known member
#1
Why is it that more times than not when I try to use the TM to do a merge, I get this error...
The custom template is out of date but has been edited more recently than the parent. Merging can only be done by hand.
...when the custom template has obviously not been edited more recently than the parent?

Screen Shot 2013-10-21 at 7.34.22 PM.png

It is very frustrating.
 
Last edited:

Mike

XenForo developer
Staff member
#3
Based on seeing version numbers (rather than dates), I'd guess you're importing a style that's already out of date. As such, your templates are effectively last edited when you do the import so it doesn't have the version to compare against. Merging is not designed to be used with importing an old style; it's designed to be used with upgrades. (The system doesn't use version numbers for comparison in any way; it uses relative edit dates which allows merging to happen between parent and child styles for example.)
 

John

Well-known member
#4
If I edit/save the template that is listed out of date (in the imported style) in the master style, should that not then solve the date comparison issue, allowing for merging to proceed?
 

Mike

XenForo developer
Staff member
#5
No, as you need to know what the older version of the template is as well as the newer version.

A template is out of date if child.last_edit_date < parent.last_edit_date. We need to know what version of the parent the child version is based on; this is the most recent where parent_history.edit_date < child.last_edit_date. The history (old), parent (new), and child (yours) form the 3 things needed to do the merge.

When you edit the child, it's assumed that you're bringing in the necessary changes from the parent. As such, 3 way merging is no longer possible.
 

John

Well-known member
#6
Okay, gotcha, thanks. At least "View Custom Changes" gives me a snapshot of what I'm dealing with and helps me decide if reverting is appropriate or a file comparison tool is. :)