Show More
@@ -1898,7 +1898,12 b' def tryimportone(ui, repo, patchdata, pa' | |||||
1898 | branch=branch, |
|
1898 | branch=branch, | |
1899 | editor=editor, |
|
1899 | editor=editor, | |
1900 | ) |
|
1900 | ) | |
1901 | n = memctx.commit() |
|
1901 | ||
|
1902 | overrides = {} | |||
|
1903 | if opts.get(b'secret'): | |||
|
1904 | overrides[(b'phases', b'new-commit')] = b'secret' | |||
|
1905 | with repo.ui.configoverride(overrides, b'import'): | |||
|
1906 | n = memctx.commit() | |||
1902 | finally: |
|
1907 | finally: | |
1903 | store.close() |
|
1908 | store.close() | |
1904 | if opts.get(b'exact') and nocommit: |
|
1909 | if opts.get(b'exact') and nocommit: |
@@ -478,6 +478,12 b' hg import --secret' | |||||
478 | +line 2 |
|
478 | +line 2 | |
479 | $ hg --cwd b phase |
|
479 | $ hg --cwd b phase | |
480 | 1: secret |
|
480 | 1: secret | |
|
481 | $ hg --cwd b --config extensions.strip= strip 1 --no-backup --quiet | |||
|
482 | $ hg --cwd b import --bypass --secret ../exported-tip.patch | |||
|
483 | applying ../exported-tip.patch | |||
|
484 | $ hg --cwd b phase -r tip | |||
|
485 | 1: secret | |||
|
486 | $ hg --cwd b --config extensions.strip= strip 1 --no-backup --quiet | |||
481 | $ rm -r b |
|
487 | $ rm -r b | |
482 |
|
488 | |||
483 |
|
489 |
General Comments 0
You need to be logged in to leave comments.
Login now