Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-import.out @ 3044:fcadf7a32425

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
date Sun, 03 Sep 2006 06:06:02 -0400
parents b70740aefa4d
children c93562fb12cc
comparison
equal deleted inserted replaced
3043:2a4d4aecb2b4 3044:fcadf7a32425
1 adding a 1 adding a
2 adding d1/d2/a
2 % import exported patch 3 % import exported patch
3 requesting all changes 4 requesting all changes
4 adding changesets 5 adding changesets
5 adding manifests 6 adding manifests
6 adding file changes 7 adding file changes
7 added 1 changesets with 1 changes to 1 files 8 added 1 changesets with 2 changes to 2 files
8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 9 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
9 applying ../tip.patch 10 applying ../tip.patch
10 patching file a
11 % message should be same 11 % message should be same
12 summary: second change 12 summary: second change
13 % committer should be same 13 % committer should be same
14 user: someone 14 user: someone
15 % import of plain diff should fail without message 15 % import of plain diff should fail without message
16 requesting all changes 16 requesting all changes
17 adding changesets 17 adding changesets
18 adding manifests 18 adding manifests
19 adding file changes 19 adding file changes
20 added 1 changesets with 1 changes to 1 files 20 added 1 changesets with 2 changes to 2 files
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 21 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
22 applying ../tip.patch 22 applying ../tip.patch
23 patching file a
24 transaction abort! 23 transaction abort!
25 rollback completed 24 rollback completed
26 % import of plain diff should be ok with message 25 % import of plain diff should be ok with message
27 requesting all changes 26 requesting all changes
28 adding changesets 27 adding changesets
29 adding manifests 28 adding manifests
30 adding file changes 29 adding file changes
31 added 1 changesets with 1 changes to 1 files 30 added 1 changesets with 2 changes to 2 files
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 31 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 applying ../tip.patch 32 applying ../tip.patch
34 patching file a
35 % import from stdin 33 % import from stdin
36 requesting all changes 34 requesting all changes
37 adding changesets 35 adding changesets
38 adding manifests 36 adding manifests
39 adding file changes 37 adding file changes
40 added 1 changesets with 1 changes to 1 files 38 added 1 changesets with 2 changes to 2 files
41 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 39 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
42 applying patch from stdin 40 applying patch from stdin
43 patching file a
44 % override commit message 41 % override commit message
45 requesting all changes 42 requesting all changes
46 adding changesets 43 adding changesets
47 adding manifests 44 adding manifests
48 adding file changes 45 adding file changes
49 added 1 changesets with 1 changes to 1 files 46 added 1 changesets with 2 changes to 2 files
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 47 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
51 applying patch from stdin 48 applying patch from stdin
52 patching file a
53 summary: override 49 summary: override
54 % plain diff in email, subject, message body 50 % plain diff in email, subject, message body
55 requesting all changes 51 requesting all changes
56 adding changesets 52 adding changesets
57 adding manifests 53 adding manifests
58 adding file changes 54 adding file changes
59 added 1 changesets with 1 changes to 1 files 55 added 1 changesets with 2 changes to 2 files
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 56 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
61 applying ../msg.patch 57 applying ../msg.patch
62 patching file a
63 user: email patcher 58 user: email patcher
64 summary: email patch 59 summary: email patch
65 % plain diff in email, no subject, message body 60 % plain diff in email, no subject, message body
66 requesting all changes 61 requesting all changes
67 adding changesets 62 adding changesets
68 adding manifests 63 adding manifests
69 adding file changes 64 adding file changes
70 added 1 changesets with 1 changes to 1 files 65 added 1 changesets with 2 changes to 2 files
71 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 66 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
72 applying patch from stdin 67 applying patch from stdin
73 patching file a
74 % plain diff in email, subject, no message body 68 % plain diff in email, subject, no message body
75 requesting all changes 69 requesting all changes
76 adding changesets 70 adding changesets
77 adding manifests 71 adding manifests
78 adding file changes 72 adding file changes
79 added 1 changesets with 1 changes to 1 files 73 added 1 changesets with 2 changes to 2 files
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 74 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
81 applying patch from stdin 75 applying patch from stdin
82 patching file a
83 % plain diff in email, no subject, no message body, should fail 76 % plain diff in email, no subject, no message body, should fail
84 requesting all changes 77 requesting all changes
85 adding changesets 78 adding changesets
86 adding manifests 79 adding manifests
87 adding file changes 80 adding file changes
88 added 1 changesets with 1 changes to 1 files 81 added 1 changesets with 2 changes to 2 files
89 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 82 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
90 applying patch from stdin 83 applying patch from stdin
91 patching file a
92 transaction abort! 84 transaction abort!
93 rollback completed 85 rollback completed
94 % hg export in email, should use patch header 86 % hg export in email, should use patch header
95 requesting all changes 87 requesting all changes
96 adding changesets 88 adding changesets
97 adding manifests 89 adding manifests
98 adding file changes 90 adding file changes
99 added 1 changesets with 1 changes to 1 files 91 added 1 changesets with 2 changes to 2 files
100 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 92 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
101 applying patch from stdin 93 applying patch from stdin
102 patching file a
103 summary: second change 94 summary: second change
95 % hg import in a subdirectory
96 requesting all changes
97 adding changesets
98 adding manifests
99 adding file changes
100 added 1 changesets with 2 changes to 2 files
101 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
102 applying ../../../tip.patch
103 % message should be 'subdir change'
104 summary: subdir change
105 % committer should be 'someoneelse'
106 user: someoneelse
107 % should be empty