|
1 adding a |
|
2 % import exported patch |
|
3 requesting all changes |
|
4 adding changesets |
|
5 adding manifests |
|
6 adding file changes |
|
7 added 1 changesets with 1 changes to 1 files |
|
8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 applying ../tip.patch |
|
10 patching file a |
|
11 % message should be same |
|
12 summary: second change |
|
13 % committer should be same |
|
14 user: someone |
|
15 % import of plain diff should fail without message |
|
16 requesting all changes |
|
17 adding changesets |
|
18 adding manifests |
|
19 adding file changes |
|
20 added 1 changesets with 1 changes to 1 files |
|
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
22 applying ../tip.patch |
|
23 patching file a |
|
24 transaction abort! |
|
25 rollback completed |
|
26 % import of plain diff should be ok with message |
|
27 requesting all changes |
|
28 adding changesets |
|
29 adding manifests |
|
30 adding file changes |
|
31 added 1 changesets with 1 changes to 1 files |
|
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
33 applying ../tip.patch |
|
34 patching file a |
|
35 % import from stdin |
|
36 requesting all changes |
|
37 adding changesets |
|
38 adding manifests |
|
39 adding file changes |
|
40 added 1 changesets with 1 changes to 1 files |
|
41 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
42 applying patch from stdin |
|
43 patching file a |
|
44 % override commit message |
|
45 requesting all changes |
|
46 adding changesets |
|
47 adding manifests |
|
48 adding file changes |
|
49 added 1 changesets with 1 changes to 1 files |
|
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
51 applying patch from stdin |
|
52 patching file a |
|
53 summary: override |
|
54 % plain diff in email, subject, message body |
|
55 requesting all changes |
|
56 adding changesets |
|
57 adding manifests |
|
58 adding file changes |
|
59 added 1 changesets with 1 changes to 1 files |
|
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61 applying ../msg.patch |
|
62 patching file a |
|
63 user: email patcher |
|
64 summary: email patch |
|
65 % plain diff in email, no subject, message body |
|
66 requesting all changes |
|
67 adding changesets |
|
68 adding manifests |
|
69 adding file changes |
|
70 added 1 changesets with 1 changes to 1 files |
|
71 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
72 applying patch from stdin |
|
73 patching file a |
|
74 % plain diff in email, subject, no message body |
|
75 requesting all changes |
|
76 adding changesets |
|
77 adding manifests |
|
78 adding file changes |
|
79 added 1 changesets with 1 changes to 1 files |
|
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
81 applying patch from stdin |
|
82 patching file a |
|
83 % plain diff in email, no subject, no message body, should fail |
|
84 requesting all changes |
|
85 adding changesets |
|
86 adding manifests |
|
87 adding file changes |
|
88 added 1 changesets with 1 changes to 1 files |
|
89 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
90 applying patch from stdin |
|
91 patching file a |
|
92 transaction abort! |
|
93 rollback completed |
|
94 % hg export in email, should use patch header |
|
95 requesting all changes |
|
96 adding changesets |
|
97 adding manifests |
|
98 adding file changes |
|
99 added 1 changesets with 1 changes to 1 files |
|
100 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 applying patch from stdin |
|
102 patching file a |
|
103 summary: second change |