Changes between Version 16 and Version 17 of Tutorials/SubmittingPatch


Ignore:
Timestamp:
Apr 24, 2018, 11:15:03 AM (6 years ago)
Author:
patrik.svestka@…
Comment:

adding information about subsequent patches to hg import --no-commit

Legend:

Unmodified
Added
Removed
Modified
  • Tutorials/SubmittingPatch

    v16 v17  
    167167     If you really want patches to be committed, please use `hg import --exact`.
    168168     }}}
    169 
    170      
    171 
    172   3. Check if the patch is there
     169     {{{
     170     #!div class="note"
     171     **Note2:**
     172     Please note that if you want to test multiple patches (e.g. on Windows) with `--no-commit` it has to be done differently than `--no-commit` on subsequent steps.
     173
     174     The first step is, of course, natural `hg import --no-commit name1.patch`. 
     175
     176    During the second step you have use `patch.exe`.  It can be patched like this: `patch -p1 < name2.patch` (works only at **cmd.exe**!).  The `patch.exe` is from git e.g. `patch: /c/Program Files (x86)/Git/bin/patch.exe`) and with that one it works.
     177
     178    If you would like to use **powershell** then an option is to use `cat name2.patch | patch -p1`
     179     }}}
     180
     181
     182  3. Check if the patch is there (will not be shown when `--no-commit` is used)
    173183     {{{
    174184     C:\prg_sdk\Stx-jv_branch_build\stx-jv\build\stx\libtool>hg sum