Menu
I have two repositories, one is the main repo for a library, and the other is a project using that library.
If I make a fix to the in the subservient project, I'd like an easy way to apply that patch back upstream.
The file's location is different in each repository.
www.playdar.org/static/playdar.js playlick.com/lib/playdar.js I tried using git format-patch -- lib/playdar.js on the playlick project, and then git am on the main playdar repo, but the differing file locations in the patch file raised an error.
Is there an easy way to apply the patch from a given commit on a given file to another arbitrary file elsewhere?
For bonus points, what if the file you want to apply the patch to isn't in a git repository?
643
By creating a commit patch In that case you can create a patch of multiple successive commits and apply it to your current one. This can be done in two ways. One, cloning the third party repo in some other directory. Two, fetching the required branch of the third party repo in some other branch of your repo.
Right-click the item in the Solution Explorer and select Subversion > Apply Patch. Open the patch file. TortoiseMerge runs to merge the changes from the patch file with your working copy.
If manually editing the patch file is out of the question or infeasible, this can be done with standard options (available in git apply, git format-patch and GNU patch).
-p<n> removes n leading directories from the paths in the patch.
After processing -p, --directory=<root> prepends root to each of the paths in the patch before applying.
So, for your example, to take a patch that was originally on static/playdar.js and apply it to lib/playdar.js, you would run:
$ cat patch_file | git am \ -p1 \ # remove 1 leading directory ('static/') --directory='lib/' # prepend 'lib/' If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
