19 adding manifests |
18 adding manifests |
20 adding file changes |
19 adding file changes |
21 added 1 changesets with 2 changes to 2 files |
20 added 1 changesets with 2 changes to 2 files |
22 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
23 applying ../tip.patch |
22 applying ../tip.patch |
24 patching file a |
|
25 transaction abort! |
23 transaction abort! |
26 rollback completed |
24 rollback completed |
27 % import of plain diff should be ok with message |
25 % import of plain diff should be ok with message |
28 requesting all changes |
26 requesting all changes |
29 adding changesets |
27 adding changesets |
30 adding manifests |
28 adding manifests |
31 adding file changes |
29 adding file changes |
32 added 1 changesets with 2 changes to 2 files |
30 added 1 changesets with 2 changes to 2 files |
33 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
31 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34 applying ../tip.patch |
32 applying ../tip.patch |
35 patching file a |
|
36 % import from stdin |
33 % import from stdin |
37 requesting all changes |
34 requesting all changes |
38 adding changesets |
35 adding changesets |
39 adding manifests |
36 adding manifests |
40 adding file changes |
37 adding file changes |
41 added 1 changesets with 2 changes to 2 files |
38 added 1 changesets with 2 changes to 2 files |
42 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43 applying patch from stdin |
40 applying patch from stdin |
44 patching file a |
|
45 % override commit message |
41 % override commit message |
46 requesting all changes |
42 requesting all changes |
47 adding changesets |
43 adding changesets |
48 adding manifests |
44 adding manifests |
49 adding file changes |
45 adding file changes |
50 added 1 changesets with 2 changes to 2 files |
46 added 1 changesets with 2 changes to 2 files |
51 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
52 applying patch from stdin |
48 applying patch from stdin |
53 patching file a |
|
54 summary: override |
49 summary: override |
55 % plain diff in email, subject, message body |
50 % plain diff in email, subject, message body |
56 requesting all changes |
51 requesting all changes |
57 adding changesets |
52 adding changesets |
58 adding manifests |
53 adding manifests |
59 adding file changes |
54 adding file changes |
60 added 1 changesets with 2 changes to 2 files |
55 added 1 changesets with 2 changes to 2 files |
61 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
62 applying ../msg.patch |
57 applying ../msg.patch |
63 patching file a |
|
64 user: email patcher |
58 user: email patcher |
65 summary: email patch |
59 summary: email patch |
66 % plain diff in email, no subject, message body |
60 % plain diff in email, no subject, message body |
67 requesting all changes |
61 requesting all changes |
68 adding changesets |
62 adding changesets |
69 adding manifests |
63 adding manifests |
70 adding file changes |
64 adding file changes |
71 added 1 changesets with 2 changes to 2 files |
65 added 1 changesets with 2 changes to 2 files |
72 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
66 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
73 applying patch from stdin |
67 applying patch from stdin |
74 patching file a |
|
75 % plain diff in email, subject, no message body |
68 % plain diff in email, subject, no message body |
76 requesting all changes |
69 requesting all changes |
77 adding changesets |
70 adding changesets |
78 adding manifests |
71 adding manifests |
79 adding file changes |
72 adding file changes |
80 added 1 changesets with 2 changes to 2 files |
73 added 1 changesets with 2 changes to 2 files |
81 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
74 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82 applying patch from stdin |
75 applying patch from stdin |
83 patching file a |
|
84 % plain diff in email, no subject, no message body, should fail |
76 % plain diff in email, no subject, no message body, should fail |
85 requesting all changes |
77 requesting all changes |
86 adding changesets |
78 adding changesets |
87 adding manifests |
79 adding manifests |
88 adding file changes |
80 adding file changes |
89 added 1 changesets with 2 changes to 2 files |
81 added 1 changesets with 2 changes to 2 files |
90 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
91 applying patch from stdin |
83 applying patch from stdin |
92 patching file a |
|
93 transaction abort! |
84 transaction abort! |
94 rollback completed |
85 rollback completed |
95 % hg export in email, should use patch header |
86 % hg export in email, should use patch header |
96 requesting all changes |
87 requesting all changes |
97 adding changesets |
88 adding changesets |
98 adding manifests |
89 adding manifests |
99 adding file changes |
90 adding file changes |
100 added 1 changesets with 2 changes to 2 files |
91 added 1 changesets with 2 changes to 2 files |
101 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
102 applying patch from stdin |
93 applying patch from stdin |
103 patching file a |
|
104 summary: second change |
94 summary: second change |
105 % hg import in a subdirectory |
95 % hg import in a subdirectory |
106 requesting all changes |
96 requesting all changes |
107 adding changesets |
97 adding changesets |
108 adding manifests |
98 adding manifests |
109 adding file changes |
99 adding file changes |
110 added 1 changesets with 2 changes to 2 files |
100 added 1 changesets with 2 changes to 2 files |
111 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
101 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
112 applying ../../../tip.patch |
102 applying ../../../tip.patch |
113 patching file a |
|
114 % message should be 'subdir change' |
103 % message should be 'subdir change' |
115 summary: subdir change |
104 summary: subdir change |
116 % committer should be 'someoneelse' |
105 % committer should be 'someoneelse' |
117 user: someoneelse |
106 user: someoneelse |
118 % should be empty |
107 % should be empty |