Re: [superversion] merging states with changed binary files

[Stefan R. <do...@dr...>]

Cook, Darren wrote:

> Hi Stefan,
>
> Hope your thesis is going well and my question isn't too difficult to
> answer.
>
The thesis is slowly but certainly driving me crazy, but thanks for
asking... I still hope for t(completion) < t(insanity) though %|

> 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?
>
Well, that's one of the things that will be better in the next beta.
You'll get a choice whether to overwrite, skip the file altogether or
save the repository verison under a different name. Right now, the
update/merge just fails which is of course a poor way of handling the
situation. The only thing you can do here is rename or delete the file
in the work area, then do the update and then possibly delete and re-rename.

> 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.
>
Hm... probably a fundamentally similar problem. I'll have to try that
myself to see what actually happens. A simple solution for now is
deleting the uncommitted change.

Cheers,
-Stefan