svk

I have to make local changes to my project files in order to get it to run in a different environment. Twice now I accidentally checked those changes in (and messed up everyone else's running environment). There are probably a lot of better ways to set up our build, but since I work as a consultant on an established project I can't really change how the customer works. I've tried setting up a second branch in the same repository (which backfired, duplicating the entire tree in the root of their repository--I won't be messing around with that again). Tried setting up a second repository of my

Some complex subversion merges are coming up in my project: big branches that have been apart for a long time. Svn gives too many conflicts - and some of them seem spurious. Given that git is praised for a superiour merge experience, Would it be any good to use git-svn just for the benefit of making the merge more manageable? Can you recommend other alternatives (eg. svk , hgsvn ) to lessen the merge pain? Some conflicts are easy enough to resolve (e.g java imports, whitespaces) - so I'm also wondering if there is any automated solutions for those. A full switch to DVCS might happen in the