fcplazup problem with the keeplocalchanges option

Forum > General

(1/1)

freek:
First of all, many thanks for the great installation tool you maintain.

Now to my question concerning fpclazup-i386-win32.exe v2.0.1a on Windows 7.

For years I use fcplazup as the central tool to transparently autocreate security software binaries from sources at the user's Windows computer, shipped within an InnoSetup file. In order to integrate the source code of a Lazarus control I modified, after pulling data from the repository [lazdld] I overwrote the original .inc file and reran fcplazup with the 'keeplocalchanges=true' option [lazbld].

--- Code: Text [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} ---[lazdld]logfilename=fpclazup.loginstalldir=F:\MyApp_IDEfpcurl=https://gitlab.com/freepascal.org/fpc/sourcelazurl=https://gitlab.com/freepascal.org/lazarus/lazarusfpcrevision=3.3.1-8790-g98574a88a3lazrevision=main-2_3-304-g0ab69e8387fpcopt="-g -gl -O1"lazopt="-g -gl -O1"verbosenoconfirm=truefpcuplinkname=""lazlinkname="MyApp IDE"keeplocalchanges=falseonly=LazarusGetOnly,HelpLazarusGetOnly [lazbld]logfilename=fpclazup.loginstalldir=F:\MyApp_IDEfpcurl=https://gitlab.com/freepascal.org/fpc/sourcelazurl=https://gitlab.com/freepascal.org/lazarus/lazarusfpcrevision=3.3.1-8790-g98574a88a3lazrevision=main-2_3-304-g0ab69e8387fpcopt="-g -gl -O1"lazopt="-g -gl -O1"verbosenoconfirm=truefpcuplinkname=""lazlinkname="MyApp IDE"keeplocalchanges=trueonly=Lazarus,HelpLazarus
While moving from SVN to GitLab I now noticed, that 'keeplocalchanges' no longer works and, though it seems to be recognized, repository data are restored.

--- Code: Text [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} --- [2021-08-28 16:38:15.677 Info] LazarusNativeInstaller (GetModule: Lazarus): Executing: F:\MyApp_IDE\fpcbootstrap\git\cmd\git.exe log -n 1 --grep=^git-svn-id: (working dir: F:\MyApp_IDE\lazarus) [2021-08-28 16:38:15.847 Info] Lazarus: WARNING: found modified files. [2021-08-28 16:38:15.857 Info] lcl\include\customcombobox.inc [2021-08-28 16:38:15.857 Info] Diff with last revision stored in F:\MyApp_IDE\lazarus\revhash_main-0-g0ab69e8387.difffffff [2021-08-28 16:38:15.867 Info] Lazarus: reverting to original before updating.[...] [2021-08-28 16:38:57.086 Info] LazarusNativeInstaller (GetModule: Lazarus): Executing: F:\MyApp_IDE\fpcbootstrap\git\cmd\git.exe log -n 1 --grep=^git-svn-id: (working dir: F:\MyApp_IDE\lazarus) [2021-08-28 16:38:57.237 Info] Lazarus: WARNING: found modified files. [2021-08-28 16:38:57.247 Info] lcl\include\customcombobox.inc [2021-08-28 16:38:57.247 Info] Lazarus: leaving modified files as is before updating.
Is it git that, different from svn, doesn't accept such an approach, so that I have to integrate my code changes with some git command call? Do I have to modify my settings.ini file in any way? Or is there some other workaround?

TIA

Navigation

[0] Message Index