help to manually merge SearchForm.html

[florenceit]

i just installed 4.5b patch and have the notice that i must:

Manually merge the following files:
/sugar/modules/ProjectTask/SearchForm.html
/sugar/modules/Project/SearchForm.html

i have been playing around with diff, merge, sdiff for an hour with no luck. syntax errors using ed i think is my issue. ed docs that i find dont make sense or work. I tried installing winmerge on my windows machine, and running that to compare the 2 files, but on some lines it is not clear which way i should copy changes.

is there any tips on how to do this with the tools ive mentioned? sdiff looks to be the easiest but ive got some syntax wrong somewhere. any guides people could recommend? it seems this is worth learning as it will certainly prove useful to know.

thanks!

[kbrill]

I could help, but why do you have to merge these files?

[thecas]

I received the same error after updated 4.50a to 4.50b today.

When upgrading from 4.21b to 4.5 I manually checked all the boxes to allow Sugar to automatically update the files. So 4.50a was a clean install with no mods. It meant losing the improved calendar view, etc., but I wanted Sugar to be as stable as possible.

When i upgraded to 4.50b I forgot to open the detail list and didn't see the two SearchForm files that would require manual merging. Sugar won't allow a reinstall of the patch to allow automated updating.

First - recommendation - if upgrading to 4.50b and you haven't customized Sugar - be sure to allow Sugar to automatically update all files.

Second - Could this be related to the new "Saved Searches" feature? I did save a new account search.

[florenceit]

hi, thanks for responses, well when i applied the patch from 4.5 to 4.5b through the web interface , on one of the preliminary checks i was told id have to manually update such and such, and it asked me if i wanted to have an appointment scheduled/emailed to me reminding of this issue. i know this is the kind of info i usually roll my eyes over when i get similiar from clients its just that there were no ominous warnings or red exclamation marks so i went through with it all, not thinking it was going to be worth remembering. after the upgrade i got an email telling me i had to manually run this merge.

lookiong at the files they appear different, though one has a newer version number. can i just overwrite the 1.09 with the 1.10?

(though i would like to know how to use sdiff, i am not hitting the right commands in ed as its erroring out with code 2)

[russgalleywood]

Yep, similar thing for me, I recieved an email saying I need to merge;

/sugarserver/sugar/modules/Configurator/EditView.tpl

Help!

[florenceit]

Just ran the 4.5c upgrade yesterday ith the same issues, I documented it this time. i run the wizard to install the 4.5c patch, when i get to the preflight checkscreen heres a copy and paste of what I got:

Preflight Check
All Preflight tests passed. Press "Next" to commit these changes.
File Merge
Auto-preserved Files:
./modules/ProjectTask/SearchForm.html
./modules/Project/SearchForm.html

Create Task Item for Manual Merge?
Email Yourself a Reminder for Manual Merge?

Show Files Requiring Manual Merge
The files listed below have been modified. Uncheck items that require a manual merge. Any detected layout changes are automatically unchecked; checkmark any that should be overwritten.

Toggle All Files [I DID CHECK THEM OFF]

./modules/ProjectTask/SearchForm.html
./modules/Project/SearchForm.html


Schema Changes
Character Set Schema Changes

Database Update Method
Check when SQL has been manually run


the ugrade runs fine and reports 4.5c, then get and email:

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:
/pathto server/sugar/cache/upload/upgrades/patch/SugarSuite-Patch-4.5.0c-restore



Thanks!