Mercurial > hg
diff tests/test-import @ 5953:e7f1be4bf40a
Permitting the import command to accept a --user option.
The prose section of the help text for the command already said that -u and -m
are accepted, but -u was not listed in the table of options, and did not work.
Useful when accepting patches from other people made by hg diff rather than hg
export. For completeness, also accepting -d DATE.
[CHANGES: rebased against d8878742a924, --no-commit option.]
| author | Jesse Glick <jesse.glick@sun.com> |
|---|---|
| date | Fri, 25 Jan 2008 19:49:15 -0500 |
| parents | d8878742a924 |
| children | 30d2fecaab76 |
line wrap: on
line diff
--- a/tests/test-import Fri Jan 25 16:24:00 2008 -0800 +++ b/tests/test-import Fri Jan 25 19:49:15 2008 -0500 @@ -32,6 +32,13 @@ hg --cwd b import -mpatch ../tip.patch rm -r b +echo % import of plain diff with specific date and user +hg clone -r0 a b +hg --cwd a diff -r0:1 > tip.patch +hg --cwd b import -mpatch -d '1 0' -u 'user@nowhere.net' ../tip.patch +hg -R b tip -pv +rm -r b + echo % import of plain diff should be ok with --no-commit hg clone -r0 a b hg --cwd a diff -r0:1 > tip.patch