Hi,<br><br>As you will have seen from the commit I got it to work.  Can now get on with it.<br><br>Warning, merge seems to only work on a newly checked out working copy of the branch, any changes seem to cause chaos.  Make changes after merge before the commit back to the branch.  Have raised question with SVN.<br>
<br>Compiles, runs but is not extensively tested (Geany needs a regression suite, and if you find a usable GUI tester let me know I am looking for one ;-)<br><br>Regards<br>Lex<br><br><div class="gmail_quote">2009/3/17 Nick Treleaven <span dir="ltr">&lt;<a href="mailto:nick.treleaven@btinternet.com">nick.treleaven@btinternet.com</a>&gt;</span><br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div class="im">On Thu, 12 Mar 2009 13:55:47 +1100<br>
</div><div class="im">Lex Trotman &lt;<a href="mailto:elextr@gmail.com">elextr@gmail.com</a>&gt; wrote:<br>
<br>
&gt; I tried to update my working copy of the build-system branch with the latest<br>
&gt; changes in trunk so I had a reasonably up to date basis for further work.<br>
&gt;<br>
&gt; Used: svn merge  <a href="https://geany.svn.sourceforge.net/svnroot/geany/trunk" target="_blank">https://geany.svn.sourceforge.net/svnroot/geany/trunk</a><br>
<br>
</div>I think you have to say what range of revisions you want to merge, e.g.<br>
-r branched:HEAD</blockquote><div><br>Seems to help, not what the SVN book says, but who ever heard of documentation being up to date :-}<br></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br>
<br>
where branched is the revision no. your branch was copied from.<br>
<br>
Only recent versions of svn have branch tracking, and I haven&#39;t tried<br>
it.<br>
<br>
Also, it&#39;s a good idea to backup any local changes before a merge. svn<br>
should handle them, but if the command is wrong horrible things can<br>
happen :-/</blockquote><div><br>It appears that you have to not make any!!!!<br> <br></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br>
<br>
Regards,<br>
Nick<br>
_______________________________________________<br>
Geany-devel mailing list<br>
<a href="mailto:Geany-devel@uvena.de">Geany-devel@uvena.de</a><br>
<a href="http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel" target="_blank">http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel</a><br>
</blockquote></div><br>