After merging Redhat's initscripts (a vendor branch), with Mandriva's initscripts, I realized again that I don't like SVN very much:

• SVN can't build a diff between a remote URL and a local checkout (CVS was able to do that)
• SVN doesn't handle tags in branches, which makes import of a new release in a vendor branch quite hard, svn_load_dirs can help, it imports way too many modifications, files being add/removed without any reason (CVS allowed to import directly in a branch tag)
• properties can't be modified on a remote URL, it makes difficult to modify a vendor branch import
• intelligent eol-style make some diffs unusable with patch (for example between branches using different EOL markers)
• checking out CRLF files with the native eol-style property output files with a different EOL (breaks some PO files)

My hacks for maintaining Mandriva initscripts and merging it with RedHat's initscripts:

• a script to import a vendor release in a branch and tag it, using svn_load_dirs
• remove SVN eol-style property for the PO files, copy original PO files over, commit again
• remove the Id SVN keyword in the PO files so that I can apply cleanly our patches over RedHat sources (not much SVN's fault here)

Useful links:

• Vendor branches in SVN
• Merge using tags in SVN

Please give me my CVS back /o\