![]() The -o parameter allows you to specify a different output directory. Which will create the patch in the current directory. If you want the above command to suppress or ignore the similarities of the two files, include the -suppress-common-lines. You can create patches for the last n revisions like this: If you need the output comparison of your two files to be side-by-side, consider implementing the diff command with the -y option. There's also a tool, format-patch, for formatting a patch to send as an e-mail. (ls -d folder1/ & ls -d folder2/) > dir.txt This line gets the unmatched files that do not exist in both directories and lists them in a file. This first line gets all the directories and files of folder1 & folder2 and lists them in a file. Or if you want to create a patch between 2 specific commits you can use git diff This code will copy all unmatched files from folder1 and folder2 into folder 3. The easiest way to create a patch for the last commit is There are several ways for creating a patch, the recommended one is using git format-patch (as mentioned in MDL-43119) In the dialogue box, make sure you select Style: Unified in the Format box.Ĭreating a patch if you're using Git for version control is similar to CVS, and similarly you don't need an unchanged copy of moodle to diff against. This will give you a nice view of what you have changed. You need a copy of 'standard_moodle' and 'my_moodle'. In this sense it is like the original command-line 'diff' program. WinMerge is a nice windows GUI for comparing folders. Eclipse makes creating patches really easy, once you have got it set up correctly. Then to create the patch, type:ĭiff -Naur standard_moodle my_moodle > patch.txt Suppose these two copies are in folders called 'standard_moodle' and 'my_moodle' which are subdirectories of the current folder. It requires that you have two copies of the code, one with your changes, and one without. You can use the diff command to show differences between two files, or each corresponding file in two directories. Diff is the a linux command line program, and is where patch files originated.
0 Comments
Leave a Reply. |