[TYPO3-core] IMPORTANT: SVN changes

[Michael Stucki]

FYI: Note the changes I just added to misc/core_svn_rules.txt:

[G] Modifying / maintaining external projects which are merged into
TYPO3core
The following directories are merged from other sources and MUST NOT be
modified unless there is a very good reason to do so:
- typo3/sysext/dbal/
- typo3/sysext/extbase/
- typo3/sysext/fluid/

In order to modify these extensions, contact the development team of the
relevant extension.

How to merge changes from external sources (only for maintainers!)
1. Check the last synched version (noted in extname/last_synched_target)
2. Merge from this target and the new version:
   $ svn merge [last_synched_target] [new_target] typo3/sysext/extbase/
3. Before committing, update extname/last_synched_target
4. Commit the changes. Commit message must be "Merge with [extension]
[version]"


Michael Stucki schrieb:
> Hi folks,
> 
> after discussing with Oliver, I convinced him that all code should be
> stored in TYPO3core rather than using svn:externals for that.
> 
> Actually this should not have any consequences for anyone of you, since
> changes always had to be committed to the extbase repository rather than
> in TYPO3core. Only the maintainer has to deal with these directories.
> 
> However, if you will update to the latest Trunk now, your SVN client
> will most likely get into trouble because of this change. The reason for
> that is that extbase, fluid and dbal exist in TYPO3core (included by
> svn:externals), but the client is trying to add them once again.
> 
> The problem mainly occurs with the commandline SVN client. I'm not sure
> how other clients deal with the problem, but in any case, it is pretty
> easy to fix it using the first explanation below.
> 
> So here is a simple (generic solution) and an advanced way of dealing
> with this problem.
> 
> Simple way:
> ===========
> 
> Remove the whole project and check it out again.
> 
> 1. Remove the TYPO3core directory
> $ rm -rf TYPO3core_trunk/
> 
> 2. Check it out again
> $ svn co https://svn.typo3.org/TYPO3v4/Core/trunk/
> 
> 
> Alternative way:
> ================
> 
> The alternative way is for users who would like to keep their existing
> modifications. By updating to exactly the version where extbase/fluid
> were removed from TYPO3core, they successfully get deleted. If not, you
> can do that manually at the right place.
> 
> 1. Update to last version before extbase was removed:
> $ svn up -r 6553
> 
> 2. Extbase gets removed from svn:externals
> $ svn up -r 6554
> 
> (Check if extbase was removed here. Otherwise, remove it manually.)
> 
> 3. Extbase is added again
> $ svn up -r 6555
> 
> 4. Fluid gets removed from svn:externals
> $ svn up -r 6557
> 
> (Check if fluid was removed here. Otherwise, remove it manually.)
> 
> 5. Fluid is added again
> $ svn up -r 6558
> 
> 6. Remove dbal
> $ rm -rf typo3/sysext/dbal/
> 
> 7. Update to the latest version
> $ svn up
> 
> 
> - michael


-- 
Use a newsreader! Check out
http://typo3.org/community/mailing-lists/use-a-news-reader/