Mercurial > hg > orthanc-book
diff Sphinx/source/developers/repositories.rst @ 558:8d6e94423004
dos2unix in hg import
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 12 Dec 2020 11:36:40 +0100 |
parents | 654e1614cec1 |
children | 4efcffb747c4 |
line wrap: on
line diff
--- a/Sphinx/source/developers/repositories.rst Thu Dec 10 18:10:32 2020 +0100 +++ b/Sphinx/source/developers/repositories.rst Sat Dec 12 11:36:40 2020 +0100 @@ -197,7 +197,12 @@ $ hg up -c default $ hg import /tmp/contribution.patch +NB: If the ``hg export`` command was run on Microsoft Windows, one +might have to convert the end-of-lines from DOS (CR/LF) to UNIX (LF +only) using the ``dos2unix`` command, before running ``hg import``. +Otherwise, errors like ``Hunk #1 FAILED`` might show up. + .. _hg-bundle: Exchanging a bundle