comparison tests/test-import.out @ 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
comparison
equal deleted inserted replaced
5952:2e8eeb5bf29b 5953:e7f1be4bf40a
29 adding manifests 29 adding manifests
30 adding file changes 30 adding file changes
31 added 1 changesets with 2 changes to 2 files 31 added 1 changesets with 2 changes to 2 files
32 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 32 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 applying ../tip.patch 33 applying ../tip.patch
34 % import of plain diff with specific date and user
35 requesting all changes
36 adding changesets
37 adding manifests
38 adding file changes
39 added 1 changesets with 2 changes to 2 files
40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
41 applying ../tip.patch
42 changeset: 1:ca68f19f3a40
43 tag: tip
44 user: user@nowhere.net
45 date: Thu Jan 01 00:00:01 1970 +0000
46 files: a
47 description:
48 patch
49
50
51 diff -r 80971e65b431 -r ca68f19f3a40 a
52 --- a/a Thu Jan 01 00:00:00 1970 +0000
53 +++ b/a Thu Jan 01 00:00:01 1970 +0000
54 @@ -1,1 +1,2 @@
55 line 1
56 +line 2
57
34 % import of plain diff should be ok with --no-commit 58 % import of plain diff should be ok with --no-commit
35 requesting all changes 59 requesting all changes
36 adding changesets 60 adding changesets
37 adding manifests 61 adding manifests
38 adding file changes 62 adding file changes