Mercurial > hg

comparison tests/test-import-bypass.t @ 24258:093e8a5e995f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands.import: accept a prefix option The --prefix option is meant to be relative to the root rather than the current working directory. This is for consistency with the rest of 'hg import' -- paths in patches are otherwise considered to be relative to the root. In upcoming patches we'll hook this option up to the patch functions. --exact with --prefix is currently disallowed because I can't really come up with sensible semantics for it, especially when only part of the patch is preserved.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 06 Mar 2015 22:56:19 -0800
parents c63a09b6b337
children 76225ab5a5da
comparison
equal deleted inserted replaced
24257:31e9f66863f3 24258:093e8a5e995f
109 $ hg import --bypass --no-commit ../test.diff 109 $ hg import --bypass --no-commit ../test.diff
110 abort: cannot use --no-commit with --bypass 110 abort: cannot use --no-commit with --bypass
111 [255] 111 [255]
112 $ hg import --bypass --similarity 50 ../test.diff 112 $ hg import --bypass --similarity 50 ../test.diff
113 abort: cannot use --similarity with --bypass 113 abort: cannot use --similarity with --bypass
114 [255]
115 $ hg import --exact --prefix dir/ ../test.diff
116 abort: cannot use --exact with --prefix
114 [255] 117 [255]
115 118
116 Test commit editor 119 Test commit editor
117 (this also tests that editor is invoked, if the patch doesn't contain 120 (this also tests that editor is invoked, if the patch doesn't contain
118 the commit message, regardless of '--edit') 121 the commit message, regardless of '--edit')