Mercurial > hg > orthanc-book
comparison 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 |
comparison
equal
deleted
inserted
replaced
557:3af5dda67520 | 558:8d6e94423004 |
---|---|
195 | 195 |
196 $ hg pull | 196 $ hg pull |
197 $ hg up -c default | 197 $ hg up -c default |
198 $ hg import /tmp/contribution.patch | 198 $ hg import /tmp/contribution.patch |
199 | 199 |
200 | 200 NB: If the ``hg export`` command was run on Microsoft Windows, one |
201 might have to convert the end-of-lines from DOS (CR/LF) to UNIX (LF | |
202 only) using the ``dos2unix`` command, before running ``hg import``. | |
203 Otherwise, errors like ``Hunk #1 FAILED`` might show up. | |
204 | |
205 | |
201 .. _hg-bundle: | 206 .. _hg-bundle: |
202 | 207 |
203 Exchanging a bundle | 208 Exchanging a bundle |
204 ................... | 209 ................... |
205 | 210 |