version-control

问题 I am working on a project that has grown to a decent size, and I am the only developer. We currently don't use any version control, but I definitely need to start. I want to use Subversion. What would be the best way to transfer an existing project to it? I have a test server that I use for developing new features, then transfer those files to the 2 production servers. Is there a tool that will automate the upload to the test, then the deployment to the live servers? All this is developed in

问题 If you search around the web you will see this question asked a lot but there are no clear answers. Here is my particular case. I am using Versions SVN client on a mac but I get the same problem when using the command line. I have personal repo credentials to someone else's repo and it is working on my one machine where I set it up 6 months ago. I copied my .ssh folder from my user directory to a different machine, installed versions on that machine, and set up by login credentials, only it

问题 This is a difficult situation to explain, so bear with me. I have a Mercurial repository with 2 main branches, default and dev . Work is usually done in a named branch off of dev (a feature branch). There may be many feature branches at any one time. Once work is completed in that branch, it is merged back into dev . When the time comes to prepare a release, another named branch is created off of dev (a release branch). Sometimes it is necessary to exclude entire features from a release. If

问题 i'm working on a big python project, and i'm really sick if .pyc and *~ files. I'd like to remove them. I've seen that the -X flag of git clean would remove untracked files. As you can imagine, i'm not tracking .pyc nor *~ files. And that would make the trick. The problem is that i've a local_settings.py file that I'd like to keep after the git clean. So, this is what I've got. .gitignore: *.pyc *~ local_settings.py When I execute this command: git clean -X -n -e local_settings.py I get this

问题 I've arrived at the point where I realise that I must start versioning my database schemata and changes. I consequently read the existing posts on SO about that topic but I'm not sure how to proceed. I'm basically a one man company and not long ago I didn't even use version control for my code. I'm on a windows environment, using Aptana (IDE) and SVN (with Tortoise). I work on PHP/mysql projects. What's a efficient and sufficient (no overkill) way to version my database schemata? I do have a

问题 The questions I've seen for undoing a git pull a slightly different to mine. This is what I've done: There is a project in directory A (not a repo). I initialized a repository in it, added the files, but did not commit anything. Then I pulled from repository B, which overwrote a bunch of my staged files. I was under the impression I could use git reset --hard to undo the merge. Of course that just checked out the HEAD of the commits I had just pulled in. I should have branched and commited

问题 I am very new to Git and I have a slight problem. In SVN [this feels like an Only Fools and Horses story by uncle Albert.."during the war..."] when I wanted to update a production site with my latest changes, I'd do a diff in TSVN and export all the changed/added files between two revisions. As you can imagine, it was easy to get those files to a production site afterwards. However, it seems like I'm unable to find an "export changed files" option in Git. I can do a diff and see the changes,

问题 The interactive rebase capabilities of Sourcetree are great, but I often find myself wanting to be able to "split" a commit into multiple smaller commits. I know theres a way to do this from the command line, but I can't seem to find any place in the UI to handle this. Is there a way to do this with Sourcetree? Or is this one of those places where I have to drop down to the command line to accomplish my goals? 回答1: Splitting the commits from the command line using interactive rebase is

问题 I have the following directories structure: g1/ .git a b c/ .git d e As you can see, I have de repository "c" inside repository "g1". When I use the following command: git clone g1 g2 I only get the following directories structure: g1/ .git a b c/ The directory "c" remains empty. Any ideas? 回答1: Submodules (discussed in the Pro Git Book), helps manage repositories nested within a main repository: Submodules allow foreign repositories to be embedded within a dedicated subdirectory of the

问题 I have a app which is under source control (TFS 2012 also) on c:\Dev\MyApp\Main. Because im developing a new feature I decided to open a branch on c:\Dev\MyApp\BranchNewFeature. I developed and when I decided that it was time to test it was like i hadn't done any changes at all. I hit F5 and i see the baseline version of the app... Looking into it I noticed a very curious fact: When i check IIS Express the "launch path" for the applications is the old one (c:\Dev\MyApp\Main). Can anyone help