In the beginning of the debugger branch, I was using git-svn (or something like that).
In the end it turned out that it doesn't support the useless (in my opinion) rev/author/date tags.
Thus generating a patch was impossible and I had to use dir-diff to generate the patches.
So Morten before using SmartGIT, check if it supports this tags.
Also if be more branch-friendly in the future, we should switch to git/hg/something fashionable, where merging is no problem!
The smart client won't fix the problem, it will make it show less often.
p.s. the debuggers branch is the only time I've used git (never used hg or something else), so I can't say if we should/must switch.