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