version-control

Can Hudson check out from multiple SCMs?

瘦欲@ 提交于 2020-01-05 08:15:29
问题 Due to some politics at work we have our project in two different SCMs, SVN and Dimensions. I was wondering if anyone knew of a plugin available that would change Hudson's radio buttons into checkboxes to allow me to configure multiple SCM repositories in the project's config on hudson? 回答1: No it can't. However, the svn plugin allows you to check out from several locations. A work around would be to use a (pre-) build step to check out from your repositories using a command line tool. 来源:

How can I stop myself from committing to the master branch in git?

此生再无相见时 提交于 2020-01-05 07:04:13
问题 My ideal workflow would be to commit changes onto dev and only merge changes to master via git merge --no-ff dev , but occassionaly what happens is: On dev dev: git add . dev: git commit -m "Cured cancer." dev: git checkout master master: git merge --no-ff dev Writes some more code master: git commit -a -m "Did something amazing" Whops, just committed to master. If I'm lucky I realize it right away, but if I don't I can push the branch upstream with another 10 changes on top. So this ends up

Per developer branch in TFS feasible?

旧巷老猫 提交于 2020-01-05 04:14:11
问题 In my current project (team of five developers) all developers use their own TFS branch (named per developer). From time to time they will merge into the main development branch. The argument for using branches per developer is: too much went wrong when they worked in one branch. Developers work mainly remote but use one common TFS and AD accounts (VPN connections). I would like to get opinions whether this sort of collaboration is thought to be good practise, OK under some circumstances or

Opposite of .git/info/exclude - including files that are excluded by .gitignore

时光总嘲笑我的痴心妄想 提交于 2020-01-05 03:43:09
问题 Is there a way to include files specifically excluded by a projects .gitignore file? Similar to how .git/info/exclude listings exclude files while not being under version control I want to revert exclusions done by .gitignore so I can see changes in these files. 回答1: Excluding files in .gitignore , there are four status of files: Untracked deleted staged but modified staged with no changes so you can use git ls-files -o to view untracked files, git ls-files -d to view deleted files by the

Can I use multiple source control providers on one project in Visual Studio?

喜夏-厌秋 提交于 2020-01-05 03:33:30
问题 At work, we use Team Foundation Server for source control. I work from home a lot, though, and external access to our Team Foundation Server isn't possible now or in the foreseeable future. I'm utterly fed up of using email/usb source control - almost as bad as no source control at all - so I was thinking about bringing the project(s) home via email or USB and committing them to a subversion server (probably on one of my own computers, although the free Subversion facilities offered by http:/

Is there a way to get a mercurial shelf back after a merge mistake?

时光总嘲笑我的痴心妄想 提交于 2020-01-05 02:32:07
问题 When I unshelve, it uses mercurial's merge capability, but I'm not seeing any way to get back the original shelved patch and redo things if I've completed the merge with an error. Aside from searching backup drives, is there any way to do that? (either to undo the unshelve action and put the shelf back, or to see what was in the patch file) 回答1: I found it — by looking around in the .hg directory. Simply find the directory .hg/shelve-backup/ . The original patch is written there. I now see

How do I create a diff file with visual source safe?

十年热恋 提交于 2020-01-04 15:28:57
问题 If I want to create a patch file of a directory with svn, all I need to do is right click on the directory, click tortoiseSVN, then click create patch, and I have a nice patch file of the differences between the latest version of the code on svn and the code on my machine. Is there a way to build a diff file buried within VSS or is it just another part of VSS that does not work? 回答1: With VSS, you can right-click on a project, click Show Difference. In the Project Difference dialog box, you

Code Repository best practices [closed]

妖精的绣舞 提交于 2020-01-04 14:04:03
问题 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 7 years ago . I work at a company that does a good deal of custom development for a wide variety of clients. Some projects are unique, but many of

Managing branches in subversion

好久不见. 提交于 2020-01-04 13:59:08
问题 I don't think I'm doing something right. I am using subversion as my vcs for our organizations website. I am the sole developer and I'm using bugzilla as my bugtracking system. I've got bugzilla and svn loosely coupled using the bugtraq properties so that I can link from my comments to bugzilla. What I'm doing right now is whenever I get a request to perform any work on the website (enhancement, breakfix, content change) I create a bug [xx] in bugzilla then create a branch named bug[xx].

SSMS version control and source control integration with git?

梦想的初衷 提交于 2020-01-04 09:05:35
问题 I have an ERP system which I maintain with a team of people. However lately we seem to be loosing track of who's changing what and we need a solution to be able to control these changes. We are looking into the enterprise version of GIT as all our software development and web development would work perfectly wit it. Not to mention I have some experience with GIT already. The problem is we need the version control to extend to our SQL Server which we use SQL Server Management Studio to