[simspark-devel] SVN Merge

[<ah...@un...>]

Hi,


I just tried to merge the changes to the trunk into the branch, which
Joschka recommended as it makes merging the branch back into the trunk
easier. Here's SVN's output:

andreas@andreas-desktop:~/simspark/branches/multiphys$ svn merge --dry-run
-r 102:171 https://simspark.svn.sourceforge.net/svnroot/simspark/trunk
svn: REPORT of '/svnroot/simspark/!svn/vcc/default': Could not read chunk
size: Secure connection truncated (https://simspark.svn.sourceforge.net)

Googling this doesn't really help, but the dry-run worked on Joschka's
Mac, interestingly enough. Tomorrow, I'll bring my laptop to see if it
works on that machine, though chances are slim because it uses the same
Linux distribution and this is apparently a bug in SVN.

Joschka had 26 conflicts, by the way, some of them in files that don't
exist. So there's some "fun" left for me as I have to find a way to modify
those nonexistant files ;-)

This is just an update, but any comments would be nice.


Andreas