What is the best way to check-in merges when it comes to indicating what is being merged? I have say 10 changesets I am merging from my main branch to a release branch. Each of those contains detailed comments that I have written when checking in to the main branch. Now when I am merging I find myself and other members of the team writin...
Problem statement The entire codebase was accessible to everyone till now. Now I need to enforce people get code of only those modules which they will work on, for other modules they will get a library as in lib. Assuming we have two modules right now thinkbot (HEAD) -> assemblebot (tree/subdir) -> include -> source -> lib -...
I work in a mixed source control environment. We are still mostly on CVS, but newer projects are in SVN. However, I am finding it hard to get buy-in for SVN because TortoiseSVN doesn't work like TortoiseCVS. The 3 way merge has a lot of cognitive dissonance and while TortoiseCVS seems to always get the merges right, TortoiseSVN almo...
Is there a way in Eclipse to view all recent changes of a project? Like in SVN, you can just go "view log" on a right-click menu of a folder. In CVS/Eclipse, I can only view history on a certain file. I am not able to see what files were changed in the last commit. >.<'' Thank you! ...
I have the opportunity to give a formal presentation to my boss about anything that benefits the company. My idea is to adopt source control in my workplace. I have been using Mercurial to manage my own project at work, but the rest of the team does not have a formal source control system in place. Unfortunately, I'm not very good at p...
I am a single developer working on a project for my company. I use subversion and Trac (for bug-tracking and communication with management types). I have a staging server and a production server. Today I checked in some code and discovered that my FSFS-based svn (v1.4) repository is irreparably corrupt. While this is quite a bummer it ha...
They are XML, but it seems that they seem to be recreated each time the map is being saved and the ids of the elements inside are changing each time. The tool (Message Designer) is quite old and not very convinient to use. Have you any hints how to version, track changes in such map? Or is there an alternative for Message Designer? ...
The team where I work still uses SUN Teamware for Source Code Management (SCM). I've worked with it for a while now (over 10 months) and I don't have any particular complaints about it. Teamware has been used to manage Sun’s largest source trees, including those for the Solaris operating system and the Java system, and it works pretty w...
I use $Rev:$ in a file to have the revision number, the problem is that the file does not change a lot so the number is not automatically updated. Any help in how to do this? ...
I'm using a Subversion repository hosted on Dreamhost for a project. I would like to allow access to some users on a restricted basis. At the very least I would like to allow read-only access to some users, but ideally I would like to prevent some users seeing some parts of repository at all. I can't find user permissions mentioned in t...
When developing an application with lots of stored procedures, should you store them in some sort of source versioning system (such as source-safe, TFS, SVN)? If so, why? And is there a convenient front end way to do this with SQL Server Management Studio? ...
We're a 4-person team and haven't been far from our comfort zone in several years, but we're growing and would like to catch up to the times. I have been tasked with finding the best way to implement Continuous Integration (automated builds, branching for code maintenance and new features, etc). We are looking at switching from SourceS...
I am trying to get our company's database objects stored in source control. We are going to be stuck using Aldon LM for our source control program. What is the best way to deploy scripts that we create to our SQL Server environments automatically from source control? For our .Net web applications, we have configured Aldon to push ou...
I'm having a slight issue wrapping my head around on how to set up Subversion when working with php files. I store all my files at c:\www[nameOfProject]\htdocs and I setup virtual hosts for each project. (c:\www\project1\htdocs\index.php maps to http://localhost/project1/index.php). How do you guys handle using SVN? Lets say I have c:\...
I've found myself asking the question: should I make one repository for all the projects at this client? or should I make a separate repository for each? Which do you normally decide? Please list the advantages and disadvantages of either approach which lead to your decision. EDIT: Please mark as duplicate for one of the following: ...
Well, relatively speaking they don't change often, but a positive side of it is that you can check out a website and expect it to run and look normal on your local machine. What do you do? ...
What tools or approaches would you recommend to a 'one-man team' to keep organized? I'm doing research that involves a lot of coding, writing hundreds of throw-away perl scripts, C++ binaries that get used until I find some better approach, large amounts of data that gets preprocessed in different ways, where some new preprocessing mak...
Folks I'm facing repeated code conflicts while pulling from the shared git repo in the following scenario: There is a common svn repository There are several developers who track/sync this common svn repo with their own local git repos using git-svn bridge(via git svn rebase/dcommit) From time to time these developers using git need to...
I am looking for the 'svn update' of the Monticello version control system. I use the browser to search for new mcz packages, but I want to be able to do it with a script. ...
I am in charge of a database. It has around 126 sprocs, some 20 views, some UDFs. There are some tables that saves fixed configuration data for our various applications. I have been using a one-big text file that contained IF EXIST ...DELETE GO CREATE PROCEDURE... for all the sprocs, udfs, views and all the insert/updates for the confi...