Closed. This question does not meet Stack Overflow guidelines. It is not currently accepting answers.
We don’t allow questions seeking recommendations for books, tools, software libraries, and more. You can edit the question so it can be answered with facts and citations.
Closed 7 years ago.
Improve this question
I need free merge tool, in order to compare differences in 2 directories. I used Beyond Compare and Araxis Merge, but this tools are not free. Maybe you can recommend some other? I tried WinMerge, but it is not comfortable to use.
KDiff3 is good, open source (GPL), and works across many platforms.
Winmerge is something that i use and i find it very comfortable. Why not try examdiff?
I really like the diff/merge tool that comes with perforce. You can select it in the client installer. Perforce is free to use for max two database users, so you should be fine with none. :)
I use DiffMerge pretty much every day
Meld is simply the best merge tool I've ever used. Sadly I don't think there is a Windows version. It can compare directories.
If you use SVN, Tortoise SVN comes with a merge tool.
For a long time I stubbornly refused to pay for a merge tool and searched high and low for a free merge tool that I liked, but I found that all free merge tools I tried had their quirks.
In the end I got a trial copy of Beyond Compare and found that I liked using it a lot more than the free tools I'd tried so far. If you're struggling to find a free compare tool that you can work with then don't discount commercial tools - Beyond Compare is very reasonably priced and I use compare tools all the time. For me the cost was worth it.
Related
Closed. This question does not meet Stack Overflow guidelines. It is not currently accepting answers.
We don’t allow questions seeking recommendations for books, tools, software libraries, and more. You can edit the question so it can be answered with facts and citations.
Closed 7 years ago.
Improve this question
I am researching alternatives for GitHub and one essential feature I am looking for is - https://github.com/blog/905-edit-like-an-ace
I will prefer a self-hosted solution but we are open to online-hosting as well. In fact, GitHub.com itself is perfect fit for us except for their plan-structure. We want the option to have "unlimited repositories" which is not possible in any GitHub plan. (why we need "unlimited" is discussed here)
So far 2 solutions we liked so far are - Gitorious and Indefero. They are both nice. Though gitorious looks more polished, Indefero comes closer to our requirements.
Important features we are looking for in "Web-based" inferface are:
Repos management (add/remove/edit)
User management (add/remove/edit)
Team management (add/remove/edit)
Access control.
Online editing (essential because small-edits can be done very quickly in this way)
Any suggestions. Or any "hacks" to make online-editing possible in Gitorious or Indefero or in any other solution. Any other git-hosting will also work if they provide above features + unlimited repos.
Thanks for all the help in advance.
Not sure if GitLab supports it yet, but take a look at http://gitlabhq.com/! It's the most promising GitHub alternative yet, it's for self-hosting though.
GitHub itself provides online editing, but you can also try Cloud9 IDE.
There is GitHub:FI which is basically self-hosted GitHub.
Nowadays I would suggest you a combination of GitLab and Cloud9 IDE. For both the source code is available and running online in any modern browser.
Please consider that, GitLab and Cloud9 having many dependencies to 'heavy' environments (Python, Ruby, Node.js, PostgreSQL, ..).
Closed. This question does not meet Stack Overflow guidelines. It is not currently accepting answers.
We don’t allow questions seeking recommendations for books, tools, software libraries, and more. You can edit the question so it can be answered with facts and citations.
Closed 5 years ago.
Improve this question
I need a simple, web-based version control tool. 'Version Control' probably implies a lot of functionality I don't need such as diff and merge.
Basically, I have a lot of non-programmer types working on binary files (think Photoshop PSDs), and I would just like a way to check them out and in, and keep previous versions.
Web-based would be ideal, I just want something better than nested folders on a shared drive.
Suggestions?
You could try asvcs: it's web-based and very simple. My advice would be to try one of the known solutions (svn, git, mercurial, even bazaar) and use only the features you need.
Dropbox provides a web interface and can be used as a simple version control system.
Try building something around git. (Or maybe set up a private github account.)
Springloops has what you're looking for. However, it's a paid service. Integrates nicely with Basecamp
You could also use Dropbox. There's version control of sorts. But history is kept only for 1 month.
And there's github
I know through experience that Atlassian's Confluence wiki solution will do versioning for binary uploads. I'm sure there are probably other open source alternatives available as well.
Closed. This question does not meet Stack Overflow guidelines. It is not currently accepting answers.
We don’t allow questions seeking recommendations for books, tools, software libraries, and more. You can edit the question so it can be answered with facts and citations.
Closed 7 years ago.
Improve this question
I'm looking for a Mercurial hosting which is free. (I'm only a student right now.) And it seems like it boils down to Bitbucket or Project Hosting on Google Code. (Other suggestions are welcome.)
So, how do these services compare in terms of features and service?
Update: Kiln is also a strong contender (I use it myself) and I thought I felt I should mention the name in the question. In terms of features, the strong integration with something strong as FogBugz could be a major plus.
Your choice basically comes down to whether you want it to be private or not.
If you want it open to the world you can't go wrong with either.
However, if you want it to be private you should go with bitbucket. Even then you are limited to 2 users in a free private repo.
My guess is you want it to be private and free (since you're a student) so your only other option there is to host it yourself. This would be a great option if you can pull it off. Remember, you don't need to have it hosted on a server to share and merge, there are plenty of commands for sharing patch sets through email.
Kiln http://www.fogcreek.com/Kiln/StudentAndStartup.html is another option you can get for free since you are student. Run by Joel Spolsky's company I believe.
JavaForge is another option to consider if you are looking for free Mercurial hosting. You can have private projects and it has all the features mentioned before. Even better, it supports Git, SVN and CVS (even mixing them within the same project) if you want to freely experiment with (D)VCS.
Closed. This question does not meet Stack Overflow guidelines. It is not currently accepting answers.
We don’t allow questions seeking recommendations for books, tools, software libraries, and more. You can edit the question so it can be answered with facts and citations.
Closed 3 years ago.
Improve this question
My shop is trying to formalize the release management process for an OSS product we maintain (edit: using SVN for version control). It's a sort of a web development framework/CMS kind of thing, as in it's a product that other projects are built on top of. This makes clear communication about the versioning system especially critical for developers that are using the tool.
I'm hoping to find some examples of how best to graph this system so we can communicate it better internally and with outside developers. I know there are lots of standards and best practices around versioning, so I'm hoping this extends to some sort of visual vocabulary as well. As one example, there is a nifty graph at http://en.wikipedia.org/wiki/Versioning#Software_Versioning_schemes. Are there any guides out there on how these sorts of things should be designed?
First, if it is an OSS project, chances are the versioning system ism a Distributed one (DVCS)
If so, then this branching model can be of interest.
The idea is to control what you want to integrate from remote repos.
alt text http://nvie.com/wp-content/uploads/2009/12/Screen-shot-2009-12-24-at-11.32.03.png
I need this too. The built-in graph in Tortoise SVN is too busy, but I've made use of it. But for soemthing like VonC's picture above, I think I'm going to go with a dry erase board and colored markers. I'll hang it outside my cube. Annotate it with revs, dates, sprints and projects, and we'll be all set.
Closed. This question does not meet Stack Overflow guidelines. It is not currently accepting answers.
We don’t allow questions seeking recommendations for books, tools, software libraries, and more. You can edit the question so it can be answered with facts and citations.
Closed 7 years ago.
Improve this question
I like how SQLite library can be included into an application and the application has a full-fledged database to use.
Similarly, is there an open source versioning library that I can include into my application so that I can save versions of files as well as do diffs and merges?
SVN doesn't require any prerequisites on end user machine. You can embed SVN right into you app. To learn more on subversion integration, visit "Application Integration/Embedding" thread on SVN forum.
Answering my question myself, I recently discovered hgshelve and gitshelve that is almost exactly what I was looking for.
I am not entirely sure what you mean by "included in an application", as you could potentially deliver any library so long as the licensing allows. Are you referring to the fact that sqlite is small or that it is public domain?
Mercurial is a similarly lightweight piece of revision control software. If you are writing your application in python, which is likely since python now includes sqlite3, importing features directly from mercurial's source code should not be too difficult. Otherwise there's no shame in invoking commandline processes, though this may be clunkier. Mercurial is not public domain, but it is GPL'd.
Mercurial is also my personal favorite among modern revision control systems. It's leaps ahead of CVS and Subversion, and very similar to GIT although somewhat simpler to use.
You might want to look at fossil, an scm tool written by the author of sqlite. I don't know how easy it is to embed, but it is a single file executable so it should be quite easy to run from within your application.
Arguably, running it as a seperate process might actually be better than embedding since it won't slow down your app while it does what it does.
In my opinion Firebird is one of the best choices for embedded DB scenarios.
Also Microsoft SQL Server Compact (closed source, but free) might be suitable, however it less capable than Firebird.
EDIT:
I misread you question. If you don't need RDBMS, you can try to embed SVN to your application.