Re: [Tiki-devel] Git problem re cypht files

For the record, we have a task on this:
https://avan.tech/item61042-Change-cypht-integration-to-play-nicer-with-source-control-Was-Tiki-Manager-instance-update-report-failureserror-Your-local-changes-to-the-following-files-would-be-overwritten-by-merge-lib-cypht-site



On 2021-11-30 13:46, Jonny Bradley via TikiWiki-devel wrote:
> Hi Victor
> 
> This has been wrong (imho) since these files arrived, but i appreciate
> the problem that they're part Cypht, part Tiki...
> 
> This just tripped Roberto up while releasing 22.5, and this was the
> commit for the changes:
> 
>     https://gitlab.com/tikiwiki/tiki/-/commit/8c688865
> 
> So if these files need to be rebuilt depending on changes in Cypht
> maybe they should only exist in /temp or /storage and be rebuilt
> dynamically by the php code if/when it's run, like the minified css
> and js files?
> 
> If you use (as i do) a cron job to keep a tiki up to date, part of
> that upgrade should be to run composer install as part of setup.sh,
> which changes these files sometimes so next time the task does a git
> pull you get a conflict and the process fails.
> 
> Hope that helps find a solution, TIA :)
> 
> jonny
> 
> 
> 
> 
>> On 30 Nov 2021, at 08:43, Victor Emanouilov via TikiWiki-devel 
>> <[email protected]> wrote:
>> 
>> Hi Gary,
>> 
>> Can you please send me the output of `git diff` when you see this 
>> error? I suppose you switch between branches, do composer install 
>> which overrides these files and when you switch back to another branch 
>> you end up with mixed versions. Another reason might be if you are in 
>> 23.x, for example, and do `git pull origin master` - this will try to 
>> apply master branch commits to 23.x which is almost surely not want 
>> you want to do.
>> 
>> In theory, we can gitignore these files but then, people checking out 
>> will need to make sure they run composer to generate the files which 
>> they probably already do. These asset files are not strictly vendor 
>> files - they are a mix of vendor and Tiki styles/code for the Cypht 
>> integration. However, since they are automatically generated, we can 
>> simply stop treating them as source code and remove them from the 
>> repo. Can someone think of a case when composer install is not run 
>> upon a deployment? I think release process also runs that command.
>> 
>> Regards,
>> Victor
>> 
>> On 11/28/21 3:26 PM, Jonny Bradley via TikiWiki-devel wrote:
>>> I believe these files are in the wrong place, they should be in 
>>> vendor_bundled but i think there were path issues which meant that 
>>> wasn't possible... but can't remember why - Victor, any ideas? This 
>>> does cause disruption when running updates via a cron job sometimes.
>>> 
>>> jonny
>>> 
>>> 
>>> 
>>>> On 28 Nov 2021, at 06:46, Bernard Sfez via TikiWiki-devel 
>>>> <[email protected]> wrote:
>>>> 
>>>> Hello Gary,
>>>> 
>>>> In case you didn’t worked on those files.
>>>> 
>>>> It happens to me too from time to time.
>>>> I follow the message instructions to fix, overwriting my local 
>>>> version of those files with the repo files.
>>>> 
>>>> (I think "git checkout …” and the file name - but double check)
>>>> https://stackoverflow.com/questions/15296473/what-do-git-checkouts-really-mean
>>>> 
>>>> Bernard
>>>> 
>>>>> On 27 Nov 2021, at 16:41, Gary Cunningham-Lee 
>>>>> <[email protected]> wrote:
>>>>> 
>>>>> Hi,
>>>>> 
>>>>> When I do a git pull origin master, it fails, with this error:
>>>>> 
>>>>>> error: Your local changes to the following files would be 
>>>>>> overwritten by merge:
>>>>>>         lib/cypht/site.css
>>>>>>         lib/cypht/site.js
>>>>>> Please commit your changes or stash them before you merge.
>>>>>> Aborting
>>>>> I never touch those files so I wonder why git thinks I've changed 
>>>>> them. Seems like these have been a problem . Do these cause a 
>>>>> problem for other people, Can I ask what commands others use to 
>>>>> update their local git check-outs?
>>>>> 
>>>>> Thanks,
>>>>> 
>>>>> Gary
>>>>> 
>>>>> 
>>>>> 
>>>>> 
>>>>> _______________________________________________
>>>>> TikiWiki-devel mailing list
>>>>> [email protected]
>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>>>> _______________________________________________
>>>> TikiWiki-devel mailing list
>>>> [email protected]
>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>>> 
>>> 
>>> _______________________________________________
>>> TikiWiki-devel mailing list
>>> [email protected]
>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>> 
>> 
>> _______________________________________________
>> TikiWiki-devel mailing list
>> [email protected]
>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> 
> 
> 
> _______________________________________________
> TikiWiki-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel


_______________________________________________
TikiWiki-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel