Task - Upgrade Process: Manually Merge Files

[jscherber]

The 4.5 upgrade process assigned me a task (very nice of it) I don't quite understand:

Please use whichever diff method is most familiar to you to merge these files. Until this is complete, your SugarCRM installation will be in an uncertain state, and the upgrade is not complete.

Backups of Overwritten Files are in the following directory:
/home/scherber/public_html/crm/cache/upload/upgrades/patch/SugarSuite-Upgrade-4.2.1-to-4.5.0-restore

Manually merge the following files:


/home/scherber/public_html/crm/modules/Prospects/Popup_picker.html
/home/scherber/public_html/crm/modules/Prospects/EditView.html
/home/scherber/public_html/crm/modules/Prospects/DetailView.html
/home/scherber/public_html/crm/modules/Prospects/SearchForm.html
/home/scherber/public_html/crm/modules/Accounts/ShowDuplicates.html
/home/scherber/public_html/crm/modules/Accounts/Popup_picker.html
/home/scherber/public_html/crm/modules/Accounts/EditView.html
/home/scherber/public_html/crm/modules/Accounts/DetailView.html
/home/scherber/public_html/crm/modules/Accounts/SearchForm.html
/home/scherber/public_html/crm/modules/ProjectTask/EditView.html
/home/scherber/public_html/crm/modules/ProjectTask/DetailView.html
/home/scherber/public_html/crm/modules/ProjectTask/SearchForm.html
/home/scherber/public_html/crm/modules/Versions/index.html
/home/scherber/public_html/crm/modules/Import/ImportStep1.html
/home/scherber/public_html/crm/modules/Import/ImportStep2.html
/home/scherber/public_html/crm/modules/Import/ImportStep3.html
/home/scherber/public_html/crm/modules/DocumentRevisions/DetailView.html
/home/scherber/public_html/crm/modules/Tasks/EditView.html
/home/scherber/public_html/crm/modules/Tasks/DetailView.html
/home/scherber/public_html/crm/modules/Tasks/SearchForm.html
/home/scherber/public_html/crm/modules/Groups/EditView.html
/home/scherber/public_html/crm/modules/EmailTemplates/EditView.html
/home/scherber/public_html/crm/modules/EmailTemplates/DetailView.html
/home/scherber/public_html/crm/modules/Users/SetTimezone.html
/home/scherber/public_html/crm/modules/Users/Popup_picker.html
/home/scherber/public_html/crm/modules/Users/ListView.html
/home/scherber/public_html/crm/modules/Project/EditView.html
/home/scherber/public_html/crm/modules/Project/DetailView.html
/home/scherber/public_html/crm/modules/Project/SearchForm.html
/home/scherber/public_html/crm/modules/Bugs/Popup_picker.html
/home/scherber/public_html/crm/modules/Bugs/EditView.html
/home/scherber/public_html/crm/modules/Bugs/DetailView.html
/home/scherber/public_html/crm/modules/Bugs/SearchForm.html
/home/scherber/public_html/crm/modules/Campaigns/EditView.html
/home/scherber/public_html/crm/modules/Campaigns/DetailView.html
/home/scherber/public_html/crm/modules/Campaigns/SearchForm.html
/home/scherber/public_html/crm/modules/Notes/EditView.html
/home/scherber/public_html/crm/modules/Notes/DetailView.html
/home/scherber/public_html/crm/modules/Notes/SearchForm.html
/home/scherber/public_html/crm/modules/Activities/SubPanelView.html
/home/scherber/public_html/crm/modules/Calls/EditView.html
/home/scherber/public_html/crm/modules/Calls/DetailView.html
/home/scherber/public_html/crm/modules/Calls/SearchForm.html
/home/scherber/public_html/crm/modules/Cases/Popup_picker.html
/home/scherber/public_html/crm/modules/Cases/EditView.html
/home/scherber/public_html/crm/modules/Cases/DetailView.html
/home/scherber/public_html/crm/modules/Cases/SearchForm.html
/home/scherber/public_html/crm/modules/Opportunities/EditView.html
/home/scherber/public_html/crm/modules/Opportunities/DetailView.html
/home/scherber/public_html/crm/modules/Opportunities/SearchForm.html
/home/scherber/public_html/crm/modules/MailMerge/Step2.html
/home/scherber/public_html/crm/modules/MailMerge/Merge.html
/home/scherber/public_html/crm/modules/MailMerge/Step3.html
/home/scherber/public_html/crm/modules/Administration/Diagnostic.html
/home/scherber/public_html/crm/modules/Leads/Popup_picker.html
/home/scherber/public_html/crm/modules/Leads/DetailView.html
/home/scherber/public_html/crm/modules/Leads/SearchForm.html
/home/scherber/public_html/crm/modules/Leads/ListView.html
/home/scherber/public_html/crm/modules/Emails/DetailViewSent.html
/home/scherber/public_html/crm/modules/Emails/ListViewGroupInbox.html
/home/scherber/public_html/crm/modules/Emails/ListViewHome.html
/home/scherber/public_html/crm/modules/Emails/ListViewDrafts.html
/home/scherber/public_html/crm/modules/Emails/ListViewMyInbox.html
/home/scherber/public_html/crm/modules/Emails/Popup_picker.html
/home/scherber/public_html/crm/modules/Emails/ListViewSent.html
/home/scherber/public_html/crm/modules/Emails/EditView.html
/home/scherber/public_html/crm/modules/Emails/DetailView.html
/home/scherber/public_html/crm/modules/Emails/EditViewArchive.html
/home/scherber/public_html/crm/modules/Emails/ListViewAll.html
/home/scherber/public_html/crm/modules/Emails/PopupDocuments.html
/home/scherber/public_html/crm/modules/Emails/ListView.html
/home/scherber/public_html/crm/modules/iFrames/EditView.html
/home/scherber/public_html/crm/modules/Documents/Popup_picker.html
/home/scherber/public_html/crm/modules/Documents/EditView.html
/home/scherber/public_html/crm/modules/Documents/DetailView.html
/home/scherber/public_html/crm/modules/Documents/SearchForm.html
/home/scherber/public_html/crm/modules/Meetings/DetailView.html
/home/scherber/public_html/crm/modules/Meetings/SearchForm.html
/home/scherber/public_html/crm/modules/EmailMan/config.html
/home/scherber/public_html/crm/modules/Contacts/Popup_picker.html
/home/scherber/public_html/crm/modules/Contacts/DetailView.html
/home/scherber/public_html/crm/modules/Contacts/SearchForm.html
/home/scherber/public_html/crm/modules/Contacts/Email_picker.html
/home/scherber/public_html/crm/modules/Employees/EditView.html
/home/scherber/public_html/crm/modules/Employees/ListView.html
/home/scherber/public_html/crm/modules/EmailMarketing/EditView.html
/home/scherber/public_html/crm/include/language/en_us.notify_template.html
/home/scherber/public_html/crm/include/SubPanel/SubPanelDynamic.html
/home/scherber/public_html/crm/themes/Sugar/header.html
/home/scherber/public_html/crm/themes/Sunset/header.html
/home/scherber/public_html/crm/themes/Links/header.html
/home/scherber/public_html/crm/themes/FinalFrontier/header.html
/home/scherber/public_html/crm/themes/FinalFrontier/header2.html
/home/scherber/public_html/crm/themes/Retro/header.html
/home/scherber/public_html/crm/themes/GoldenGate/header.html
/home/scherber/public_html/crm/themes/WhiteSands/header.html
/home/scherber/public_html/crm/themes/Shred/header.html
/home/scherber/public_html/crm/themes/Pipeline/header.html
/home/scherber/public_html/crm/themes/SugarClassic/header.html
/home/scherber/public_html/crm/themes/Paradise/header.html
/home/scherber/public_html/crm/themes/Love/header.html
/home/scherber/public_html/crm/themes/SugarLite/header.html
/home/scherber/public_html/crm/themes/RipCurl/header.html
/home/scherber/public_html/crm/themes/Awesome80s/header.html
/home/scherber/public_html/crm/themes/Awesome80s/header1.html
/home/scherber/public_html/crm/themes/Awesome80s/header2.html

