So say I have the three latest revisions of an aspx file: 55,56, and 57. Revision 56 added a feature that I want to remove, but I also want to have the new features deployed in version 57. Is there any way I can merge version 55 with 57, leaving revision 56 out of the picture? If it matters, I'm using Tortoise SVN and Visual SVN, but I...
Two scenarios, one work one doesn't when they both should: Scenario #1: (DOES NOT work via apache) 2 repos on Server SERVER: Repo "A", Repo "B" cloned from repo A via http://SERVER/HG/A On client: Repo A cloned from http://SERVER/HG/A Repo B cloned from http://SERVER/HG/B Added a file to repo A...
Is it important to be able to search your version control repository, or is it good enough to be able to search your local sources? If it is important to be able to search the repository, why is it important? ...
Suppose I have a main branch and a dev branch. Suppose I merge some stuff from dev into main. I check in the merge Now I decide "whoops, the dev branch wasn't really ready for me to merge into main yet." I want to tell TFS: remove that change set from main and forget that the merge ever happened. Rolling back the changeset is ea...
I'm putting a Drupal project on an open source hosting site. What files do I have to not put up there so I don't compromise my site's security? Various settings.php comes to mind. And obviously the database itself won't be in a repository. Anything else dangerous? I'm running Drupal 6. Also, it'd be nice to get the database itself und...
OSLC seems to be an interesting initiative. I looked at SCM specs and start to wonder if there is a reference implementation for that, even though it's still in draft stage. The only thing I found was OSLC-CM server available for testing. Have any of you seen or heard about such demo server for SCM? ...
I'm a happy user of PortableGit 1.7.0.2. Today I wanted to pull a project changes from GitHub.com repository, so I did git pull. It failed with the following message: error: Your local changes to 'main.rb' would be overwritten by merge. Aborting.. I didn't care about the local changes so I typed git reset --hard HEAD (git clean from here...
If you make a commit in mercurial: hg commit -m "an incomplete description of the commit" what are your options for correcting the commit description? Should I just immediately commit again with the complete description? edit Actually, you can't commit without something having changed. ...
This question is rather agnostic than related to a certain version control program. Assume there is a source code tree under certain distributed version control. Let's call it A. At some point somebody else clones it and gets its own copy. Let's call it B. I'll call A and B branches, even if some version control tools have different ...
I need to know the best way to manage team web-development on a shared server (hostgator). I have done some individual web development on a shared server in the past, and I have always setup SVN through SSH to have a pretty-nice development workflow (version control, quick-commits, work though eclipse/subclipse, etc). However, I also kn...
Let's say you have several systems using the same DB - each uses several schemes (sometimes same as the other). This structure of these schemes is somewhat very big and complicated. Now, how could you possibly manage such scheme structure? Obviously using some sort of "configuration" - the simplest would be SQL scripts, but a more reaso...
Do you use many version control software (TortoiseSVN, Bazaar Explorer, smartgit etc)? One software that supports all version control systems (cvs, svn, bzr, git etc)? Which? Do you keep converting between them (I imagine me converting gif -> jpg -> gif -> jpg...)? UPDATE: If I pick one, do I really have to give up contributing to al...
Possible Duplicate: Version Control. Getting started I am interested in implementing version control for the first time. I am starting to amass custom libraries and would like to know what methods you would recommend for implementing version control on a Windows Vista OS. I also have an Ubuntu server setup. I'm not sure if OS...
I'm 15 and have just started using source control systems to manage my code a little better, so I'm a little new to this stuff. Right now I have this repository: [a]---[b]---[d]---[f] master \ \ [c]---[e] develop I want to wind up here: [a]---[b]---[d]---[f]---[g] master \ / ...
I created an Android project, added it to my git repo, comitted and pushed my clone to the master. Later I tried checking out the project and Eclipse complained about missing src folders. I checked my repo and the master repo and the src folders are missing (Im sure they were there when I created the project). So can someone explain what...
Can anyone tell me how can I make my SVN(TurtoiseSVN) to use the proxy? I'm using windows XP, I've seen bunch of similar questions on this matter and none of them says where(in which location) should I change my configuration. Does anybody know that ? ...
On my work machine, I do not have the permissions to install anything, and astoundingly, there are not any version control software packages set up. I am using VS2008, and was hoping to work around depending on SourceSafe. I've talked to the network admin, and all I could get was "We don't have any version control set up." Are there any ...
Given a changeset number of Visual Studio Team Foundation System 2008, is there an easy way to find out which files in my project/solution were edited in the changeset? ...
I was just talking to another developer (more senior than I) and trying to convince him that we should implement continuous integration via Cruise Control. He told me that this will not work because he commits code that does not compile to the repository all the time for the purposes of backing it up. And that automated builds notifying ...
I have installed Windows7 on my computer, and I had to change all permissions/take ownership - which apparently "touched" all my files, and now everything appears to be "modified" (when I do "hg status"), but only some files have actual changes. Is there a command I can run so that I will either "commit" or "revert" all the files that h...