This is really interesting and I will be using this in future to keep my TYPO3 src up to date, I have one question though, how can you manage files that you have changed in the src? I try to avoid modifying any code, however we have updated the gfx icons for file types.
comment #5
Michael StuckiAugust 6, 201015:02
As long as the files don't change on the upstream side (= in the repository), your changes won't be touched.
Once they are changing in upstream Subversion will try to merge the changes. In case of an image (= binary file) this is not possible, therefore a conflict will be triggered.
In the case of such a conflict, both versions (yours and the remote version) would be preserved, so you could resolve the conflict quite easily...
The best part is: "Michael is currently learning Git, a tool which may replace Subversion for TYPO3 core development in the future."
Whooo!