Hi.. I have a real time scenario whre there is a one developer who created 3 change sets as in 1.1,1.2 & 1.3 and decides to checkin changeset 1.3. now the second developer checkesout the code and writes his code and does CheckIn. The situation is 1st developer decides that he should not have checkedIn 1.3 instead checked IN 1.2 but if he...
Hi, I'm currently working with a collection of projects which are all their own specific branches / extensions of a generic core project and I am looking for a way to manage the way the projects collaborate. I understand the following is a little vague, I only have a little experience with version control beyond the basic needs of a si...
This question is in a sense related to "Best way to share common code", but the situation is slightly different in this case. I am now coding an application, say A, for a project. It is unfinished and now a new project B, will be started and is basically a replicate of A with add-ons. As both projects are unfinished, it is likely that I...
Currently I do all of my work off of a flash drive. Keeps things portable, and I'm able to learn web development while I'm at work. Currently I run Portableapps with XAMPP, Notepad++, and Chrome installed on it. My question is, does anyone know of a version control system that would work portably on a flash drive? I just learned about t...
Greetings, I have been working a project in XCode for a while. I have been using xcode snapshots as a rudimentary version control. However, I have decided that it's about time I moved up into a real SCM system, so I plan to create a repository and import my project into SVN. My question is: Is there anyway to import my snapshots hi...
Hi All, I know this may sound silly but it seems that, my version of TortoiseSVN is unable to resolve conflicts even for text files. I've followed the manual to the letter (By selectingEdit Conflicts the resolving the conflict via Winmerge, and then, selecting Resolved) But when I viewed the text file, the conflict markers are still the...
Branching sources for release cycle is one of common source management scenarios. Merging as soon as possible is a good practice. Thus we have a human factor: branch is closed, but someone forgot to merge something back to trunk. Q: Is there a "one click" way to get all revision numbers that were not merged from branch X to trunk? (Not...
I've never worked with a VCS, so please correct me if I make any fundamental mistakes. For a project of mine, I've chosen to use Subversion, and I've been reading the documentation. If I understand correctly, the revision number is incremented for every check-in. However, this brings up a question. Is it possible to checkin more than o...
I've seen it mentioned that mercurial stores the executable bit on files, but cannot find out how to do it. I'm looking for functionality analogous to svn ps svn:executable '' TARGET. ...
I'm pretty new at Mercurial - actually new at source control. I have projects at localhost, which is ~/mamp/htdocs. I want to work all local. There is a point I'm confused about: I should keep repository at a different path than my htdocs I think, so I created "/reps/" folder and creating folders for each project under here, and copy a...
Is it accepted practice to commit even when you're just changing things like whitespace, code formatting, etc.? ...
I have a project which is attached to a SVN provider. I wish to move it to another repository, but when I try to publish to this new location, I am told the project is already bound to another. How do I break the link to that provider? MonoDevelop 2.2 ...
I think I said that all correctly. I've got a staging server with Git on it, my buddy and I push changes to that Git repo from our local clones of that repo, when we're ready to make something public, we tag it 'n all that, but then I have to do a git reset --hard to update the actual files on the server to HEAD, which seems a bit stran...
I have been struggling with Subversion for some time, thinking it was beginners problems that would go over. Though today I have been thinking through it, and realize that the problem is the way it is embedded with the client files, and that you work on the server db through these embedded files. So I wonder if: Is it perhaps just a...
I was wondering what the best approach might be in moving source code, with history, from one Team Project to another Team Project. I am not concerned with work items, reporting, or SharePoint sites, as the system we are going to be restoring from did not use these functionalities. The reason for wanting to move to a different Team Pro...
I would like to use svn export to export a bunch of files out of a Subversion repository. And I also wish to forgo keyword expansion on any of the keywords found in these files regardless of the svn:keywords property on this file. Is there a way to do this? I'm doing this because I want to compare the files in the repository against a...
I'm planning on doing local-only development, ie all services and resources are local and no remote servers. I'll be using Subversion for source control. Are there any benefits to doing a local install of the SVN server versus referencing the same local repository via a file-based approach (file://...)? (Windows system) ...
Possible Duplicate: C++ IDE for Linux? I usually program on Windows with Visual Studio, and I use Perforce for Source code control. Recently I ported a large application (250 kLOC) to Linux and was looking for something similar to Visual Studio to program in on Linux. What I wanted in the C++ IDE was three things: integrated s...
Mercurial provides a -A, --after option for moves and copies, which records those operations after they've already occurred. How can I achieve this using Subversion? ...
I use git as my primary version control system, and have recently started using git on my CakePHP projects. This is my current .gitignore file: app/tmp vendors/ As used in the cakephp git repo, but this causes a bit more work for me when deploying the project to a server, because I have to go in and create all the app/tmp/ sub-direct...