darcs-2.8.0: tests/data/convert/darcs1/threewayanddep.dpatch
5 patches for repository /tmp/tmp5530/temp/empty-hashed:
Sat Oct 16 23:27:54 BST 2010 tester
* wibble
Sat Oct 16 23:27:54 BST 2010 tester
* A1
Sat Oct 16 23:27:54 BST 2010 tester
* A2
Sat Oct 16 23:27:54 BST 2010 tester
* B
Sat Oct 16 23:27:54 BST 2010 tester
* C
New patches:
[wibble
tester**20101016222754
Ignore-this: 355914edd0f88f0ea7c2ef60aec9c2a1
] {
addfile ./wibble
hunk ./wibble 1
+wibble
}
[A1
tester**20101016222754
Ignore-this: 54df34ebd488b772c37c3d43a38b0bfa
] hunk ./wibble 2
wibble
+A1
[A2
tester**20101016222754
Ignore-this: 4d1b08c7274743e7d0d2f210518d5a19
] hunk ./wibble 3
wibble
A1
+A2
[B
tester**20101016222754
Ignore-this: 9ba51da6bb1506afa2104326cd5df54b
] merger 0.0 (
hunk ./wibble 3
+A2
merger 0.0 (
hunk ./wibble 2
+A1
hunk ./wibble 2
+B
)
)
[C
tester**20101016222754
Ignore-this: 295e8a851b7a936b3d08b0ce7eaaf2ac
] merger 0.0 (
merger 0.0 (
hunk ./wibble 3
+A2
merger 0.0 (
hunk ./wibble 2
+A1
hunk ./wibble 2
+B
)
)
merger 0.0 (
hunk ./wibble 3
+A2
merger 0.0 (
hunk ./wibble 2
+A1
hunk ./wibble 2
+C
)
)
)
Context:
Patch bundle hash:
3c77da1c02a49215134a9607493af93d55608f56