how do i handle this SVN message?
Forum rules
Please include as much detail in any test or bug reports for JEvents 1.5 as possible.
First of all, check if you are running the latest available version of Joomla! and JEvents. Posts for issues, where both systems are not updated, will be ignored.
We need the following at least:
* PHP version (e.g. 5.2.5). Note: Support for PHP4 is discontinued.
* Joomla! version
* JEvents version
* Web Server software (Apache or IIS with version number if possible)
* Server Operating system (e.g. Linux, Windows, Solaris, Darwin ...)
* Database version
* memory_limit from your phpinfo
* Web browser and version
Please enable error reporting and include any error messages in your posting. You do this via the Joomla Configuration - set "error reporting" to "maximum" on the Server tab.
Finally, please describe the steps required to recreate the problem and also please enable error reporting and give us any error messages generated.
Please include as much detail in any test or bug reports for JEvents 1.5 as possible.
First of all, check if you are running the latest available version of Joomla! and JEvents. Posts for issues, where both systems are not updated, will be ignored.
We need the following at least:
* PHP version (e.g. 5.2.5). Note: Support for PHP4 is discontinued.
* Joomla! version
* JEvents version
* Web Server software (Apache or IIS with version number if possible)
* Server Operating system (e.g. Linux, Windows, Solaris, Darwin ...)
* Database version
* memory_limit from your phpinfo
* Web browser and version
Please enable error reporting and include any error messages in your posting. You do this via the Joomla Configuration - set "error reporting" to "maximum" on the Server tab.
Finally, please describe the steps required to recreate the problem and also please enable error reporting and give us any error messages generated.
2 posts
• Page 1 of 1
how do i handle this SVN message?
by [Daniel] » Wed Feb 11, 2009 2:42 pm
Hello, I am pulling down the SVN 1304 updates today (I think 1296 was my last pull), but I got an error/warning during the admin\component update...
I checked to see if the file was read-only or something, but that wasn't the case. I'm new to SVN and TortoiseSVN, so thought I would ask here.Conflicted C:\Program Files\Apache Software Foundation\Apache2.2\htdocs\Joomla\administrator\components\com_jevents\events_config.ini.php
...
Warning! One or more files are in a conflicted state.
- [Daniel]
- Posts: 36
Re: how do i handle this SVN message?
by Geraint » Wed Feb 11, 2009 3:40 pm
SVN does a good job of tracking changes between versions but sometimes its can't resolve the differences => hence a conflict.
You have 2 easy choices:
1. Delete the ini file (and the 3 created by the conflict) and to another update (this way you loose your settings)
2. rename your existing ini file, delete the ini file (and the 3 created by the conflict), do another update and replace the SVN version of the ini file with your renamed version
Geraint
You have 2 easy choices:
1. Delete the ini file (and the 3 created by the conflict) and to another update (this way you loose your settings)
2. rename your existing ini file, delete the ini file (and the 3 created by the conflict), do another update and replace the SVN version of the ini file with your renamed version
Geraint
------------
JEvents club members can get priority forum support at the Support Forum. As well as access to a variety of custom JEvents addons and benefits.
Join the JEvents club today!
JEvents club members can get priority forum support at the Support Forum. As well as access to a variety of custom JEvents addons and benefits.
Join the JEvents club today!
-
Geraint - Posts: 30529
2 posts
• Page 1 of 1
Return to JEvents 1.5 (No longer actively supported)
Who is online
Users browsing this forum: Bing [Bot], Google [Bot]
Main Menu
User Menu
Hosted By
