What do you think is the best practice for checking in code from multiple files that implement multiple changes, but are ready to go in at one time? Do you check them all in at once, keeping the checking reasonably atomic, and put the changes in one long comment? Do you check in the files in groups so the right comment is associated wi...
I accidentally made 10 commits on branch "testing" when I meant to make them on branch "master". The other commits on the "testing" branch are garbage, so I don't want to merge it with "master". Instead, I just want to replay the last 10 commits on master. ...
Should I check in *.mo translation files into my version control system? This is a general question. But in particular I'm working on Django projects with git repositories. ...
Say I have 3 files foo.txt, bar.txt and moo.txt all at revision 1. Say I commit foo.txt and bar.txt ten times. So they are at revison 1.10. Since in SVN there is a single revision no moo.txt also has to be at revision 1.10. Now if I see the history of moo.txt then, will I see the history of commits from 1 to 10? The reason I am asking ...
Possible Duplicate: SVN and revision numbers Say I have 3 files foo.txt, bar.txt and moo.txt all at revision 1. Say I commit foo.txt and bar.txt ten times. So they are at revison 1.10. Since in SVN there is a single revision no moo.txt also has to be at revision 1.10. Now if I see the history of moo.txt then, will I see the his...
I've heard discussion about how OpenOffice (ODF) files are compressed zip files of XML and other data. So making a tiny change to the file can potentially totally change the data, so delta compression doesn't work well in version control systems. I've done basic testing on an OpenOffice file, unzipping it and then rezipping it with zero...
I am looking for a new source control solution. We are currently using an ancient version of VSS, and it sucks. This will be used by only me for now, and at most two or three others in the future. I would like it to be usable from within VS 2008. It has to be free. Our company is not buying any new software due to the economic downtur...
Hi, One of my teammates has asked if it is possible to export from one SVN to another, all while maintaining history. To me, this seems like it would be a common request. So: Is it possible to migrate between SVN repositories all while maintaining history? It is important to note that we do not have svnadmin access on the Source, but...
I have an automated build system using CruiseControl. I am using the SvnRevisionLabeller to to get the version string to use. With this string I can use nant to update AssemblyInfo.cs so when I build it has the correct build string. I can also use this CC label to tag the subversion repository. So everything is aligned - CCNet Build la...
Folks, Sometimes we need to have the Check-out functionality from VSS to be used in SubVersion, i.e. someone will only check-out a file/folder and nobody else can do that. I guess this feature is not present in SVN, but can we simulate it ?? ...
To follow up on my previous question Git work flow with an inexpirenced member. I choose to have him send patches to me. The problem is i haven't used patches before and i can't find tutorials giving explanation on the work flow. What i want is have him pull the latest code from the repo. create a branch work on it commit his changes wh...
I have a section in a POM that looks something like this: <scm> <connection>scm:cvs:ext:myhostname:/cvsroot/repo:module_name</connection> </scm> I typically use publickey auth to authentication against this cvs server, although it should accept my password as well. When I attempt to run mvn scm:update, mvn release:prepare, or any o...
I would be interested to in knowing how you out there handle the bumping the version number for new releases issue. How do you handle the version number in associated files like man pages, etc. The software is build with the gnu tool chain so autoconf, automake, etc are available and used for the version number of the application. So t...
Whenever I use the "revert changes from this revision" function in Tortoise SVN, then do "Check for Modifications", I end up seeing a bunch of irrelevant "Property" modifications to files that have nothing to do with the revision I'm reverting (in addition to the relevant "Text" modifications that I do care about). Why is this happenin...
Basically, what I want to achieve, is to be able to have 2 separate solutions containing the same set of projects, but 1st solution needs to be bound to source control, 2nd - not. So whenever you want source control integration in Visual Studio, you can open 1st solution, but if you don’t want it, you can open the 2nd one. The problem...
There has been some discussion on the SO community wiki about whether database objects should be version controlled. However, I haven't seen much discussion about the best-practices for creating a build-automation process for database objects. This has been a contentious point of discussion for my team - particularly since developers a...
I might propose migrating away from VSS due to its inability to grant and deny permissions at the file level. The question is what source control systems allow this. Update I am marking the SVN answer as the "correct" one, since it had the most feedback. However, there is no correct answer. I will make my recommendations to management b...
Anyone know if it is possible to ignore all the instances of a particular directory in a file structure managed by git. I'm looking to exclude all the 'target' folders in a maven project with a number of submodules. I know I can explicitly exclude each of them in a top level .gitignore, but I'd really like to be able to specify a patte...
My company has an ASP.NET application in a VSS repository. Management would like some of the files in the repository to be read-only to most users, while the rest of the files would be writable to all users. I don't think this can be done, but if its possible, it would require sharing. One possible strategy would be for the entire proj...
What file extensions from a .net application should be excluded from source control and why please? ...