Hi there, I have a rather large diff of 2 GIT branches and would like to open them in some sort of nice UI side by side. Something that shows me the diff's easily, and hopefully that I can merge differences one by one. git diff is rather hard to work with. ...
rsync zsync Is there any other better sync/backup tool available on linux. I have a local installation of my site, a wiki. I wish to make changes to my local site both in terms of wiki content/ and plugins/templates, and then just wish to press a button :D or run the command over a folder, it should check for the diff for my local files...
In my git log, I have 2 commits. How can I generate the difference - ignoring spaces - between them? $ git log commit e5640171f391fdf479fa14fab0da6628efed1fa6 Author: test <[email protected]> Date: Mon Jul 13 11:41:02 2009 -0700 Fix Bug 1. commit 0984e27b75f480da8b8c4ce2399bf877c557a78d Author: test <[email protected]> Date:...
Which is the best Visual SVN Diff displayer for Linux. BeyondCompare and VisualSVN1.5 work well on Windows. What are the equivallent tools for Linux. Specifically Ubuntu. I know command line diff works; But I'd like multiple column syntax highlighted and differences. Better if the tool has a support for Git and Hg as well. ...
I am not sure whether this has been asked before; I did a few searches but nothing appropriate showed up. OK, now my problem: I want to migrate an old application to a different programming language. The only requirement we have is to keep the database structure stable. So no changes in my database schema. For the rest of the applicatio...
I'm looking for a diff tool that can analyse my code and tell me what has changed on a construct by construct basis. For instance, if I cut and paste a method from the start of my file and put it at the end but leave that method unchanged, I don't want it flagged. If however I insert a line of code or change something inside that metho...
Or just all the commits that occurred between two dates? In SVN, you could do something like svn diff -r{date}:{date} to do it! I can't seem to find a git equivalent to this. Specifically I'm looking at writing a script to send out daily emails with all the code committed that day and by who. ...
Will explain the problem that I'm faces, so that you have a better idea about the situation. We have one project, and about 6 months ago it was branched off. Lets call our branch A, and theirs branch B. In that time branch B has had 100,000 more lines of code added or deleted. We on the other hand have added or changed about 50,000 lin...
Is anyone aware of a good managed code .NET component which can do HTML Diffs? I'd like to compare two HTML files and show the differences. ...
Creating an Addin to use your favorite diff tool for doing a diff between the current active document and the last checked in version seems to be one way to go. Is there an option in VS2008 that I might configure to do this for me ? ...
I need a utility which allows me to do a diff and print each side on a separate sheet of paper. I've so far looked at WinMerge, ExamDiff Pro, Compare It, and SmartSVN's utility, and all of them allow the printing of diff results, but they put both sides on one sheet. Essentially our formatting rules allow 120 character horizontal widths...
Possible Duplicate: Best Diff Tool? I am mainly a C# ASP.NET Developer and I use KDiff3 as my diff tool. I have been using it, happily, for several years and was wondering what others were using. ...
So I've been working on a wiki type site. What I'm trying to decide on is what the best algorithm for merging an article that is simultaneously being edited by two users. So far I'm considering using Wikipedia's method of merging the documents if two unrelated areas are edited, but throwing away the older change if two commits conflict...
Hello. We are currently using trac and have become really dependant on one of its features. If you go to browse source you can hit view changes and see all the diff's between 2 revisions. And the thing we love is that you can download a zip file that contains all the files modified in theyr directory structure. Is there another alterna...
The default git diff behavior is to open each diff file in serial (wait for previous file to be closed before opening next file). I'm looking for a way to open all the files at once - in BeyondCompare for example this would open all the files in tabs within the same BC window. This would make it easier to review a complex set of chang...
I have 2 repositories. As the trunk code was in one repository, which was protected, I did a checkout and then checked in to the other repository (as users did not have permission to the first protected one). Now the issue is that both the repositories have been worked on and we wish to finally merge the code/branch in the second unprot...
My Source Safe file comparer (diff) doesn't say where in the line there are differences. Which tool would I use for that? And before someone tries to move it to SU, please note that we developers rely on these diff tools more than anyone else. ...
Working on a team where people are prone to amending dev SQL Server tables and forgetting about it, or preparing a change for deployment and having to wait for that deployment. This leaves our dev and live tables inconsistent, causing problems when SPROCs are pushed live. Is there a tool whereby I can enter a SPROC name and have it che...
I've been making changes that involved moving methods around, extracting new methods, and changing functionality a small amount (not all at the same time, but within the same revision - maybe that was a bad decision). Conventional diffing seems to generate diffs that report that method doFoo was deleted at line 42, and that an almost id...
How usable is a document which uses <ins> and <del>, compared to seeing the deltas in a two-pane split-screen diff viewer? Although a command-line diff tool will show its output as one diff after another (in a single vertical column / console window), all the GUI diff tools that I know of tend to show diffs in a two-pane, split-screen U...