Otherwise the installation went as smooth as butter. Congratulations to the entire Sugar Team for a great job!

Best, James Scherber

[dimitrisp]

Hi,

I have the same task to do and I don't know how to make the merge. Have anyone done this before?

Thanks
Dimitris

[jscherber]

Curious, anyone else experiencing this issue?

[jeffjw]

I havn't run the upgrade to 4.5 yet, but I have had to deal with several custom changes that I've made to our version of Sugar CRM. I usually track (document) all of my changes and files changed, so when I do an update I can check for overwrites that Sugar CRM does without notifiying me -- and the ones that it does notify me of.

Then I do a file compair using a program like WinMerge; just Google for it. It will allow you to compare two text files and merge what you need. Make sure to backup your current version of Sugar CRM so you can make any necessary comparisons. There is also a tool out there which will compare multiple files and directories.

Hope that helps some,
Jeff

[jscherber]

That is the thing. It is a completely stock installation of SugarCRM. I haven't made any modifications whatsoever. Any thoughts anyone?

Best, Jim

[dimitrisp]

Hi Everyone,

same here. I haven't made any modifications but I was asked to manually merge the following files:

C:/Program Files/apachefriends/xampp/htdocs/crm/include/SubPanel/SubPanelDynamic.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Accounts/SearchForm.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Accounts/ShowDuplicates.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Activities/SubPanelView.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Campaigns/SearchForm.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Contacts/DetailView.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Contacts/EditView.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Contacts/SearchForm.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Documents/SearchForm.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Emails/ListView.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Emails/ListViewDrafts.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Emails/ListViewSent.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Employees/ListView.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Groups/EditView.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/iFrames/EditView.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Import/ImportStep1.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Import/ImportStep2.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Import/ImportStep3.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Leads/SearchForm.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/MailMerge/Merge.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Notes/SearchForm.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Opportunities/SearchForm.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Project/SearchForm.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/ProjectTask/SearchForm.html
C:/Program Files/apachefriends/xampp/htdocs/crm/modules/Prospects/SearchForm.html

Thanks
Dimitris

[synchro]

I've found this a bit mystifying too. I'm familiar with handling merges and diffs, but in this case there is an important thing missing - there's only one of each file listed! How can you possibly merge a single file? What am I supposed to merge it with? It's not even the case that the files contain all merge information (like svn conflict files do), so I have no idea what I'm supposed to do here.

Oh, and I've not changed anything from a stock install either.

[jscherber]

Hhmmm...


These are all HTML files. I have no idea how you merge an HTML file!
I'm wonderfing if perhaps these files were replaced in the upgrade and that these assigned tasks are bogus?

Best, James Scherber

[parijke]

Also got this task listed.... also all html files

No idea what to do with it

[russgalleywood]

I had this problem too on a clean install of 4.5.