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
|
feature done
# Simple repo with only two files, with a whole bunch of cases dealing with
# empty pruning, particularly commits that start empty.
#
# As with case1, the original-oid directives are very fake, but if an error
# is hit that shows one of these, it makes it really easy to know where it
# came from.
blob
mark :1
original-oid 0000000000000000000000000000000000000001
data 10
nukeme v1
blob
mark :2
original-oid 0000000000000000000000000000000000000002
data 10
keepme v1
blob
mark :3
original-oid 0000000000000000000000000000000000000003
data 10
nukeme v2
blob
mark :4
original-oid 0000000000000000000000000000000000000004
data 10
keepme v2
commit refs/heads/master
mark :5
original-oid 0000000000000000000000000000000000000010
author Full Name <user@organization.tld> 1000000000 +0100
committer Full Name <user@organization.tld> 1000000000 +0100
data 2
A
commit refs/heads/master
mark :6
original-oid 0000000000000000000000000000000000000011
author Full Name <user@organization.tld> 1000010000 +0100
committer Full Name <user@organization.tld> 1000010000 +0100
data 2
B
from :5
reset refs/heads/master
commit refs/heads/master
mark :7
original-oid 0000000000000000000000000000000000000012
author Full Name <user@organization.tld> 1000020000 +0100
committer Full Name <user@organization.tld> 1000020000 +0100
data 2
C
M 100644 :1 nukeme
commit refs/heads/master
mark :8
original-oid 0000000000000000000000000000000000000013
author Full Name <user@organization.tld> 1000030000 +0100
committer Full Name <user@organization.tld> 1000030000 +0100
data 2
D
from :7
commit refs/heads/master
mark :9
original-oid 0000000000000000000000000000000000000014
author Full Name <user@organization.tld> 1000040000 +0100
committer Full Name <user@organization.tld> 1000040000 +0100
data 29
E: Merge commit 'D' into 'B'
from :6
merge :8
M 100644 :2 keepme
commit refs/heads/master
mark :10
original-oid 0000000000000000000000000000000000000015
author Full Name <user@organization.tld> 1000050000 +0100
committer Full Name <user@organization.tld> 1000050000 +0100
data 29
F: Merge commit 'D' into 'B'
from :6
merge :8
commit refs/heads/master
mark :11
original-oid 0000000000000000000000000000000000000016
author Full Name <user@organization.tld> 1000060000 +0100
committer Full Name <user@organization.tld> 1000060000 +0100
data 2
G
from :9
M 100644 :3 nukeme
commit refs/heads/master
mark :12
original-oid 0000000000000000000000000000000000000017
author Full Name <user@organization.tld> 1000070000 +0100
committer Full Name <user@organization.tld> 1000070000 +0100
data 2
H
from :11
commit refs/heads/master
mark :13
original-oid 0000000000000000000000000000000000000018
author Full Name <user@organization.tld> 1000080000 +0100
committer Full Name <user@organization.tld> 1000080000 +0100
data 2
I
from :10
M 100644 :4 keepme
commit refs/heads/master
mark :14
original-oid 0000000000000000000000000000000000000019
author Full Name <user@organization.tld> 1000090000 +0100
committer Full Name <user@organization.tld> 1000090000 +0100
data 29
J: Merge commit 'I' into 'H'
from :12
merge :13
done
|