patch

How to specify different --strip (-p) levels for patch?

If I have a diff that has paths like these: --- a/b/foo/bar/baz.pl +++ c/foo/bar/baz.pl Is there a way to tell the patch utility that the diff roots are at different levels? i.e. -p2 for one, yet -p1 for the other. Or is there any alternative utility that will patch in such a case? ...

How to get the diff between a tag and its base in Git?

I need to generate a patch of commit with respect to its base. A tag has been marked on that commit. So like on 939023 I do a commit and now it becomes 213232, I will tag 213232 with a label. Now given the label, I need to find out the diff between the 213232 and 939023. I mean I need a way to generate a diff of any commit whose label i...

.NET Deployment Options with Patch management / Automatic updates

What are the options available to deploy a .NET desktop application built using WPF other than ClickOnce? Top priorities are should work over the wire (internet or intranet) updates management; options to check for software updates and automatic updates. patch management; download and update only those files which has changed. ...

Modifying Patch Creation Properties (.pcp) file programmatically?

Is there a way to script the complete process of a hotfix build using msiexec.exe and msimsp.exe with a Patch Creation Properties file? I use msiexec.exe to create network installations of the before and after msi files, Orca to create a .pcp file, and msimsp.exe to create the patch file. I have been following the steps in these two ar...

What IDE lets me view diffs as highlighting on my code?

EDIT: Primarily, talking about code written in C. Someone sends me a diff to review and I know I can take the "before" code, apply the diff (patch) to get proposed "after" code, and open both, pair of files by pair of files, in a difference viewer (e.g. WinMerge, Araxis Merge, etc.) to review the change. On the other hand, if I want to...

I don't "get" how a program can update itself. How can I make my software update?

Say I make an .exe file and everything is peachy. Wonderful it works. Say I worked on a new feature on the software and I want it to be available for people who already have the older version, how can I make the software find my new version, patch it, and then go about it's business. I can't seem to wrap my head around the issue. Than...

Is it possible to Create Patch in Eclipse from changes that have already been committed?

I've used the Create Patch facility in Eclipse to create patches for uncommitted changes. I'm looking for a way to create patches in Eclipse for changes that have already been committed to the VCS. Unless I've missed something I don't think this is possible, but is there a plugin that adds this capability? e.g. enabling you to select tw...

How to patch J2SE so Java Datagram.getAddress() reports sender's port

Sun's j2se implementation of the j2me Datagram appears to be a bit broken: javax.microedition.io.DatagramConnection dc = createDatagramConnection(); javax.microedition.io.Datagram datagram = (javax.microedition.io.Datagram)datagramConnection.newDatagram( 1000 ); datagram.reset(); datagram.setLength( 1000 ); datagramConnection.receive(...

How to deploy: database, source and binary changes in 1 patch?

Hello There, I'm part of a development team that works on many CMS based projects, using systems like Joomla and Drupal. In our development process, all of our code changes are managed inside of Git. At the end of a sprint, we create a DIFF that we can apply via patch to live site. The problem is that most of the time, the changes inc...

Perform a maven patch release

Is it possible to perform a patch release in maven? I would like to create a jar containing only one class which I have changed since the release. ...

How to Merge multiple patch files?

We use subversion and during every check-in, a script creates a patch file with all the diff. Now for the same issue/defect there could be multiple check-ins and we end up with multiple patch files. Now to see consolidated changes for an issue all the patch files have to be merged. Is there a way to do that? Or another way to solve the ...

Definition of the word "patch"

Personally, I use the word "patch" as the software equivalent of a symptomatic treatment, which makes a patch a quick-and-dirty bugfix. However, I'm not sure this is correct, because I often see it is used in other meanings, for example as a synonym of a program update. What does the word "patch" mean exactly? Update: I think terminol...

Inverting a diff or patch || CVS diff

In CVS, my working copy (WC) is on a certain branch (which we'll call "foo"). There have been other changes checked into foo by another dev. I want to do a diff between my WC and the upstream state of foo. Normally, when working in the trunk (HEAD), I just do a cvs diff, and that's fine. But for some reason when doing a plain cvs dif...

A visual patch tool for Linux

I've got a file and a patch for it. I'd like to visually apply the patch, t.i. see how the changes proposed by the patch look in context, make some corrections, and save the resulting file. What tool can do that? Neither of the visual diff tools (i.e. meld, diffuse, diffmerge) do what I want: they don't work with patches, they merely m...

Re-doing the same programming work as done on the job

I am a co-op at a company and I was tasked with patching Roumen Petrov's OpenSSH w/ x509 certificates patch (http://www.roumenpetrov.info/openssh/) to include one of the features in his wanted list: wildcards in Distinguished Names. On his site he says that he will gladly accept patches. After finishing, I asked my manager to implore th...

run application after installshield patch

Hi! Anyone with installshield experience. I have this quick patch that will replace my recently installed exe. It works fine, no problem. However, what I need right now is to automatically run the exe after patch. How can I do this? Please let me know if you don't understand my question. :) ...

Good, cross-platform software update libraries/tools?

Does anyone have experience with a library or tool suite that helps an ISV deliver software updates of shipped products? We ship software that runs on OS X, Linux, and Windows. We have partial solutions that are platform-specific for each platform, but we would like to have a single, unified system for pushing out software updates to our...

CVS patch with added files under Windows

I have a CVS tree with some modified files and some new/added. I use: cvs -q -x diff -u To generate a patch that lists all the changes. However, it lacks the newly added files. Im doing some googling to find the correct parameter flag but I dont have much luck. Anyone with wisdom to share? (This is on Windows but I assume it doesnt ...

Patching an MSI created with Visual Studio 2005 Setup projects .vdproj

Folks, What should be the process of patching an MSI file that was created by VS 2005 using the setup projects ? I need to create an MSP file that will replace a few files only; is this doable via VS or any other tools ? ...

How to apply git diff --binary patches without git installed?

I use to git diff to generate patches that can be applied to remote server to update a project. Locally, I run: git diff --no-prefix HEAD~1 HEAD > example.patch Upload example.patch to remote server and run: patch --dry-run -p0 < example.patch If dry-run is successful, I run: patch -p0 < example.patch This works well, except wh...