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 10 years ago.
Due to some SVN movement I got disconnected from SVN while I was in middle of a fairly large enhancement.
Now I have my current workspace (with changes and disconnected from SVN) and new workspace (latest from SVN).
I need to manually update the new workspace with the changes so I could check them in.
So I am looking out for a tool that can let me compare the two workspaces, tell for new files and folders and also updated files.
Does a tool like this exist? If so, could you recommend a good one?
I use WinMerge. It is free and works pretty well (works for files and directories).
The tool that richardtz suggests is excellent.
Another one that is amazing and comes with a 30 day free trial is Araxis Merge. This one does a 3 way merge and is much more feature complete than winmerge, but it is a commercial product.
You might also like to check out Scott Hanselman's developer tool list, which mentions a couple more in addition to winmerge
Related
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 10 years ago.
I am starting a project with 2 friends, we all are software developers and we want to do things in a safe and right way. That's why we decided to use some software development methodoly that fits our needs. I would like to know which could be a good starting point for us, and these are the variables:
We are a team of 3.
We are friends.
This is a new company.
We want to do things in the right way.
We are looking to generate clean code.
I would also like to know of software that could help those methodologies.
A couple must have's to start the right way:
Continuous Integration - use a continuous integration server to build your code and run automated tests. Jenkins is a great opensource example
Version Control - Git is the trendy new (and better) choice, but SVN works too. FWIW, the organization where I work is moving from SVN to Git
Write lots of tests - It will save you time and headache in the long run
Work on something you are interested in.
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 10 years ago.
I have an iOS project in which there will be >100 targets created from the same code base. The targets have many similar characteristics, but different info.plist, Default.png files, etc...
I'm considering generating (or mutating) the project file programmatically. Since project file formats are versioned, I should be safe in the short term. Longer term this might not be the most ideal solution though. I'm also looking at scripting Xcode with applescript. It seems like there is a robust dictionary with target objects.
I'm looking for some input on a good approach to managing this. Anyone with experience doing this like to make a recommendation?
UPDATE: I ended up using applescript to script Xcode. This worked great, until XC4 broke everything...
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 12 years ago.
Hello
I need a good SCM with integration in Visual Studio 2010 and ability to work over internet, I mean other users should be able to checkin/checkout files through internet/network.
I saw Git and its Extensions but I had problem with VS Integration. Its toolbar buttons and menu items didn't respond to my clicks, it just did nothing. I tried reinstalling it several times but without success. If you have a solution on this issue, please let me know.
Also a big advantage would be to use that SCM with my Qt projects, Qt Creator supports both mercurial and git.
So what would suggest? which one should I choose?
I would strongly suggest git.
Git is by far the more popular of the two so if you're looking to get people interested in collaborating on an open source project git is an attractive selling point. I've also worked with mercurial and subversion repositories and I've found git to be easiest to use and mercurial the most difficult.
Also, if you're looking to setup a free git repository you should go to github.com. For mercurial try code.google.com .
Hope my opinion helps, good luck!
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 9 years ago.
Does anyone know of a tutorial or guide for HgScc (Mercurial)?
I've installed and integrated HgScc with VS2010, but having never used any source control other than TFS, I'm not all that sure what I'm doing.
For instance, I've committed more than one version of a file but Revert is still greyed-out in the context menu. And how do I assign Beyond Compare as the Diff tool?
I can find plenty of people discussing and recommending it but I can't find any guide on how to use it.
[It's not a Mercurial tutorial I'm looking for as I don't intend to use the command line.]
You can set diff tool for HgSccPackage in the MS Visual Studio settings:
Tools -> Options -> Source Control -> Mercurial Options Page -> Diff Tool
In 1.8.5 it has moved to:
Mercurial -> Options -> Diff tools
I believe HgSCC uses the configuration settings of Mercurial, so you need to go through the .hg\hgrc documentation for the Beyond Compare setting.
And to get what happens when you commit you will need to look at the philosophy of Mercurial and other DVCS's. So HGInit is still a good source of getting to know HgSCC.
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 10 years ago.
I am using a MacBook Pro running Mac OS X 10.5. I am new to this development environment, and previously worked on Windows.
I find there is no TortoiseSVN for Mac PC, and I am wondering any alternative (better free and easy to use GUI tools) tools for Mac?
Have a look at this archived question: TortoiseSVN for Mac? at superuser. (Original question was removed, so only archive remains.)
Have a look at this page for more likely up to date alternatives to TortoiseSVN for Mac: Alternative to: TortoiseSVN
My previous version of this answer had links, that kept becoming dead.
So, I've pointed it to the internet archive to preserve the original answer.
Subversion client releases for Windows and Macintosh
Wiki - Subversion clients comparison table
i use "Versions", quite easy, but not free .
http://versionsapp.com/
I use svnX (http://code.google.com/p/svnx/downloads/list), it is free and usable, but not as user friendly as tortoise. It shows you the review before commit with diff for every file... but sometimes I still had to go to command line to fix some things