patch

How to patch on Windows?

Given a (source) patch file, what's the easiest way to apply this patch on the source files under Windows? A GUI tool where I can visually compare the unchanged-changed source lines would be great. ...

Ignore Emacs auto-generated files in a diff

How do I make diff ignore temporary files like foo.c~? Is there a configuration file that will make ignoring temporaries the default? More generally: what's the best way to generate a "clean" patch off a tarball? I do this rarely enough (submitting a bug fix to an OSS project by email) that I always struggle with it... EDIT: OK, the sh...

Managing the patch level of multiple windows systems

In an environment with multiple windows servers what is the best way to ensure patch compliance accross all systems? Is there a simple tool (some sort of client/server app?) that allows reports to be generated showing the status of all the systems so any that aren't automatically patching themselves can be fixed without having to manu...

What opensource projects do you support, or what keeps you from supporting projects?

I often feel like I should be contributing more to certain projects as I depend on them daily, but often feel I would mostly be getting in the way. Do you have any projects that you are not a main developer but do submit patches to? Any stumbling blocks keeping you from lending a hand? ...

subversion diff including new files

I have some local changes to an open source project which uses Subversion as its source control. (I do not have commit access on the original project repository.) My change adds a file, but this file is not included in the output of "svn diff". (It may be worth noting that the new file is a binary, not plain text.) How can I make a p...

What exactly does the word Patch mean when refering to 'submitting a patch'?

What exactly does the word patch mean when refering to 'submitting a patch'? I've seen this used a lot, especially in the open source world. What what does it mean and what exactly is involved in submitting a patch? ...

Best practices for source control and bug fixes

If we need to issue a bug patch that does not include current development that has been committed, or any changes from their current version, what should be done to make the process safer and with lower overhead? We are currently using Subversion for our source control in a small (3 developers) team primarily developing in Visual Studi...

How do Microsoft (and other software companies with a large installed base) manage patch dependencies?

OS (usually security-based) patches and hotfixes that Microsoft releases to the community normally consist of, in my understanding, a series of updated DLLs or other binaries. How does Microsoft, and other companies like it, ensure that that hotfixes don't clash with each other? Do they always go for a cumulative patch approach, where ...

What knowledge do you need to create a patch for your game or application?

I've always been mystified how software vendors can ship their application or game, and then later provide a different set of executables that change the behaviors of the previous build. How is this done? Do the original application and the patch have to adhere to some kind of rule? Or does the patch crawl into the original executable an...

Identifying files for a hot fix/patch

We (occasionally!) have to issue hot fixes for our product and do this by reissuing the affected files directly rather than with a new installer. The product has a large number of pieces, some managed code, some unmanaged. Currently development flags which build artifacts (exes, dlls) need to be shipped in a hot fix. We'd like to be a...

Subclipse: Is there a way to make Team>Create Patch use relative paths?

I recently got involved in a Java project at work: we're using MyEclipse for the IDE, and Subclipse for source control integration. Since I am new to the project, I am currently submitting any changes I make as patches, to make it easier for the other team members to review my changes and decide whether or not to commit them to the trunk...

Patch vs. Hotfix vs. Maintenance Release vs. Service Pack vs....

When you are somewhere between version 1 and version 2, what do you do to maintain your software? The terms Patch, Hotfix, Maintenance Release, Service Pack, and others are all blurry from my point of view, with different definitions depending on who you talk to. What do you call your incremental maintenance efforts between releases? ...

How do I send a patch to another developer and avoid merge conflicts?

How do I get a patch from a commit in order to send it to another developer? And how do I best avoid a merge conflict with this patch when merging our trees at a later date? If you know how please explain how to do this in your VCS of choice such as subversion, git, Mercurial, bzr or etc. ...

How to make svn diff produce file that patch would apply, when svn cp or svn mv was used?

The scenario is: svn cp or mv some file modify that file svn diff > mypatch On other machine (same working copy, but no changes): Try to apply mypatch. Fail -> tries to modify unexistant file. How can I make svn diff produce patch-appliable patch, or cleanly apply patch produced by svn diff in this case? I can't commit. I would l...

IDA Pro and editing executables

This is kind of an unorthodox question. I'm kinda new to using IDA Pro. Is there a way to edit the assembly code and then have IDA save the result as an executable? Is there some kind of plugin maybe that does that? because it seems that IDA doesn't want to save as an EXE. Or do I need to manually edit it in some other way? ...

Apply Diff in PHP

I'm working with the Text_Diff PEAR package to diff to short text documents, where the Text_Diff object is created with a space-delimited list of the words in each document. I was hoping to store the diff in a database, and then apply it when the file is loaded again. Is there an easy way to apply this diff, or do I need to write a fun...

How does one submit a potential patch to the Linux kernel?

We have some software which relied on certain behavior from an another (very commonly used) application that has now changed, rendering our current implementation workable, but less than optimal. We believe that this change may have affected a number of other applications, particularly in the performance monitoring arena, and we have fo...

Using the output of diff to create the patch

Hello, I have something like this src/sim/simulate.cc 41d40 < #include "mem/mem-interface.h" 90,91d88 < dram_print_stats_common(curTick/500); < src/mem/physical.hh 52d51 < public: 55,56d53 < public: < 58a56,57 > public: > 61,62c60,61 < virtual bool recvTiming(PacketPtr pkt); //baoyg < --- I believe th...

How do you use the diff command against two source trees

I tried running 'diff' against two source directories get a patch file with a 'diff' between the two directories. diff -rupN flyingsaucer-R8pre2_b/ flyingsaucer-R8pre2/ > a.patch The command above does not seem to work, it generates a diff of everything and I get a 13 MB file, when in reality, it should be a couple of changes. ...

What's the right way to install gems in a GC Patched ruby?

I want to install a GC Patched Ruby to do a memory profiling on my app. I followed the instructions at http://guides.rubyonrails.org/performance_testing.html#gc and installed a ruby instance at my home dir (I already have another "official" instance for development). This GC Patched ruby instance is working fine. The problem is when I n...