Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Apply patches in branch

I receive a patches from a contributor. Apparently, he produces the patches in trunk. However, I would like to commit his changes to a new branch. May I know how I can do so through Tortoise-Hg?

like image 962
Cheok Yan Cheng Avatar asked Apr 26 '11 13:04

Cheok Yan Cheng


People also ask

What is Apply patch in git?

GIT patch or GIT diff is used to share the changes made by you to others without pushing it to main branch of the repository. This way other people can check your changes from the GIT patch file you made and suggest the necessary corrections.

What is a patch branch?

Patch is a text file, whose contents are similar to Git diff, but along with code, it also has metadata about commits; e.g., commit ID, date, commit message, etc. We can create a patch from commits and other people can apply them to their repository.


1 Answers

The directions found below assume you want the patches isolated on a named branch.

Using the command-line, it is easy to apply patches to a new named branch. However if you want to do this using TortoiseHg only, you must create the named branch with an empty commit prior to applying the patches.

Using the command-line:

hg branch <branch name>
hg qimport --push <patch-file-1>
hg qimport --push <patch-file-2>
hg qfinish --applied

Using TortoiseHg v1.1.x:

  1. Import the patch files to your patch queue (without applying them).
  2. Create a new named branch using an empty commit:
    • Open a commit dialog
    • Click the button labeled "branch: default"
    • Select "Open a new named branch"
    • Enter your branch name in the provided text box
    • Click the OK button.
    • Enter a commit message (e.g. "Created branch for patches from ") and click "Commit".
  3. Apply the patches in your patch queue (one at a time or all together).
  4. Right-click on the patches in your patch queue and select "Finish Applied"

Using TortoiseHg v2.0.x:

The same process used for TortoiseHg v1.1.x will work. The process to create the named branch with an empty commit is slightly different, but the overall concept is the same.

like image 143
Tim Henigan Avatar answered Sep 22 '22 14:09

Tim Henigan