patch

How to apply `git diff` patch?

How my client can apply my patch created by command git diff without git installed? I have tryed to use patch command but it always asks file name to patch. ...

Perforce - how to allow users without checkin privileges to submit patches

Our team uses Perforce for revision control. We'd like to be able to accept patches from folks outside our team (e.g. support engineers) without giving them full privileges to check in code, like the way that open-source projects are willing to accept code from anyone but give full commit privileges to only a few people. Other source-c...

How to patch --dry-run but still view rejects?

I want to test a patch using --dry-run, but when it fails, I don't get any reject files. Is there any way to do a dry run but keep the reject files so I can see what went wrong? ...

Is there a version of `patch` for Windows that outputs CRLF files?

I am using patch from UnxUtils (on Windows), which works (my file patches fine) but the outputted file has LF instead of CRLF line endings. Is there an equivilent to patch which outputs using CRLF instead of LF? ...

Can't apply unified diff patch on Solaris

For example, if I have two files: file1: This is file 1 and file2: This is file 2 and create patch with the following command: diff -u file1 file2 > files.patch result is: --- file1 Fri Aug 13 17:53:28 2010 +++ file2 Fri Aug 13 17:53:38 2010 @@ -1,1 +1,1 @@ -This is file 1 +This is file 2 Then if I try to apply t...

Where the Ubuntu’s source can be gotten?

Where can I get Ubuntu's source code? Actually I want It's kernel's code. I know I can get the kernel from kernel.org but as I found out that Ubuntu does some patching on the kernel I want to know what are those patches. And yes I know Ubuntu's kernel code can be found in an installed Ubuntu in the file system but thats just the code! I ...

symfony: trying to create a patch. What should be my first step(s) ?

Hi, i created this ticked some days ago. http://trac.symfony-project.org/ticket/8922#preview I'm interested in creating a patch (if possible). I dont have experience debugging (just using var_dump). What should be my first step(s) ? Javi ...

Patching Arm Executable?

Hi, I must patch an arm executable in my Pocket PC. I am dissassembling the ARM executable with IDA Pro. But I can not edit binary. As you know Ollydbg let us to edit binary / add assembly code (Right Click->Assemble) But it doesnt support ARM. So I dissassembly it with IDA Pro. But in IDA , I can not add my assembly code into my ARM E...

Existing patches for android tabwidget to allow tabs on left-hand side?

My employer is having me work on an android application with very specific UI requirements. Specifically, we need an interface that looks exactly like a TabWidget interface. However, having the tabs on the left hand side is an absolute must. We aren't going to be deploying this application to any android phones, its for an in house devic...

How to Update the installed Window Application (Creating Patches)

hi, i have requirement. i have created the window application and i have created the setup of that application that has been installed to client machine. Now the requirement is that if i will do the further modification to the project the client not need to install whole application again instead client only need to install Update of ...

PHP - application patch build

I'm trying to come up with a better solution for our development group to build patches for our applications (PHP). We currently submit to SVN daily, but do not run a continuous integration server, as code checked in can be buggy. For building patches, we check against a "date modified", from the last build. A lot of times though, we'...

Is there a function in elisp to apply a patch to a buffer?

I am working on an emacs mode for a review tool, and want to use ediff for viewing diffs... the problem is that the review tool only yields a diff, rather than old and new files. I'd like to put the old file in a buffer and apply a diff rather than copying the file, calling out to diff as a subprocess and loading it into a separate buffe...

What to do if git-am fails with "does not match index"?

I'm trying to apply a git patch created by someone else with git-format-patch. The patch was made against one commit behind HEAD, but as I understand it this shouldn't matter. When I run git am 0001.patch, I get the error: error: source.c: does not match index I'm not too familiar with the format of git patches, but it does seem that t...

How do I apply a patch from gist to the Django source?

I want to try out a patch on gist that modifies the source code of Django: gist: 550436 How do I do it? I have never used git so a step by step instruction would be greatly appreciated. Thanks ...

netlogo, accessing color of a patch

i am trying to apply the following condition: if ( the color of patch -2 -1 is red ) [ some cammands ] can anyone please tell me how to write this in netlogo ...

Best way to merge a git revision into a mercurial repository?

I have a git repository, which has changes that I am slowly bringing into a mercurial repository. (It's a weird history, and I'm hand checking everything, and just as well that I am). Currently, I've generating a diff using git diff, and merging it using patch. That had a few problems, so I switched hg import, which has problems of its ...

Restore IntelliJ Idea shelved changes in new project

Every once and a while IntelliJ starts getting really slow and the only thing I can do to fix things is to do a fresh checkout and create a new IntelliJ project. Recently I noticed that items I shelved were no longer listed under the Changes tab. I found all of the .patch files but would like to restore them to the list of changes in th...

jQuery: Submitting patches

In two years of development, I found only one bug in jQuery. I confirmed it as a bug by reviewing related tickets at dev.jquery.com, and it was later fixed. Now, however, I've found another. And this time, I want to submit a proposed patch. I've corrected the bug in my local copy of jQuery, and want to submit it to be evaluated for incl...

Need advice on installing an application silently with patches

What I want to do is install program X with patches silently. Program X has an installer that is an MSI package. Program X has quite a few MSP file patches (8+)that have been released that I also want to install silently. There are two ways that I've seen to approach this: Method 1: Slip Streaming into "Network" installation msiexec.ex...

Useful Binary Diff Tool (other than msdn[apatch and mpatch], xdelta, bsdiff, vbindiff and winmerge)

I need a binary diff tool that can produce a patch file from compared 8MB files (.dat compressed files) and can merge produced said patch file to the older .dat file (size 8MB). I tried using msdn's apatch and mpatch, but mpatch produces 7MB diff or patch file when differentiating two 8MB files, when supposedly, the said patch file shou...