diff is a file comparison utility that outputs the differences between two files.

learn more… | top users | synonyms

1
vote
1answer
23 views

What is the difference between echoing strings to a file and pasting to it?

Today I tried to add Virtualbox repo to the /etc/apt/sources.list.d/virtualbox.list via echo "deb http://download.virtualbox.org/virtualbox/debian trusty contrib" > ...
2
votes
2answers
27 views

using diff to compare a file and a directory

there is probably a simpler way to do this but I ran ls on the /media/user directory with no usb storage plugged in and saved the output to a file and I wanted to use diff to compare the file with a ...
2
votes
2answers
53 views

Does Ubuntu have a graphical software to compare and merge differences in files? [duplicate]

I want to compare two or more files and merge the differnces which I want to. I was using windows os oftenly. but now working on ubuntu 12.04 os.In windows "Beyond compare" made my work easier. but as ...
1
vote
0answers
31 views

What are the main open source two way sync frameworks available natively on ubuntu, which sync via “diff merging”?

So again, the software needs to be: Open Source - so I can program with it. Sync Two Ways - so two or more users can have simultaneous control over one file, unlike Rsync which syncs only one way. ...
0
votes
1answer
101 views

PostgreSQL data diff

Note: this question is not about syncing database schema/structure Problem In my web application I have a PostgreSQL database server (PGS) and a (separate machine) business logic server (BLS) which ...
2
votes
2answers
422 views

Is there any command line interactive tool like meld?

I usually work on someone else's code base on a remote system and often need to merge code from two different files. For that I have to pull files to my system and meld it and push it back to the ...
0
votes
0answers
25 views

Subversion thinks all files are empty

For some reason when I do a diff my subversion thinks that I have deleted every line in every file for the repo. If I do a diff with git it looks something like this: diff --git ...
5
votes
0answers
83 views

File comparison on the command line [duplicate]

There are 2 files, that are almost similar. Say, for example, only 2 lines in one file do not match the contants of another file. Is there a way to make a comparison between these 2 files, and write ...
0
votes
2answers
111 views

how to append diffrence in a file to another file

I am a forgetful person so I use every kind of backup utility. One of them is ClipIt, it stores upto 1000 item but I don't want to lose items that exceed the limit. I thought I can use diff tool and ...
3
votes
3answers
1k views

meld installation issue

I am trying to install the meld diff viewer on Ubuntu 12.04 LTS. When I run sudo apt-get install meld I get the following output: Reading package lists... Done Building dependency tree ...
3
votes
2answers
2k views

nautilus-compare (meld integration with nautilus) and other nautilus-actions-extra packages not working with Ubuntu 13.04

I had nautilus-compare (and other nautilus-actions-extra packages) perfectly working with Ubuntu 12.04 I've just did a fresh install of Ubuntu raring ringtail, and then I ran sudo apt-get install ...
2
votes
1answer
790 views

Run diff on symlinks

I have two folders containing a number of broken symlinks. Is there a way to make diff compare the target of the links instead of trying to follow the links?
5
votes
2answers
5k views

Run diff command to compare all files in directory

I have two folders having in theory an identical folder structure and the same files. I wish to check for differences between the two copies in the two folders. I can run diff folder1/file1 ...
26
votes
1answer
3k views

How do I diff the output of two commands?

I had imagined the simplest way to compare the contents of two similar directories would be something like diff `ls old` `ls new` But I see why this doesn't work; diff is being handed a big long ...
17
votes
1answer
3k views

Does “diff” exist for images?

You can compare two text files very easy with diff and even better with meld: If you use diff for images, you get an example like this: $ diff zivi-besch.tif zivildienst.tif Binary files ...
5
votes
2answers
2k views

How to diff two folders to multiple patch files

I'm not much of a unix guy so I'll just go ahead and ask: I have a following problem - two folders with plenty of subfolders. I need to diff them. I tried this: diff -drupN vanila_kernel_3.0.8 ...
-1
votes
1answer
309 views

Ubuntu - Patch Diff merge issue

i have two text files test1.txt and test2.txt with content as test1.txt 1 2 test2.txt 1 2 3 4 what i have achieved with the txt files is a difference of both files in a third file as ...
1
vote
1answer
168 views

How to make changes while viewing a diff in bzr explorer?

bzr explorer is the GUI tool for Bazaar (bzr). It can show diffs pretty nicely, but I can't seem to figure out a way to make changes in the diff viewer. Other basic functions would be the ability to ...
0
votes
1answer
600 views

Use vimdiff in place of diff to compare configs during package updates

Sometimes when you perform packages updates, you'll be prompted with action to take when apt tries to update packages which contain updated configs. I'd like to know if there's a way to invoke ...
13
votes
3answers
3k views

How can I “diff” two files with Nautilus?

I have installed Meld and found out it's a great comparing tool. Unfortunately there is no integration with Nautilus 3.2. This means, I can't right click on files and select an option to open them in ...
9
votes
3answers
17k views

How to diff multiple files across directories?

I am trying to find diffs between all files of same names across two copies of a directory (say a working and a backup). For example, I can diff two files of same name in both: > diff d1/f.cpp ...
3
votes
1answer
126 views

Passing 2 parameters to “Open with..”

I do a lot of diffing and I would like to have kdiff3 under "Open with...". When from console I execute kdiff3 file1 file2 then kdiff is runned and it compares those two files. however this does not ...
3
votes
1answer
302 views

How to read bzr diff

original: if __name__ == "__main__": myparams = {"server":"mpilgrim", \ "database":"master", \ "uid":"sa", \ "pwd":"secret" \ ...
3
votes
1answer
4k views

Can't install “meld”

I'm trying to install meld on Ubuntu (I use VirtualBox on Windows 7) in order to visualize git diff: sudo apt-get install meld But, it doesn't succeed: ... Get:9 ...
16
votes
4answers
23k views

How do I decipher diff output

I diff-ed 2 files and got 1c1 < 1 --- > 1 Both files contained just "1". How is this different?
2
votes
1answer
136 views

How to fix a build when trying to patch the original file?

I'm trying to create a package of Bugzilla 4 in a Launchpad PPA. Keep getting a malformed patch and have redid the patch from ground up numerous times without any success. One of the logs can be seen ...
5
votes
3answers
3k views

Diffrence between two dirs?

I have two identical folders, but the are not identical(for example Java installation dir). One dir has one extra file and one file has been changed. Is there any easy to use tool to check that or do ...
5
votes
1answer
344 views

Tools to diff deb-src packages between ubuntu and debian repos

I can already create duplicate repos with the same versions of debs and deb-src packages. The problem is that I want to find the Ubuntu changes from Debian mainline (not from original source). ...
76
votes
17answers
69k views

File and directory comparison tool?

I'm looking for something that will compare directories and files like Beyond Compare does for windows. Its mainly for use of source control, but I need to use it for deployment as well.