Try a: git apply –ignore-space-change –ignore-whitespace patch.diff As mentioned in “git: patch does not apply”, this can be caused by: the line endings differing between the local file system and the remote repo. User core.eol in .gitattributes file is a good approach (see “git force file encoding on commit”) the execution bit (‘x‘). That can … Read more
What I actually did for was: cd /path/to/svn/repo svn diff -r 125 > /tmp/patch.diff cd /path/to/git/repo patch -p0 < /tmp/patch.diff
If you have two directories a and b that are similar, and you want b to be the same as a, you can create and apply a patch with: $ diff -ur b a > ba.diff $ patch -i ba.diff Suppose you have directories local (containing your local version of upstream1.0), upstream1.0, and upstream1.1. To … Read more
The following command creates a single .patch file that contains multiple commits. git format-patch cc1dde0dd^..6de6d4b06 –stdout > foo.patch You can then apply it like so: git am foo.patch Note: Be sure to use ^.. instead of .. if you want the first commit SHA to be included.
Use svn patch. Case 1: using /usr/bin/patch: svn diff > $TMPDIR/mypatchfile.patch cd myOtherCheckOut patch -p0 < $TMPDIR/mypatchfile.patch Applies your changes well if there are no added/deleted files through svn add or svn delete Case 2: using svn patch: svn diff > $TMPDIR/mypatchfile.patch cd myOtherCheckOut svn patch $TMPDIR/mypatchfile.patch Tracks added and deleted files too. Note that … Read more
TL;DR patchy is a tiny library I’ve come up with that takes care of the major boilerplate code needed to properly handle PATCH in Spring i.e.: class Request : PatchyRequest { @get:NotBlank val name:String? by { _changes } override var _changes = mapOf<String,Any?>() } @RestController class PatchingCtrl { @RequestMapping(“/”, method = arrayOf(RequestMethod.PATCH)) fun update(@Valid request: … Read more
tf diff /shelveset:shelveset /format:unified Edit: This writes to standard output. You can pipe the output to a file. For more options, see Difference Command.
First example suggests that f1() and f2() defined in the same module. Hence the following should work: from foo.bar import f2 from mock import patch class MyTest(TestCase): @patch(‘foo.bar.f1’) def test_f2_2(self, some_func): some_func.return_value = (20, False) num, stat = f2() self.assertEqual((num, stat), (40, False)) Patch is on the same as import: @patch(‘foo.bar.f1’) Here is a good … Read more
You can create a patch file by restricting the output of git diff by listing paths at the end of the command (after a — to avoid any potential clashes between path names and branch names). For example, you could do the following: git diff origin/master HEAD — app/models/region.rb doc/ > changes.patch Above commands generate … Read more
With subversion, you can specify which diff binary to use, and parameters to pass to it. See the manual on svn diff. You’d want to produce a regular patch file from a svn diff, so you’d want the svn diff to look like a normal diff. Try this: svn diff –diff-cmd /usr/bin/diff -x “-i -b” … Read more