| |
by: Charley |
last post by:
I've got a diff file that I think is a patch for a bunch of file in a
directory. How do I apply this file?
I thought it was
#patch myfile.diff
But that does nothing. I must be missing something. The diff file
contains diff's for a nuch of files, not just a single file. Do I need a
|
by: Guillaume Lahitette |
last post by:
Hello everyone,
I am looking for a lightweight Java Applet to diff and merge two text
files. The functionality would be a subset of what WinMerge
(http://winmerge.sourceforge.net) offers:
- diff 2 text files
- merge (in both directions)
- color coding to highlight differences
I found some Java diff tools but they were all command line....
|
by: Nick Allen |
last post by:
After using ndiff from difflib, the function restore
would return the sequence that generated the delta. Unfortunately,
restore does not do the same for unified_diff. I do not see any similar
function that is intended for unified_diff. Does anyone know how to
"restore" from a unified diff generated delta?
Thanks for all your help in...
|
by: Ching-Lung |
last post by:
Hi all,
I try to create a tool to check the delta (diff) of 2
binaries and create the delta binary. I use binary
formatter (serialization) to create the delta binary. It
works fine but the delta binary is pretty huge in size. I
have 1 byte file and 2 bytes file, the delta should be 1
byte but somehow it turns out to be 249 bytes using...
|
by: Igor Shevchenko |
last post by:
Hi!
Suppose I have "pg_dump -s" of two pg installs, one is "dev", another is
"production". Their schemas don't differ too much, and I want to get a "diff
-u"-like schema diff so I can quickly add missing/remove old
tables/sequences/etc to one or another (manually). Is there some quick tool
for doing this ?
There was a thread about it...
|
| |
by: Andreas Kasparek |
last post by:
Hola!
I'm preparing my master thesis about a XML Merge Tool implementation and was
wondering if there is any open standard for XML diff regarding topics like:
- is a diff result computed on the ordered or unordered xml node tree of
the compared documents?
- what identifiers/criteria should be used by default to match elements of
the same...
|
by: AirYT |
last post by:
Hello,
I'm looking for an implementation for diffing 2 (text) files and spitting
out the output using php only. i would like to extend this to use ftp to
diff two files on two ftp servers, or one local file & a remote ftp server.
Anyone have any ideas on source for this before i go ahead and build it? At
least the diff engine? a nice gui...
|
by: Shug |
last post by:
Hi,
We're reformatting a lot of our project code using the excellent
uncrustify beautifier.
However, to gain confidence that it really is only changing whitespace
(forget { } issues for just now), we were hoping to do a diff - a
textual comparison of the files, ignoring whitespace.
However, most diffs we've tried can't handle...
|
by: Aaron Gray |
last post by:
Hi,
I am working on an HTML WYSISYG Wiki and need to display a diff page like
WikiPedia does if two people edit a file at the same time to give the second
user the diff. Basically with additions in red and deletions in red strike
though.
There seem to be several in Perl and Python and many diff programs which all
seem to be line based...
|
by: akshaycjoshi |
last post by:
I have got one tree tree view control.I have three levels in it.
Example-
Root1
------->child1
------->child2
---------------->child1
---------------->child2
------->child3
Root2
|
by: marktang |
last post by:
ONU (Optical Network Unit) is one of the key components for providing high-speed Internet services. Its primary function is to act as an endpoint device located at the user's premises. However, people are often confused as to whether an ONU can Work As a Router. In this blog post, we’ll explore What is ONU, What Is Router, ONU & Router’s main...
|
| |
by: Oralloy |
last post by:
Hello folks,
I am unable to find appropriate documentation on the type promotion of bit-fields when using the generalised comparison operator "<=>".
The problem is that using the GNU compilers, it seems that the internal comparison operator "<=>" tries to promote arguments from unsigned to signed.
This is as boiled down as I can make it. ...
|
by: Hystou |
last post by:
Overview:
Windows 11 and 10 have less user interface control over operating system update behaviour than previous versions of Windows. In Windows 11 and 10, there is no way to turn off the Windows Update option using the Control Panel or Settings app; it automatically checks for updates and installs any it finds, whether you like it or not. For...
|
by: tracyyun |
last post by:
Dear forum friends,
With the development of smart home technology, a variety of wireless communication protocols have appeared on the market, such as Zigbee, Z-Wave, Wi-Fi, Bluetooth, etc. Each protocol has its own unique characteristics and advantages, but as a user who is planning to build a smart home system, I am a bit confused by the...
|
by: agi2029 |
last post by:
Let's talk about the concept of autonomous AI software engineers and no-code agents. These AIs are designed to manage the entire lifecycle of a software development project—planning, coding, testing, and deployment—without human intervention. Imagine an AI that can take a project description, break it down, write the code, debug it, and then...
|
by: TSSRALBI |
last post by:
Hello
I'm a network technician in training and I need your help.
I am currently learning how to create and manage the different types of VPNs and I have a question about LAN-to-LAN VPNs.
The last exercise I practiced was to create a LAN-to-LAN VPN between two Pfsense firewalls, by using IPSEC protocols.
I succeeded, with both firewalls in...
|
by: 6302768590 |
last post by:
Hai team
i want code for transfer the data from one system to another through IP address by using C# our system has to for every 5mins then we have to update the data what the data is updated we have to send another system
|
| |
by: muto222 |
last post by:
How can i add a mobile payment intergratation into php mysql website.
|
by: bsmnconsultancy |
last post by:
In today's digital era, a well-designed website is crucial for businesses looking to succeed. Whether you're a small business owner or a large corporation in Toronto, having a strong online presence can significantly impact your brand's success. BSMN Consultancy, a leader in Website Development in Toronto offers valuable insights into creating...
|
1
