I have a kernel patch for a slightly different kernel version then the one I'm trying to patch. Needless to say, the patch partially fails. I can certainly fix it manually, but I was wondering maybe there is a graphical patch utility that can be used to resolve the conflicts. ...
Hello, I have a dir with thousands of files and 2 patch files that apply to the same dir. Each patch file patches 20-30 files in dir or it's subdirs. If I apply either patch to the common ancestor dir, it succeeds. But if I apply one patch file followed by the other, it fails because the line numbering has changed after one patch fil...
The following link refers to making a major change to the application and changing the ProductCode. http://stackoverflow.com/questions/3024753/installing-a-new-version-of-a-deployment-project-over-old-version Is it possible to easily (with Visual Studio) make a small change to an application and then without changing the ProductCode gui...
I don't get this: when I 'git pull --rebase remote branch' it reverts my HEAD back to their shared root and then starts replaying all of the remote commits that have happened in the meantime. Why do these commits sometimes fail? They are clean commits on a clean workspace? Isn't that almost the point of rebasing? ...
On windows i created a multi-file diff with: svn diff > mydiff.diff Then moved it to linux machine (with the same version of the same repo, no changes). How cai i apply it? After executing patch -p0 < mydiff.diff I get the following output: patching file licstat/test/unittest/test_licstatactioncontainers.cpp File licstat/test/uni...
I have around 50 relevant commits on my local git repo, of this list I want to show in a code review only my commits. But they are mixed with other people commits, and some of my commits are corrections to others, so I don't want to go commit by commit because I would step twice in the same code, for the original and for the correction. ...
In the WiX help documentation, Using Purely WiX for patching, the sample patch includes this section: <Media Id="5000" Cabinet="RTM.cab"> <PatchBaseline Id="RTM"/> </Media> and the command to build the patch references 'RTM' as well: pyro.exe patch\patch.wixmsp -out patch\patch.msp -t RTM patch\diff.wixmst The docs say the P...
Background: this question. git apply <patchfile> just recreates the file but without committing the history, which in this case would be desireable. Is there any switch for git-apply to do so? Or is there a way to convert the patchfile into a git-am compatible file? (Currently, git-am complains "Patch format detection failed") ...
Currently my program updates itself by downloading the latest .tar.gz file containing the source code, and extracting it over the current directory where the program lives. There are 2 "modes" of update - one for users running the Python source, and one if the user is running the program as a Windows exe. Over time my program's filesiz...
Say I get a patch created with git format-patch. The file is basically a unified diff with some metadata. If I open the file in Vim, I can see which lines have been modified, but I cannot see which characters in the changed lines differ. Does anyone know a way (in Vim, or some other free software that runs on Ubuntu) to visualize per-cha...
Hello all! Our build/deploy process is very tedious, sufficiently manual and error-prone. Could you give proposals for improvement? So let me describe our deployment strategy and build process. We are developing system called Application Server (AS for short). It is essentially servlet-based web application hosted on JBoss Web server. ...
I'm trying to use git add --interactive to selectively add some changes to my index, but I continually receive the "Your edited hunk does not apply. Edit again..." message. I get this message even if I choose the [e]dit option, and immediately save/close my editor. In other words, without editing the hunk at all, the patch doesn't appl...
On my Windows box, I tried to create a Subversion patch by using the command svn diff > my_patch.diff. The resulting file was encoded with UTF-16, rather than UTF-8 or ASCII, so when I tried to use patch (from GnuWin32) to apply the patch, it didn't work. I was able to convert the patch file to UTF8 by opening it in Notepad and saving ...
I'm looking for a method for storing the process memory, and restore it later at certain conditions. ... Actually I've read questions about it... It seems a big challenge! So, let's analyse: The application is a distributed one, but many processes are stateless (request their state to a centralized server). Processes uses network conn...
Hi, I'm trying to find a way to deploy software with custom patches in production. The base software is opensource with their own repos (SVN) and we've got some patches to select only for one service and not the other (so we've got base+patchA+patchB on one server and base+patchA+patchC on another). Everything will be deployed as packag...
Hello everybody, I'm seeking advice for a problem that I thought to be simple, and it might be simple indeed by creating a small script, but I think there should already be a way to do that with git/quilt/stgit. I'm not exactly good at git and this is causing some issues to me. My problem: I've got a git tree (linux kernel) and a numbe...
I have a set of patch files, which include newly created files. Is there a way to tell patch to create those files or do I have to touch each one manually? ...
I am writing a script to automate the process of setting up a bunch of Mac's in a computer lab. Each system is uniquely identified and I need a method of patching a plist file in several locations with the same string that will be read from the user in the script which is a bash script The original string is always the same. The patchi...
I am monkey-patching some of the jQuery's Draggable code* The goal is to avoid modifying the original source files and patch dynamically one of the internal functions. The function _generatePosition is declared like this: (function($) { $.widget("ui.draggable", $.ui.mouse, { ... _generatePosition: function(event) ...
We are in the process of adapting our build & release procedure of one of our Java based products to support patch / hotfix releases. Today, we deliver a full installation package (which is a set of RPM packages wrapped in an ISO) out of our build pipeline. However, we aim to also support incremental / more fine grained upgrade / patch...