patch

deltified document revision control in PHP

If I have a PHP application which allows users to make changes to documents, what is the best way to implement revision tracking for each document? I want the storage of each revision to be deltified (i.e. only save the changes that were made) like svn and other SCMs do with code. I know on a very simple level how it works, but when I st...

Can I create a patch for unversioned files with Tortoise SVN?

I'd like to create a patch reflecting changes to an unversioned file. I have both "before change" and "after change" versions and Tortoise Diff is happy to compare them. Can I also make a patch reflecting those changes with Tortoise SVN? ...

How do I create binary patches?

What's the best way to go about making a patch for a binary file? I want it to be simple for users to apply(a simple patch application would be nice). Running diff on the file just gives Binary files [...] differ ...

Installshield Setup/Patch/Upgrade question.

Hi! I hope someone can answer my questions. I made an installer using Installshield. Then also about 5 patches because of some bugs and everything. Now here are my questions: Is it possible to make new installer based on the previous one, like an upgrade, but with the patched file on it and not the original files? Supposed that questio...

Installshield 2009 set quickpatch behaviour

Installshield 2009 Premier I created a basic msi project binary output are: setup.exe, Data1.cab, HelloWorld.msi Then I created a quick patch project, referenced HelloWorld.msi & replaced a dll file When I run Update.exe[in a machine where I already set up 1] to update, it wants to restart, its ok But after restart if I again do ...

Patch on being installed starts the updated application

Hi, I have created a Windows installer for an application using WfWi. To make small updates to the application I have created a patch for the installer using WiX. The patch is created successfully and it updates the application well. But there is 1 problem. When the patch is installed completely my updated application starts running aut...

How to patch only a particular hunk from a diff

Is there a way to apply a single hunk from a diff to a file? For example, say I do a diff from file A and B, and that produces three chunks of differences, each denoted with something like... @@ -971,30 +977,28 @@ ...(in the case of unified diffs). I'd then want to be able to feed that diff into stdin, and ask patch to only apply hu...

Installshield 2009 Premier quickpatch project

I created a quickpatch project in Install Shield 2009 Premier. I referenced the previous setup.exe which deployed all 64 bit components. I wanted to replace one dll namely "process.dll" which was in component "process" in the previous .ism file. Actually in that very component there were two dlls namely "process.dll" & "processeng.dll"...

How to create a patch in IntelliJ IDEA?

I've been using IntelliJ IDEA 9.0 Community Edition for some time after years living in Eclipse. One thing seems to be hard to find in it. I'd like to create a patch on some subfolder in my project. In Eclipse it is done using right click, Team, Create Patch. Does anybody know how to do that in IDEA? ...

Exclude TortoiseSVN's ignore-on-commit files from svn diff

$svn diff > patchfile creates a nice patchfile. However, using TortoiseSVN under Windows I've set some files as being "ignored-on-commit", that is, it is under version control but doesn't get selected, when i do a commit. TortoiseSVN seemingly handles this via a custom entry in .svn/entries for this file. Note, that it it isn't a norm...

diff'ing diffs with diff?

I need to know if the two patches are effectively the same. I have an old patch file and new patch file created with the unix diff command. Just diff'ing the patches reports differences due to the timestamp when the patch was created. Is there a way (with diff?) that can reliably tell me if the two patches are effectively the same? ...

How to use patches created in windows (with CRLF) in linux?I

Standard linux patch hard-coded only for unix text files. PS: I do no want convert ALL to unix and then convert result back. ...

How to use 'patch' command with the standard output?

I'm trying to catch an output of bash patch command on a standard output, but I receive a "patch -o- some/file patch: can't output patches to standard output" warning. Tell me please, how I can make it properly? Maybe I'm stupid and the solution is really simple? ...

How to make os.mkfifo and subprocess.Popen work together?

I'm trying to redirect a patch command output using a named pipe. I tried like this: fifo = os.path.join(self.path, 'pipe') os.mkfifo(fifo) op = os.popen('cat '+ fifo) proc = Popen(['patch', current_keyframe, '--input='+fpath, '--output='+fifo], stdin=PIPE, stdout=PIPE) os.unlink(fifo) print op.read() But my script stops at Popen() ca...

After patch replaced dll is not deleted on uninstall

Install Shield 2009 Premier: Basic MSI Project. Deploys some dll to system32 (and others to other directory) Uninstall of it doesn't delete these dlls from System32 directory. So i added a custom action which forcefully deletes them & it did my job. But I needed a patch of that msi setups. I created it from Install Shield & it just repl...

Submit bug fixes on launchpad through patches or merge proposals?

I'm new to Launchpad and Bazaar, and I'm trying to figure out what the best way is to submit bug fixes. I'm using some reasonably popular open-source software that's hosted on Launchpad, but it's not very stable. I've created my own branch of the project to stabilize it and apply just the bug fixes we need without adding other changes fr...

How to patch an exe setup file

How can I extract an exe from a setup file, modify its contents and then assemble it again. Is there a tool or somthing or is there a way of doing this by a programmatically? ...

Visual Studio 2008 Patch List

I am installing Visual Studio 2008 on a new machine and I cannot find a list of all the HotFixes that have been released. I am planning on installing SP1 but I remember putting about 5 other patches on there. Does anyone have a list of patches that need to be installed? If not maybe we can start a list. Based on this list I installed SP...

Getting more out of *.diff -files

I wonder if there are tools to show *.diff files used in patching related to debian packaging. What I need from the tool is that it could just read the diff file and show the actual files changed with changed rows, like kdiff or meld would do when comparing directly 2 different files. Or maybe I have totally wrong kind of approach to thi...

In git, how do I create a single patch for the last 2+ revisions?

I would like to create a patch for the last 2 revisions. git format-patch -2 gives me 2 patch files, one for each revision git format-patch HEAD~2..HEAD gives the same thing. git format-patch -1 HEAD~2..HEAD gives a single file, but only contains changes for the last revision. Is there any way to do this in git? ...