Hi guys,<br><br>I tried to update my working copy of the build-system branch with the latest changes in trunk so I had a reasonably up to date basis for further work.<br><br>Used: svn merge  <a href="https://geany.svn.sourceforge.net/svnroot/geany/trunk">https://geany.svn.sourceforge.net/svnroot/geany/trunk</a><br>
<br>it noted conflicts in build.c/h and project.c as expected but it also deleted files like autogen.sh and Makefile.am as well as directories tagmanager and data among others.<br><br>Full command output attached(extracted from my xterm to file with self explanatory name aaa ;-).<br>
<br>Obviously it won&#39;t build and is generally !@#$%^&amp;*(ed.<br><br>I&#39;m no svn guru, any suggestions for fixes or a better way of doing it?<br><br>Cheers<br>Lex<br>