History: Check if the update would cause conflicts
Source of version: 2 (current)
Copy to clipboard
{CODE(colors="shell")}svn merge --dry-run -r BASE:HEAD .{CODE}
* http://stackoverflow.com/questions/12964057/svn-preview-update-showing-conflicts-but-update-doesnt-result-in-conflict
* http://stackoverflow.com/questions/182945/how-to-see-what-will-be-updated-from-repository-before-issuing-svn-update-comm/182960
In ((doc:TRIM)), as of 2017-05-28, this is used:
{CODE(colors="shell")}svn merge --dry-run --revision BASE:HEAD . --allow-mixed-revisions{CODE}
In these two files:
https://sourceforge.net/p/tikiwiki/code/HEAD/tree/trim/src/rclib.php
https://sourceforge.net/p/tikiwiki/code/HEAD/tree/trim/src/appinfo/tiki.php