[superversion] merging states with changed binary files

[Cook, D. <dar...@ci...>]

Hi Stefan,

Hope your thesis is going well and my question isn't too difficult to =
answer.=20

I was using Superversion today, and had two states I wanted to merge. I =
gave it a try and it cancelled the merge with an Update conflicts dialog =
box, with a message "UNSOLVABLE: Binary file exists with different =
contents".  It was an Excel spreadsheet (our project has several =
spreadsheets used by the code base). My question is, what am I supposed =
to do now? I suppose what Superversion wants to do is show the =
difference between the two files and it can't. But what if I know that =
the state I'm merging into my work area has a newer file and should =
overwrite the existing one? Do I just have to do that manually by =
dragging the file into my work area and then committing it?

Secondly, I created a new file in one state, committed it, then edited =
it and didn't commit the edit. When I went to merge it had an update =
conflict which said the file was modified so it couldn't delete it.=20

Darren Cook
Enterprise Data Services - Applications & Tools
Cingular Wireless
dar...@ci...=20

"I love deadlines. I especially like the whooshing sound they make as =
they go flying by."  ~Douglas Adams=20