Simulate SVN diff using plain diff


Login or Register for Dates, Times and to Reply

 
Thread Tools Search this Thread
Top Forums Shell Programming and Scripting Simulate SVN diff using plain diff
# 1  
Simulate SVN diff using plain diff

Hi,

svn diff does not work very well with 2 local folders, so I am trying to do this diff using diff locally.

since there's a bunch of meta files in an svn directory, I want to do a diff that excludes everything EXCEPT *.java files. there seems to be only an --exclude option, so I'm not sure how to do this.

perhaps, we can use find and execute diff on each .java
or
we can do a grep after we get our result (filter to only .java diffs), but that'd be tricky.

this is what I have so far.
diff -r --exclude=.svn dir1/ dir2/ > diffs.txt

there are simply too many types of files to filter using only the --exclude option.

anyone have thoughts?
# 2  
how about:
Code:
       --exclude-from=file
              When  comparing  directories, ignore files and subdirectories whose
              basenames match any pattern contained in file.

# 3  
Well, as I've said, there are simply too many files in there to try to exclude everything.

Unless, you are suggesting there is a way using an exclude file to instead INCLUDE only certain files?
# 4  
Any help on this? All I want is a way to use diff with --include instead of --exclude...
Login or Register for Dates, Times and to Reply

Previous Thread | Next Thread
Thread Tools Search this Thread
Search this Thread:
Advanced Search

Test Your Knowledge in Computers #565
Difficulty: Medium
The logical and operator is also called a conjunction.
True or False?

10 More Discussions You Might Find Interesting

1. Shell Programming and Scripting

Diff 3 files, but diff only their 2nd column

Guys i have 3 files, but i want to compare and diff only the 2nd column path=`/home/whois/doms` for i in `cat domain.tx` do whois $i| sed -n '/Registry Registrant ID:/,/Registrant Email:/p' > $path/$i.registrant whois $i| sed -n '/Registry Admin ID:/,/Admin Email:/p' > $path/$i.admin... (10 Replies)
Discussion started by: kenshinhimura
10 Replies

2. Shell Programming and Scripting

serach diff filename in diff location using shell scripting

Hi, I am new to shell scripting. please help me to find out the solution. I need a script where we need to read the text file(consists of all file names) and get the file names one by one and append the date suffix for each file name as 'yyyymmdd' . Then search each file if exists... (1 Reply)
Discussion started by: Lucky123
1 Replies

3. Shell Programming and Scripting

.procmailrc and uudeview (put attachments from diff senders to diff folders)

Moderator, please, delete this topic (1 Reply)
Discussion started by: optik77
1 Replies

4. UNIX for Dummies Questions & Answers

Diff between more and less

Hi, Can anyone tell me the diff between the two filters "more" and "less"? Many thanks. Regards, Venkat. (4 Replies)
Discussion started by: venkatesht
4 Replies

5. UNIX for Dummies Questions & Answers

Using diff

is there any way to make the diff function compare 1 folder to another instead of just file to file? also, can binary files be compared? (2 Replies)
Discussion started by: puzzler
2 Replies

6. UNIX and Linux Applications

svn diff failed (no such file or directory)

I'm on ubuntu fiesty using svn as version control and gvim as my IDE. i like to review changes to files before checking them in. at some point in my life i used " svn diff {path}/{filename} " this now returns Index: {path}/{file}... (5 Replies)
Discussion started by: manic
5 Replies

7. UNIX for Dummies Questions & Answers

diff

hi all, i want to do this shell script. create a script that will check the transferred file vs. orig file. 1. diff the file1 and file2 2. if difference found, retain the original file and email to netcracker team. 3. if no difference found, delete the previous file and retain... (3 Replies)
Discussion started by: tungaw2004
3 Replies

8. Shell Programming and Scripting

Diff b/w $@ and $#

Hello, Pls explain the difference between $# and $@, and how its used in shell scripting . Thanks in advance (4 Replies)
Discussion started by: PradeepRed
4 Replies

9. Shell Programming and Scripting

diff 2 files; output diff's to 3rd file

Hello, I want to compare two files. All records in file 2 that are not in file 1 should be output to file 3. For example: file 1 123 1234 123456 file 2 123 2345 23456 file 3 should have 2345 23456 I have looked at diff, bdiff, cmp, comm, diff3 without any luck! (2 Replies)
Discussion started by: blt123
2 Replies

10. UNIX for Dummies Questions & Answers

diff and ed?

I am trying to use the diff command to find the differences between two txt files. From here, I wish to use the ed command to create the first file from the second file. I am fairly new to unix, and I haven't got a clue how to do this. Can anyone help me please? Cheers (2 Replies)
Discussion started by: Brototype
2 Replies

Featured Tech Videos