version-control

问题 I have a client that hired me to implement version control using Mercurial, for his fifteen year old application. But also wants to have the whole history loaded to Mercurial server, but there is no version control software currently, only renamed files with the date they were changed, like program1.c to program1_20060917.c and program1 copy (1).c, and old folders with all the files (another version), like folder_20080419. I thought of importing file by file as a change, but the count goes

问题 Our company has two repositories, svn repository(trunk) used for development of one product and git repository(master) used for deployment of several products(teams). Our team wants to merge from svn subdirectory "trunk/web" to git subdirectory "master/product-a/web-dev". Those repositories have different source codes with a different tree structure, but two subdirectories we want to merge have almost same source codes inside. Also, they're not linked in any way, and we need to merge manually

问题 I want to backup my project, so I have tried initializing a rep with git init and then commit all files with git add . git commit -am "first commit" and now I want to push it to a repository (which is not only locally stored). I know I have to do something like git push origin master I know that master is the name of my branch, but what is origin ? Where are the files stored? Do I have to create a repository on GitHub, so the files can be stored on GitHub's servers or are there some Git

问题 I am maintaining a git fork of an hg repository with some additional patches. What this means is that I have cloned the hg repository and then pushed that repository to a git repository following these directions. I then cloned the git repository, applied some commits and then pushed those commits to the git repository. My history look like: hg-head\ /git-head A-B-C-F'-G' where F' and G' are my patches. The hg developer now pushes some patches to the hg repos and I want to incorporate those

问题 I am having problems with our merge tool as sometimes it fails to match the unchanged blocks in the two branches correctly. When this occurs the merge tool becomes useless, and the merge has to be done by hand. Therefore I am looking for a tool that: Understand what VB.NET function/method definitions looks like and gives them a high importance when matching blocks. Knows that VB.NET will change the case of fields etc, whenever it feels like it, and therefore ignore differences in cases when

问题 I'm in a small team of developers and designers, developing web applications and now we decided to start using version control. We have main development server where all projects are stored and we work on them through ftp(but we have ssh access). The questions is, what is the best way to update files on a server after someone pushed a commit on it, so all the changes could be instantly seen in a browser? As far as I know a git repository should be 'bare' to be able receive push's, and since

问题 ( I've seen some suggestions here and elsewhere involving the NodeLabel plugin to solve similar problems, but have yet to find a solid example of how to actually USE NodeLabel for this purpose. ) Right now a gerrit trigger starts a build based on a given branch in the git repo of one of my projects. This creates ONE parent job P that uses the Parameterized Trigger plugin to spawn two more project builds (identified by two labels) on two slaves with two different OSes (X1 and Y1). Tomorrow, I

问题 Has anyone come across a way of searching - maybe using tfpt searchcs - of listing all the files that would changed as a result of all the change-sets that are attached to a work item in TFS? THEN I'd like to see the differences between the first and the last change-set in each case so I can view the sum of differences in the file. Why? I have a work item with about 20 change-sets. I don't want to see the narrative/thinking/whatever. I just want to see what changed and how. 回答1: There is no

问题 Let's say I have repo1 being tracked (it contains .git). Then, inside of it, I download project1 from github. This has it's own .git folder (which I might ignore?). Proceeding, I'll add project1 to repo1 . At this point, I'll say files in project1 are being tracked by multiple repositories. I did some tests here without any issues, apparently this situation can be carried on. I can commit in both repositories. Apparently everything is still in order. Did I forget anything? Is this someway

问题 Several posts talk about removing a file or directory from GIT - but they don't go as far as explaining how to PUSH those changes into the main repository. For example, this works just fine to remove the directory but when I try to PUSH this change to the main Git repo, I am denied: ! [rejected] master -> master (non-fast forward) error: failed to push some refs to '/repo/project.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before