I am not new to Subversion, but I have up till now used Tortoise and never the commadn line. My question is, how do I ignore all files like *.o from the ENTIRE source not just the root. For example, if I have the following files: /myfile.o /folder1/myfile2.o /folder1/folder1.1/myfile3.o /folder2/myfile4.o If svn propedit svn:ignore "....
I am using Subversion and Subclipse for my source control and follow the process of having a main trunk and taking branches for versions. This works well and there are no major problems merging. However when there are significant changes to a file both in the trunk and the branch (unfortunately necessary) I have to manually edit the co...
Reflective/Cyclic Merging This is easiest to explain with an example. Suppose you are working on a feature branch copied from your trunk. During the development process you regularly merge ''all'' new changes from trunk to your branch so that the branch stays in "synch" with the work occurring on trunk. When you eventually merge your...
I have checked out an external svn repository that I have applied a couple of patches to. (Applying the patches can only be done manually due to conflicts.) Now I want to be able to maintain this local copy of the remote repository in a proper way. (I do not have any other access rights than read on the remote repository.) First of all...
In my Copious Free Time, I collaborate with a number of scientists (mostly biologists) who develop software, databases, and other tools related to the work they do. Generally these projects are built on a one-off basis, used in-house, and eventually someone decides "oh, this could be useful to other people," so they release a binary or s...
We have a large codebase in VS 2008. We have developers that need to rely on the VS IDE for day-to-day development. But we also have complicated dependencies and deployment steps and require an automated nightly build. I am familiar with NAnt. It is perfect for our out-of-IDE build and deployment steps. Unfortunately, I haven't seen a n...
I have tried using Ankhsvn with VS 2008, and I am getting a Package Load Failure. Any body got any ideas, how to find out what is causing the problem. Is there a log file that I can analyse? Thanks ...
Automated merging isn't perfect. Just because there isn't a line-edit conflict doesn't mean there isn't a syntactic conflict, and that doesn't mean there isn't a semantic conflict. Does anyone have strategies for authoring low-conflict changes? Is this something that falls out of TDD or other approaches (Certainly TDD will help catch th...
I am using msysgit on windows vista. I am still very new to it and on my first committed code to github another member said that all the tabs were replaced with spaces. Could it be possible that msysgit is changing this? I am editing the files in VS2008. Is is just come c sharp .cs files. ...
How can I bookmark a project in TFS for quick access. we have a huge project repository with branching and many levels of hierarchy. I'm looking for some way to mark my favorites projects in Team Explorer Environment: TFS 2008, VS 2008 ...
After some use Visual Studio 2008 when opening a solution that is checked into Visual Studio Team Foundation will pop up a dialog saying: Projects have recently been added to this solution. Do you want to get them from source control? This happens every time the solution is loaded (even if no projects have been added). The only w...
When I do a merge conflict resolution with Kdiff3 (and other merge tool I tried) I noticed that on resolution a *.orig file is created. Is there a way for it to not create that extra file? ...
Is there a way to keep a timestamped record of every change to every column of every row in a MySQL table? This way I would never lose any data and keep a history of the transitions. Row deletion could be just setting a "deleted" column to true, but would be recoverable. I was looking at HyperTable, an open source implementation of Goog...
I am doing my study's final year project and would like to do a little survey here. The topic is about configuration management and version control system for an industrial product (such as a piece of software, a furniture design, a car engine or even an aeroplane design etc...) 1.) What is you field of expertise (IT, engineering, manuf...
We're still developing a bunch of our application in Clarion 6 Enterprise. I was wondering if anyone knows of a sourcecontrol system that works well with Clarion 6? ...
I want to set up TFS permissions to better reflect the responsibilities and levels of clearance of different roles within my organization; I'm finding that the default Reader and Contributor groups are too coarse-grained for my needs (and too loosely named). To keep maintenance overheads to a minimum, I'm therefore thinking of replacing...
Is there a method to externalize my SCM credentials so they are not stored in the project's POM? The problem being if they're contained in the project's POM, they will be visible to all when the project is deployed. ...
Hello All. I am currently in the process of learning the CodeIgniter PHP framework. At the current moment, I am looking to have a DEV environment and a PRODUCTION environment. Coming from a purely C and JAVA background, I am used to having everything locally (with version control), but since I will have the PRODUCTION side on a website,...
What is the best approach for working at a customers site (with several people) where there maybe not internet access the whole time and using a subversion repository? (Migrating to Git or Mecurial is out of the question at the moment) But wouldn't it be possible to leverage something like, for instance the Git SVN Integration, to crea...
Maybe a bit of a newbie question, but I don't want to mess up my visual studio installation at the moment :p I currently have Visual Studio 2008 installed with Team Explorer and TFS Power Tools which I use for work and a few projects on Codeplex. Today I discovered an interesting tool called VisualSVN which I would like to try out since...