[En-Nut-Discussion] Question about subversion merging

[Harald Kipp]

Hi all,

as explained previously, I'm not too familiar with svn branching and merging. Anyway, some global changes are waiting and I don't want to make merging the devnut_m3n branch more complicated than it needs to be. Looks like Ulrich is currently busy with other stuff, I decided to try my luck with

 cd devnut_m3n/
 svn mergeinfo https://ethernut.svn.sourceforge.net/svnroot/ethernut/trunk

But this shows no output. Next I tried 

 svn mergeinfo https://ethernut.svn.sourceforge.net/svnroot/ethernut/trunk --show-revs eligible

and this gives _all_ patches that had been introduced on the trunk since the devnut_m3n branch had been created. This would mean, that no changes had been transfered so far to the branch, right?

Thus, running

 svn merge https://ethernut.svn.sourceforge.net/svnroot/ethernut/trunk --dry-run

takes some time, applying a large number of patches.

Now I'm confused. How is this supposed to work? Why did Ulrich nag about recent changes, as it looks to me that _all_ changes are outstanding? Can anyone enlighten me?

Thanks,

Harald