Red Gate forums :: View topic - resolve conflct between database and source control version
Return to www.red-gate.com RSS Feed Available

Search  | Usergroups |  Profile |  Messages |  Log in  Register 
Go to product documentation
SQL Source Control EAP
SQL Source Control EAP forum

resolve conflct between database and source control version

Search in SQL Source Control EAP forum
This forum is locked: you cannot post, reply to, or edit topics.   This topic is locked: you cannot edit posts or make replies.
Jump to:  
Author Message
t_ramesh



Joined: 01 Feb 2010
Posts: 2

PostPosted: Mon Feb 01, 2010 4:20 am    Post subject: resolve conflct between database and source control version Reply with quote

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
_________________
Ramesh Thalluru
Back to top
View user's profile Send private message
simon.jackson



Joined: 08 Jan 2009
Posts: 45

PostPosted: Mon Feb 01, 2010 1:15 pm    Post subject: Reply with quote

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).
Back to top
View user's profile Send private message
t_ramesh



Joined: 01 Feb 2010
Posts: 2

PostPosted: Fri Feb 05, 2010 4:03 pm    Post subject: Re: Reply with quote

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.
_________________
Ramesh Thalluru
Back to top
View user's profile Send private message
Display posts from previous:   
This topic is locked: you cannot edit posts or make replies. All times are GMT + 1 Hour
Page 1 of 1

 
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum


Powered by phpBB © 2001, 2005 phpBB Group