darcs-2.8.0: tests/data/convert/darcs1/resolution.dpatch
5 patches for repository /tmp/tmp6648/temp/empty-hashed:
Sat Oct 16 23:32:07 BST 2010 tester
* wibble
Sat Oct 16 23:32:07 BST 2010 tester
* A
Sat Oct 16 23:32:07 BST 2010 tester
* B
Sat Oct 16 23:32:07 BST 2010 tester
* AB
Sat Oct 16 23:32:07 BST 2010 tester
* C
New patches:
[wibble
tester**20101016223207
Ignore-this: 64b5a1e603ddf61e59421bdde45b3bc
] {
addfile ./wibble
hunk ./wibble 1
+wibble
}
[A
tester**20101016223207
Ignore-this: bc0d30ac5170e1a25ccb20e6cb06ac86
] hunk ./wibble 2
wibble
+A
[B
tester**20101016223207
Ignore-this: 3bbebcf8fa444bdcb31ab799c6754067
] merger 0.0 (
hunk ./wibble 2
+A
hunk ./wibble 2
+B
)
[AB
tester**20101016223207
Ignore-this: 8fa03d26b9dbbcdb50a323e5c58b16dd
] hunk ./wibble 2
wibble
+AB
[C
tester**20101016223207
Ignore-this: e7c0716361e411645066f8a3c2eff769
] merger 0.0 (
hunk ./wibble 2
+AB
merger 0.0 (
merger 0.0 (
hunk ./wibble 2
+A
hunk ./wibble 2
+B
)
merger 0.0 (
hunk ./wibble 2
+A
hunk ./wibble 2
+C
)
)
)
Context:
Patch bundle hash:
b23d175b10d6fdaee3bb25ac92b55723de2822cd