For quite a long time , i have been working with tortoise SVN, when i took the latest from the repository (after many days), to my goodness i found out many files were in the conflicted state. It takes a lot of time to manually resolve each of them manually. would someone suggest the best practices /3rd party tools / tips for resolving ...
What is a good strategy for dealing with changing product and feature names in source code. Here's the situation I find myself in over and over again (most of you can relate?)... Product name starts off as "DaBomb" Major features are "Exploder", "Lantern" and "Flag". Time passes, and the Feature names are changed to "Boom", "Lighthous...
I have a .NET service, based on ServiceBase: public partial class Service : ServiceBase Something initiates stop on this service. The stuff logged during service stop is consistent with a regular stop using SCM, but user states he didn't initiate it. I am not sure if that is some sort of crash, or user error. Since the OnStop method...
Hi all, We have developed a system that uses a single code base, consisting of 4 visual studio projects. with an admin website, and customer facing website. (each system has its own MS SQL database) This has been working great as all new websites (including admin) reference the same code base projects, from within SVN, therefore any ch...
I use continuum 1.2.3 to build maven projects. On a fresh continuum installation, I added a pom by upload. I try to build, and get the following error: Exception: Exception while executing SCM command. My SCM URL looks like this: (replaced domain name) scm:cvs:pserver:cvs.example.com:/Projects:car/wheel/ Any idea what went wrong?...
I am wondering how to get the last changes in a CVS module easy. ...
I understand the importance of using version control and I am trying to learn as much as possible so I can setup SVN for our company web development projects. Right now we all work from a single dev copy and it is messy at best. Many of our users work remotely and the dev server is on a slow internet connection. From what I have rea...
Using the OS X terminal, How an you view the contents of these files as plain text? ...
Hi, I have read lots of posts about the importance of database version control. However, I could not find a simple solution how to check if database is in state that it should be. For example, I have a databases with a table called "Version" (version number is being stored there). But database can be accessed and edited by developers ...
Hello All, I am quite new to version control and i am using svn as the project i am working on is hosted on svn. In my local working copy i added a temporary file and deleted it without using svn delete (as i was unaware). Now that file was still under version control so when I did commit my final changes to my private branch, that file...
I'm looking into svn externals for my company, and it seems like it would be a good feature for us to use. We have several products that often reference shared components, but have a bad habit of falling behind into older versions and even differently branched codebases sometimes. I've read a decent bit about how they work now, and I th...
How do each of these vcs handle renames? I have found a lot of contradicting information stating that git tracks loc's instead of files, renames would therfefore have no meaning for it. ...
Me and my friend using flex builder (eclipse based) with subclipse for a project. Before committing I always update but sometimes I could not commit because of conflicts. Then I use Team->Synchronize with Repository and it shows at the right side latest from repository and at the left side the my current working copy. It has a button...
I'm in a group which is starting to develop using InterSystems Ensemble (an integration framework built on top of InterSystems Caché). InterSystems has not made the Ensemble Management Portal source-control-aware and this seems a source of problems for development team we would like to address. I would like to know which version contr...
I have been tasked with figuring out how many lines of code I've written this year. Not very exciting for a number of reasons, but it seems like it could make a nice SO question. So in your favorite version control tool, how do you tell how many lines of code have been modified? In my particular answer blank lines and comments happen...
We are managing our software versions as branches in Subversion. The latest upcoming release is the trunk. Older released versions are a branch (also tagged per build and release). When a developer is fixing a bug in an older version, it is his responsibility to merge the fix into the trunk. In case this step is missed, it is hard to not...
Currently if I specify a description in hgwebdir.config it shows up the same for each repository. I want to have a unique name for each repository. Where and how do I set this? My hgwebdir.config looks like this at present: [web] style = Gitweb contact = BrianLy description = Same description for all. I want a unique description. allo...
The context is that I have an on off-the-shelf CMS which I want to make customizations to; so I want to keep the files I modify under version control, but I don't see the need to put the whole file tree under version control. My problem is that I need to add a file to be kept under version control which is located a few subdirectories ...
I don't like Mercurial polluting the source tree with .orig files and such. Is it possible to keep all such files in /tmp, for example? ...
I use git to keep track of changes made by our development team and committed into our central cvs-style repository. Since its cvs, it keeps track of files and not commits, making it sometimes difficult to tell exactly what files constitute the full patch for a bug fix. I just came across one and did the following: 1) trolling along, ...