patch

How do I apply a diff patch on windows?

There are plenty of programs out there that can create a diff patch, but I'm having a heck of a time trying to apply one. I'm trying to distribute a patch, and I got a question from a user about how to apply it. So I tried to figure it out on my own and found out that I have no clue, and most of the tools I can find are command-line. ...

Creating an installer for updated WinForms app

I released an app and I've implemented a user-requested feature and would like to release a new version. I'm not sure how this is typically done - is there some setting in the .NET setup project that I can use to tell it to just overwrite certain files if the application is already installed, or do I have to generate a patch somehow? I...

How to prevent Vista from requiring elevation on patch.exe?

[I'm sorry that this isn't directly a programming question. But I have recently switched to a new Vista machine where I am keeping UAC enabled (please don't tell me to disable it, it's not an option).] Every time I run gnu's patch.exe I get an elevation dialog from Vista. If I rename patch.exe to foo.exe it does not do this, so I assume...

How to read .rej files, i.e.

I'm having trouble applying a patch to my source tree, and it's not the usual -p stripping problem. Patch is able to find the file to patch. Specifically, my question is how to read / interpret the .rej files patch creates when it fails on a few hunks. Most discussions of patch/diff I have seen don;t include this. ...

How do I make/apply a diff patch to this situation ?

Hi, I have a project, for example WORDPRESS. and I am use SVN. I have following copies: A. WP2.6 from wordpress.org B. WP2.6, I modify some core files (add/del/change some files' code) C. WP2.7 from wordpress.org I would like update Version A to C and keep the changes of version B. some of my changes maybe like that: Version A c...

What's the least painful way to transfer local Subversion changes to another machine?

I'm working on a change on my laptop. It's not ready to be submitted to repository yet but I'd like to keep working on my desktop too. My change set is quite big and not only it contains modifications, it also contains new files and deleted files as well. I could copy the complete local working copy to another machine and get the change...

What are patches used for in SVN?

I'm guessing it allows you to "save" a merge process so I could create a patch for some Open Source project, and submit a patch so they don't have to handle the merge themselves? When and how would you use patches in SVN? ...

How do you squash commits into one patch with git format-patch?

I've got eight commits on a branch that I'd like to email to some people who aren't git enlightened, yet. So far, everything I do either gives me 8 patch files, or starts giving me patch files for every commit in the branch's history, since the beginning of time. I used git rebase --interactive to squash the commits, but now everything...

Patch/Merge plugin.properties file in plugin by using fragment

In my plugin de.support.help are the plugin.properties files. These properties files include the strings for the preference page. I want to use this plugin for different customers, but the customer name is inside the properties files. I want to patch the properties files by using the eclipse fragment mechanism. As far as i now the fr...

What is the easiest way to submit bugfixes to open source projects using SVN?

What is the easiest way to submit a working patch or bugfix to an Open Source project using SVN? Ideally, I would like to submit a revision or patch so they can easily apply it in their repository directly if they approve it. I'm using TortoiseSVN if it matters. ...

How does one extract a unified-diff style patch subset?

Every time I want to take a subset of a patch, I'm forced to write a script to only extract the indices that I want. e.g. I have a patch that applies to sub directories 'yay' and 'foo'. Is there a way to create a new patch or apply only a subset of a patch? i.e. create a new patch from the existing patch that only takes all indices t...

Self updating py2exe/py2app application

I maintain a cross platform application, based on PyQt that runs on linux mac and windows. The windows and mac versions are distributed using py2exe and py2app, which produces quite large bundles (~40 MB). I would like to add an "auto update" functionality, based on patches to limit downloads size: check for new versions on an http s...

Where to submit Subsonic patch?

I just found an issue for Subsonic 2.1 that I created a patch for. Where do I go to submit that patch? ...

What is the site that will allow you to download any Microsoft Knowledgebase Article QFE?

There is a site that will let you download Microsoft QFE patches like the ones in Microsoft Knowledge Base Articles without having to call Microsoft support first? I used to know it offhand but have managed to forget it. I keep running in to situations where I need a patch for SQL or Visual Studio and have to spend an hour on the phone...

git workflow question

Hi, this will be a long one but I hope you could bear with me. I am trying to use git to put my team's source codes under version control. After trying to find different approaches that would work for me, I finally decided to use git format-patch feature. FWIW, the product is an ASP.NET web application running in Windows and I am curren...

In svn, can I revert a change and shelve it for later?

I have some changes commited a few commits back in my svn repository. Let's say HEAD is at r750 and I want to revert r745 without losing r746-r750. Is this possible? And, can I somehow save r745 and reapply it later (as a new revision)? ...

Does anyone else prefer visual diffing to unified diff patch files?

I took over some code that hadn't been developed since 2002 and I looked through the patches sent against it over time. All these patches were in unified diff format, which apparently is the de facto standard for submitting code improvements. Here's what one patch looked like: @@ -365,7 +385,10 @@ return () unless defined $op_sym; ...

Building Wix 3.0 upgrade and patch.

1)What are the best practices of building, patches? 2)Is it possible to build patch between major upgrade(Product code is changed) build? 3)How to ship content(static files) update for a product We tried to do this through patch but is was taking lot of time to update just 200 files, basically our requirement is that we want to ship p...

NSIS patching (multiple patches in one file)

I'm able to generate patch files from one version to another using NSIS' Vpatch. Let's say I have mydll.dll version 1, and I have a patch to update it to version 2. Then I have a new version again, thus I generate another patch to update it to version 3. What bothers me though is, what if user cancels updating to version 2 and so fort...

How to perform a rolling diff?

How do you perform a rolling diff between 2 files to determine only the portion of files that have changed? ...