Electronic Projects, forums and more.

Go Back   Electronic Circuits Projects Diagrams Free > Electronics Categories > Micro Controllers


Micro Controllers Discuss all aspects of micro controllers - building them, coding them, etc. All controllers are welcome - PIC, BASIC, Z8 Encore!, etc.

Reply
 
Thread Tools Display Modes
Old 7th May 2008, 03:54 PM   (permalink)
Default Compare files to solve a mess!

I need to compare two VERY long files (originally they were copies of the same original). (ASM for micros).

By mistake I applied different changes to each other but I can not say who is who now. (The chance exists that I also made uncomplete changes, which adds some more to this).

Shame on me!!

I don't even dare to compare both visually even if printed.

I am pressed by kind of a deadline to see in which one I progressed the most to continuous from there.

Is it any freeware that I could download and use out of the box? Just to know where the files differ from each other.

Just tried some, but no one is freeware.
__________________
Agustín Tomás
In theory, there is no difference between theory and practice. In practice, however, there is.

Last edited by atferrari; 7th May 2008 at 03:57 PM. Reason: Spelling corrected
atferrari is offline  
Reply With Quote
Old 7th May 2008, 04:07 PM   (permalink)
Default

Quote:
Originally Posted by atferrari
Just tried some, but no one is freeware.
Googled and found these:
http://www.prestosoft.com/edp_examdiff.asp
http://www.labnol.org/internet/tools...software/2414/
__________________
=========================
Futz's Microcontrollers & Robotics
=========================
futz is online now  
Reply With Quote
Old 7th May 2008, 05:10 PM   (permalink)
Default

This is a great Open Source version

http://winmerge.org/
pwssr is offline  
Reply With Quote
Old 7th May 2008, 05:17 PM   (permalink)
Default

I personally use this !! It can also generate html reports to share with your team members and is absolutely free http://www.componentsoftware.com/Products/CSDiff/
prabs1976 is offline  
Reply With Quote
Old 7th May 2008, 05:30 PM   (permalink)
Default

freeware

http://www.contexteditor.org/
AtomSoft is offline  
Reply With Quote
Old 7th May 2008, 05:48 PM   (permalink)
Default

He said COMPARE - not editor.
pwssr is offline  
Reply With Quote
Old 7th May 2008, 06:05 PM   (permalink)
Default

I vote for ExamDiff
__________________
We never have time to do it right; but we always have time to do it over.
Papabravo is offline  
Reply With Quote
Old 7th May 2008, 06:18 PM   (permalink)
Default

Quote:
Originally Posted by pwssr
He said COMPARE - not editor.
No disrespect intended but learn to read:
Code:
Text Editor Features

    * unlimited open files
    * unlimited editing file size, 4kB line length
    * powerful syntax highlighting for:

    * C/C++
    * Delphi/Pascal
    * Java
    * Java Script
    * Visual Basic
    * Perl/CGI
    * HTML
    * CSS
    * SQL
    * FoxPro
    * 80x86 assembler
    * Python
    * PHP
    * Tcl/Tk
    * XML
    * Fortran
    * Foxpro
    * InnoSetup scripts

    * powerful custom defined syntax highlighter
    * multilanguage support

    * English
    * German
    * French
    * Croatian
    * Chinese
    * Czech
    * Danish
    * Dutch
    * Estonian
    * Esperanto
    * Spanish
    * Galego
    * Italian
    * Hungarian
    * Portuguese (Brazil)
    * Russian
    * Slovakian
    * Polish
    * Lithuanian
    * Latvian
    * Slovenian
    * Turkish

    * project workspaces support
    * unicode UTF8 support
    * code templates
    * customizable help files for each file type
    * file explorer with favorites list
    * file compare
    * export to HTML/RTF
    * conversion DOS->UNIX->Macintosh file formats
    * editing position remembering across files
    * macro recorder
    * commenting/uncommenting code
    * text sort
    * normal and columnar text selection
    * bookmarks
    * search and replace with regular expressions
    * search and replace text in all open files
    * incremental search with text emphasizing
    * C/Java-style block auto indent/outdent
    * customizable color printing with print preview
    * exporting configuration stored in registry
    * customizable syntax highlighter colors, cursors, margin, gutter, line spacing...
    * user definable execution keys, depending on file type
    * capturing console applications standard output
    * compiler output parser for positioning on error line
    * powerful command line handler
I happen to use it for my web designing and it has lots of cool features

EDIT: In fact if you download it and compare it to the screen shot of the WinMerge its almost the same and WinMerge is also a editor with that feature so please post common sense only

Code:
Features

    * Visual differencing and merging of text files
    * Flexible editor with syntax highlighting, line numbers and word-wrap
    * Handles DOS, UNIX and MAC text file formats
    * Unicode support
    * Difference pane shows current difference in two vertical panes
    * Location pane shows map of files compared
    * Highlights differences inside lines in file compare
    * Regular Expression based file filters in directory compare allow excluding and including items
    * Moved lines detection in file compare
    * Creates patch files
    * Resolve conflict files
    * Shell Integration (supports 64-bit Windows versions)
    * Rudimentary Visual SourceSafe and Rational ClearCase integration
    * Archive file support using 7-Zip
    * Plugin support
    * Localizable interface
    * Online manual and installed HTML Help manual

Last edited by AtomSoft; 7th May 2008 at 06:22 PM.
AtomSoft is offline  
Reply With Quote
Old 7th May 2008, 09:33 PM   (permalink)
Default

If you are running MS Windows, you already have a file compare program. Open a DOS box (command prompt) and use fc. fc /? will display help. Also, you may want to use short simple filenames so you don't have to use quotes.
DSG is offline  
Reply With Quote
Old 7th May 2008, 10:41 PM   (permalink)
Default

Not freeware, but shareware with a 30-day free trial period: Beyond Compare (http://www.scootersoftware.com/).
David James is offline  
Reply With Quote
Old 8th May 2008, 10:49 AM   (permalink)
Default Winmerge

Thanks for all that replied.

Winmerge worked out of the box. All solved in less than one hour.

What a valuable tool!
__________________
Agustín Tomás
In theory, there is no difference between theory and practice. In practice, however, there is.
atferrari is offline  
Reply With Quote
Reply

Bookmarks

Thread Tools
Display Modes


Similar Threads
Thread Thread Starter Forum Replies Latest
MPLAB Files Trevors Micro Controllers 3 9th April 2008 01:31 AM
need to edit 2 VERY large files Marks256 Chit-Chat 9 14th January 2008 10:02 PM
how to add 3 files in one PIC .. meera83 Micro Controllers 1 30th October 2007 06:57 AM
Capture, Compare, PWM modules ??? Ayne Micro Controllers 2 6th February 2007 07:08 PM
Networking Harddrives crazymonkey General Electronics Chat 3 9th March 2004 04:55 PM



All times are GMT. The time now is 06:10 AM.


Electronic Circuits  |  Electronics Wiki
Powered by vBulletin® Version 3.7.0
Copyright ©2000 - 2008, Jelsoft Enterprises Ltd.