How can we help you today? How can we help you today?

resolve conflct between database and source control version

I have been using source control 3-4 days. It is good so far. When I launched SSMS and clicked my database I received a SVN error. I forgot to take the screen shot but I clicked YES in order to resolve it automatically. Now all my changes are showed as "Conflict" under "Change type". Only way to resolve is getting latest from the source control which is my previous version. Which I don't want to do that. I know my database version is current but there is no way to commit the changes.

I can UNlink the SVN and start over. But i loose my change history.

Any help is highly appreciated.

Thanks,
Ramesh
Ratha
0

Comments

2 comments

Sort by
  • simon.jackson
    Hi Ramesh,
    For the original error, it would be handy if you could send me ( simon dot jackson at red-gate dot com ) your logs from %LOCALAPPDATA%\Red Gate\Logs\SQL Source Control 0 so i can have a dig round for what the original error was.

    The functionality you need to recover (Telling source control the your object is the way you wish to resolve the conflict) is not implemented yet, but you should in theory be able to fake it out by hand so you can continue working.

    One option would be to use TortoiseSVN (or you svn client of choice) to check out the whole scripts folder, then use SQL Compare to sync the live database to that folder and commit the changes manually (again using TortoiseSVN). You are aiming to make sure that the version in source control is the same as your live database ( so that the conflicts go away ).

    If that's not possible than I have a few other options in mind.


    you may also find that you need to unlink and re-link to the same place once you've done this, since there is a known issue with our recovery from SVN errors (SOC-138).
    simon.jackson
    0
  • Ratha
    thanks for getting back to me. it turns out that i had some bad sectors in my hard drive. once i replaced my hard drive and restored the backup all seems to be working fine.
    Ratha
    0

Add comment

Please sign in to leave a comment.