Anyway, in SVN, all is not lost because you can steal the lock. If you've ever been caught out by someone who's locked a file then gone on holiday or left the project/company, then you'll understand why I prefer lazy locking. Some prefer proper locking, some prefer lazy locking. Developers will argue about this until the cows come home. SVN has the concept of lazy locking where more than one person can check out the file. That talks about the command line version but it is even easier with tortoise (that is, if you are using Windows - for linux use rapidsvn). Have a look at branching and merging in the link below. Easiest way I've found is to allocate slots (2 hours or half day). This basically means only one person can have control of the tree at any time. If there is a conflict, then they do a merge before checking in. When they are ready to checkin, they do an update from the repository first. RE: ASP Source Control Aidy680 (TechnicalUser) If you always checkin at the project level, you won't get any problems. That often causes problems because the top level does not know about those so when you update the project, it may not get the latest files. Some people check in at different directory levels. It is basically a snapshot of the whole project at that point in time. You will see files that were present at 206 and deleted at later revisions.You will not see any new files introduced after 206.It will get all the files at the revision they were at when you checked in rev 206.If you then go on several revisions and want to get back to this state, just get the project at revision 206. The other files will be at whatever revision they were at when you pulled out the project. All the modified files will be at revision 206. It will tell you that this is checkin #206. That, in turn will pick up the modified files and check them in. On some systems, you'd have to check in each file individually. Play with a dummy project first: make sure you know what you are doing. If you get it wrong, they have the nasty habit of deleting everything and you are left without a source. Remember to take a copy of all your sources first before you play with any of them. With this sort of thing, I normally check in by feature. With git, I have to pop up git and check where I am in the source tree. I prefer svn to git because I can look at a file and tell whether I edited it last week or 10 weeks ago. MS has some source code control offerings but I've never used them. If you intend to use tortisegit, install git first because tortisegit looks for it. If you need a gui integrated with exporer, use tortisesvn or tortisegit. If you have include files that are read in by the asp code, then the headers will appear multiple times in the web page.
0 Comments
Leave a Reply. |