We recently upgraded to Subversion 1.5 server at BBC Worldwide. I ended up upgrading my client at the same time with the latest OSX binary from Colabnet. One weird thing started to happen though: whenever there were conflicts, TextMate wouldn’t allow me to use the ‘Resolve Conflicts with FileMerge…’.
Long story short: the interactive mode keeps TextMate from getting all the data so you don’t get the .rxxx & .mine files which are needed for FileMerge to show you the differences.
To fix this is:
- go into your TextMate Subversion Bundle
- go to the
Update to Newest (HEAD)command and add
You can see the resulting code here (change on line 14).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21