[dba-VB] SCRUM: Check out

Hi Gustav,

Yes, I see this LOck feature in Visual SVN but will that help to resolve conflicts or not - I'm not sure about that:

- imagine you  get lock on a form, make the changes and then commit them and
- somebody else does make the changes for their local version of form (version of code you started with ) and then commits the changes after your commits.

Do you expect SVN server will be able to properly merge such updates of the source code? (source code will get lines' inserts/updates/deletes in several places of several files when somebody edits a form in design mode). Am I missing something?

We should probably try how it works? - for that trial we have to have to create a test form and to have an online chat (MS Messenger, GoogleTalk, Skype ?) and do chat and do locks, edits, commits, updates to see what happens locally and on server side...

Thank you.

--
Shamil 

-----Original Message-----
From: "Gustav Brock" <Gustav at cactus.dk>
To: <dba-vb at databaseadvisors.com>
Date: Fri, 03 Apr 2009 12:41:45 +0200
Subject: Re: [dba-VB] SCRUM: Check out

> Hi Shamil
> 
> It should be noted that prior to start working on an existing form you must check it out by locking it.
> I don't know how to do that manually, but with VisualSVN installed you just pick VisualSVN from the popup menu of the form and select Get Lock and finish the task.
> 
> As I understand it, the lock will be released when you later commit the form changes.
> 
> /gustav
> 
> >>> Salakhetdinov Shamil <mcp2004 at mail.ru> 03-04-2009 11:54 >>>
> 
> - we're in a bit of trouble with us editing/committing to SCC the same .NET WinForms as when one makes design changes in them then local source code gets changed in several files - as result SVN commit  can't resolve source code changes' conflicts on committing local code changes. ..
> 
> 
> _______________________________________________
> dba-VB mailing list
> dba-VB at databaseadvisors.com
> http://databaseadvisors.com/mailman/listinfo/dba-vb
> http://www.databaseadvisors.com
>