[Debian-l10n-devel] Merge upstream to trunk for Virtaal

[Omar Campagne]

Hi:

I've been trying several methods to merge with svn, some don't work, and 
the one
I got to work is slightly intrusive (I'm used to git, I find svn is for 
intelectuals).

cd trunk
svn merge urltrunk urlupstream .

This one is fine but deletes debian/ (which is recoverable anyway).
How do you prefer this stuff do be done? Do you
just use "svn copy" instead of merge?

Regards,

Omar