1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
7 patches for repository /tmp/convert-darcs2/Darcs2/PatienceDiff/convert-darcs2/no-working-dir/threewayandmultideps/empty-darcs2:
patch fd370912c8a92d249e00e7c91856ed9530d6c914
Author: tester
Date: Sun Oct 17 00:27:21 CEST 2010
* wibble
patch ac7df6a4761de10b4c440a9adb39c4f0236cb519
Author: tester
Date: Sun Oct 17 00:27:21 CEST 2010
* A1
patch 121d6130551316a64fa7a061cfc44f5946213f85
Author: tester
Date: Sun Oct 17 00:27:21 CEST 2010
* A2
patch 513848985dfc5b5ea1533d56b597daa7317f35bc
Author: tester
Date: Sun Oct 17 00:27:21 CEST 2010
* B1
patch 84edd5450901a4d31f1b49a9a6da4563a6ed73fe
Author: tester
Date: Sun Oct 17 00:27:21 CEST 2010
* B2
patch bec254c63929d83d13929eec63f2e5e5a8aabbb4
Author: tester
Date: Sun Oct 17 00:27:21 CEST 2010
* C1
patch 0e08cbe9489dfc7f21e9528b4c6a7d06f4fec25a
Author: tester
Date: Sun Oct 17 00:27:21 CEST 2010
* C2
New patches:
[wibble
tester**20101016222721
Ignore-this: 64432ba123d81c8f0e688b44feb8f587
] addfile ./wibble
hunk ./wibble 1
+wibble
[A1
tester**20101016222721
Ignore-this: d749f48333e6ff2e994b1df71e76933b
] hunk ./wibble 2
wibble
+A1
[A2
tester**20101016222721
Ignore-this: 6f006a52975a708a8038d52e5e39ef0f
] hunk ./wibble 3
wibble
A1
+A2
[B1
tester**20101016222721
Ignore-this: f4d4b5b1c73bd6fa8abe6e5e680d66a7
] conflictor [
hunk ./wibble 2
+A1
hunk ./wibble 3
+A2
]
:
hunk ./wibble 2
+B1
[B2
tester**20101016222721
Ignore-this: 1d60b6c0ba913fff4d1e32ad26ae07bb
] conflictor {{
hunk ./wibble 2
+A1
:
hunk ./wibble 3
+A2
:
hunk ./wibble 2
+A1
:
hunk ./wibble 2
+B1
}} []
hunk ./wibble 2
+B1
:
hunk ./wibble 3
+B2
[C1
tester**20101016222721
Ignore-this: 25b6a6959d19980ad16983a542c6825
] conflictor {{
hunk ./wibble 2
+A1
:
hunk ./wibble 3
+A2
:
hunk ./wibble 2
+A1
:
hunk ./wibble 2
+B1
hunk ./wibble 2
+B1
:
hunk ./wibble 3
+B2
}} []
:
hunk ./wibble 2
+C1
[C2
tester**20101016222721
Ignore-this: c16d607216c36d5f7727c64d2ec103d4
] conflictor {{
hunk ./wibble 2
+A1
:
hunk ./wibble 3
+A2
:
hunk ./wibble 2
+A1
hunk ./wibble 2
+B1
:
hunk ./wibble 3
+B2
:
hunk ./wibble 2
+B1
:
hunk ./wibble 2
+C1
}} []
hunk ./wibble 2
+C1
:
hunk ./wibble 3
+C2
Context:
Patch bundle hash:
8eb9adf3347935c847172e49b6597d14239d217f
|
