version-control

Git: renamed file manually, Git confused

余生长醉 提交于 2019-12-18 10:14:47
问题 I am using Git and manually renamed a file that I had added to the repository. Now, I have added the "new" file which I renamed to the repository but Git complains that the "old" file has been deleted. So how can I make Git forget about the old file? Better yet, how do I tell Git that the "new" file really is the "new" file so that I can keep the change history intact? 回答1: There is no problem. Simply git rm old or even git add -A and it will realize that it is a rename. Git will see the

Git history - find lost line by keyword

自闭症网瘾萝莉.ら 提交于 2019-12-18 10:12:31
问题 I had somewhere in my Git repository a line containing word "Foo" a couple hundreds commits before. If there is any way to find its revision number where it was the last time without buying FishEye? 回答1: That may be addressed by the pickaxe ( -S ) option of gitlog git log -SFoo -- path_containing_change (you can even add a time range: --since=2009.1.1 --until=2010.1.1 ) -S<string> Look for differences that introduce or remove an instance of <string> . Note that this is different than the

Python package install using pip or easy_install from repos

对着背影说爱祢 提交于 2019-12-18 10:12:06
问题 The simplest way to deal with python package installations, so far, to me, has been to check out the source from the source control system and then add a symbolic link in the python dist-packages folder. Clearly since source control provides the complete control to downgrade, upgrade to any branch, tag, it works very well. Is there a way using one of the Package installers (easy_install or pip or other), one can achieve the same. easy_install obtains the tar.gz and install them using the

Find deleted files in Mercurial repository history, quickly?

大城市里の小女人 提交于 2019-12-18 10:03:46
问题 You can use hg grep, but it searches the contents of all files. What if I just want to search the file names of deleted files to recover one? I tried hg grep -I file-name-pattern pattern but this seems to return no results. 回答1: using templates is simple: $ hg log --template "{rev}: {file_dels}\n" 回答2: Update for Mercurial 1.6 You can use revsets for this too: hg log -r "removes('**')" ( Edit: Note the double * - a single one detects removals from the root of the repository only.) Edit : As

What tools do you use when integrating with Subversion on Windows? [closed]

被刻印的时光 ゝ 提交于 2019-12-18 09:59:31
问题 Closed. This question is off-topic. It is not currently accepting answers. Want to improve this question? Update the question so it's on-topic for Stack Overflow. Closed 5 years ago . I'm just getting into Subversion for personal projects and am interested in knowing what tools you use that integrate with Subversion on the Windows platform. Things like visualisation, backup, IDE integration, issue tracking integration etc. Anything that extends the basic functionality of Subversion really to

Is there a Github clone in PHP that I can run on my own server? [closed]

ぃ、小莉子 提交于 2019-12-18 09:58:29
问题 As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for guidance. Closed 6 years ago . I know there are plenty of ways to run git on my server, but I quite like the functionality of git with repo browsing - the fact that

Checking in of “commented out” code [closed]

半世苍凉 提交于 2019-12-18 09:57:25
问题 Closed . This question is opinion-based. It is not currently accepting answers. Want to improve this question? Update the question so it can be answered with facts and citations by editing this post. Closed 2 years ago . Ok, here is something that has caused some friction at my current job and I really didn't expect it to. Organized in house software development is a new concept here and I have drawn up a first draft of some coding guidelines. I have proposed that "commented out" code should

How do I remove a folder from source control with TortoiseSVN?

不想你离开。 提交于 2019-12-18 09:57:15
问题 How do I remove a folder from being source controlled with TortoiseSVN? 回答1: There is a dedicated item in the extended context menu: Hold the Shift key down and right click on the folder. Under the TortoiseSVN menu click on "Delete (keep local)" Image cropped from TortoiseSVN's extended context menu page. Delete (keep local) documentation blurb. 回答2: The easiest way is described here: http://tortoisesvn.net/unversion.html That article is a bit wordy and some of the methods didn't work for me

How do I manage large art assets appropriately in DVCS?

自作多情 提交于 2019-12-18 09:56:18
问题 Is there any good way to handle large assets (i.e. 1000's of images, flash movies etc.) with a DVCS tool such as hg and git. As I see it, to clone repositories that are filled with 4 GB assets seems like an unnecessary overhead as you will be checking out the files. It seems rather cumbersome if you have source code mixed together with asset files. Does anyone have any thoughts or experience in doing this in a web development context? 回答1: These are some thoughts I've had on this matter of

git push to remote branch

拟墨画扇 提交于 2019-12-18 09:56:10
问题 Folks, I had cloned a repo. I created a branch out of it to work on a feature by issuing the following command: git branch fix78 then I worked on that branch by git checkout fix78 I continued to make commits to this local branch. Now I wanted to push this to the repo and hence I issued the following command: git push origin master:fix78 I viewed the repo from a web browser and saw that a new branch called fix78 was created on the repo. But it did not have any of my commits that I had made.