t9151: Fix a few commits in the SVN dump
A few "svn cp" commands and commit commands were executed in incorrect order. Therefore some of the desired commits were missing and some were committed with wrong revision number in the commit message. This made it hard to compare the produced git repository with the SVN repository. The dump file is updated too, but only the relevant parts and with hand-edited timestamps to make history linear. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Tuomas Suutari committed
Feb 22, 2010 at 09:57 UTC
ae5b370c9bbc161c68059cea7d9f7eb5b556e050
2 files changed
+74
-38
t/t9151/make-svnmerge-dump
+3
-3
@@ -174,8 +174,8 @@ cd ..
174
175
say "Make PARTIAL branch"
176
svn update
177
-i=$(commit $i "make partial branch")
177
svn cp trunk/subdir branches/partial
178
+i=$(commit $i "make partial branch")
179
180
say "Make a commit to PARTIAL"
181
svn update
@@ -194,13 +194,13 @@ cd ../../
194
195
say "Tagging trunk"
196
svn update
197
-i=$(commit $i "tagging v1.0")
197
svn cp trunk tags/v1.0
198
+i=$(commit $i "tagging v1.0")
199
200
say "Branching BUGFIX from v1.0"
201
svn update
202
-i=$(commit $i "make bugfix branch from tag")
202
svn cp tags/v1.0 branches/bugfix
203
+i=$(commit $i "make bugfix branch from tag")
204
205
say "Make a commit to BUGFIX"
206
svn update
t/t9151/svn-mergeinfo.dump
+71
-35
@@ -1713,13 +1713,13 @@ Node-copyfrom-path: branches/left/subdir
1713
1714
1715
Revision-number: 27
1716
-Prop-content-length: 118
1717
-Content-length: 118
1716
+Prop-content-length: 123
1717
+Content-length: 123
1718
1719
K 7
1720
svn:log
1721
-V 20
1722
-(r28) partial update
1721
+V 25
1722
+(r27) make partial branch
1723
K 10
1724
svn:author
1725
V 3
@@ -1737,6 +1737,24 @@ Node-copyfrom-rev: 26
1737
Node-copyfrom-path: trunk/subdir
1738
1739
1740
+Revision-number: 28
1741
+Prop-content-length: 118
1742
+Content-length: 118
1743
+
1744
+K 7
1745
+svn:log
1746
+V 20
1747
+(r28) partial update
1748
+K 10
1749
+svn:author
1750
+V 3
1751
+adm
1752
+K 8
1753
+svn:date
1754
+V 27
1755
+2010-01-19T04:14:54.000000Z
1756
+PROPS-END
1757
+
1758
Node-path: branches/partial/palindromes
1759
Node-kind: file
1760
Node-action: add
@@ -1750,7 +1768,7 @@ PROPS-END
1768
racecar
1769
1770
1753
-Revision-number: 28
1771
+Revision-number: 29
1772
Prop-content-length: 126
1773
Content-length: 126
1774
@@ -1771,15 +1789,15 @@ PROPS-END
1789
Node-path: trunk/subdir
1790
Node-kind: dir
1791
Node-action: change
1774
-Prop-content-length: 142
1775
-Content-length: 142
1792
+Prop-content-length: 145
1793
+Content-length: 145
1794
1795
K 13
1796
svn:mergeinfo
1779
-V 106
1797
+V 109
1798
/branches/left/subdir:2-25
1799
/branches/left-sub/subdir:4-19
1782
-/branches/partial:27
1800
+/branches/partial:27-28
1801
/branches/right/subdir:2-22
1802
PROPS-END
1803
@@ -1787,20 +1805,20 @@ PROPS-END
1805
Node-path: trunk/subdir/palindromes
1806
Node-kind: file
1807
Node-action: add
1790
-Node-copyfrom-rev: 27
1808
+Node-copyfrom-rev: 28
1809
Node-copyfrom-path: branches/partial/palindromes
1810
Text-copy-source-md5: 5d1c2024fb5efc4eef812856df1b080c
1811
Text-copy-source-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69
1812
1813
1796
-Revision-number: 29
1797
-Prop-content-length: 131
1798
-Content-length: 131
1814
+Revision-number: 30
1815
+Prop-content-length: 116
1816
+Content-length: 116
1817
1818
K 7
1819
svn:log
1802
-V 33
1803
-(r31) make bugfix branch from tag
1820
+V 18
1821
+(r30) tagging v1.0
1822
K 10
1823
svn:author
1824
V 3
@@ -1814,18 +1832,18 @@ PROPS-END
1832
Node-path: tags/v1.0
1833
Node-kind: dir
1834
Node-action: add
1817
-Node-copyfrom-rev: 28
1835
+Node-copyfrom-rev: 29
1836
Node-copyfrom-path: trunk
1837
1838
1821
-Revision-number: 30
1822
-Prop-content-length: 120
1823
-Content-length: 120
1839
+Revision-number: 31
1840
+Prop-content-length: 131
1841
+Content-length: 131
1842
1843
K 7
1844
svn:log
1827
-V 22
1828
-(r32) commit to bugfix
1845
+V 33
1846
+(r31) make bugfix branch from tag
1847
K 10
1848
svn:author
1849
V 3
@@ -1833,16 +1851,34 @@ adm
1851
K 8
1852
svn:date
1853
V 27
1836
-2010-01-19T04:15:03.043218Z
1854
+2010-01-19T04:15:01.000000Z
1855
PROPS-END
1856
1857
Node-path: branches/bugfix
1858
Node-kind: dir
1859
Node-action: add
1842
-Node-copyfrom-rev: 29
1860
+Node-copyfrom-rev: 30
1861
Node-copyfrom-path: tags/v1.0
1862
1863
1864
+Revision-number: 32
1865
+Prop-content-length: 120
1866
+Content-length: 120
1867
+
1868
+K 7
1869
+svn:log
1870
+V 22
1871
+(r32) commit to bugfix
1872
+K 10
1873
+svn:author
1874
+V 3
1875
+adm
1876
+K 8
1877
+svn:date
1878
+V 27
1879
+2010-01-19T04:15:02.000000Z
1880
+PROPS-END
1881
+
1882
Node-path: branches/bugfix/subdir/palindromes
1883
Node-kind: file
1884
Node-action: change
@@ -1855,7 +1891,7 @@ racecar
1891
kayak
1892
1893
1858
-Revision-number: 31
1894
+Revision-number: 33
1895
Prop-content-length: 125
1896
Content-length: 125
1897
@@ -1876,35 +1912,35 @@ PROPS-END
1912
Node-path: trunk
1913
Node-kind: dir
1914
Node-action: change
1879
-Prop-content-length: 133
1880
-Content-length: 133
1915
+Prop-content-length: 137
1916
+Content-length: 137
1917
1918
K 13
1919
svn:mergeinfo
1884
-V 98
1885
-/branches/bugfix:30
1920
+V 101
1921
+/branches/bugfix:31-32
1922
/branches/left:2-25
1923
/branches/left-sub:4-19
1924
/branches/right:2-22
1889
-/tags/v1.0:29
1925
+/tags/v1.0:30
1926
PROPS-END
1927
1928
1929
Node-path: trunk/subdir
1930
Node-kind: dir
1931
Node-action: change
1896
-Prop-content-length: 190
1897
-Content-length: 190
1932
+Prop-content-length: 196
1933
+Content-length: 196
1934
1935
K 13
1936
svn:mergeinfo
1901
-V 154
1902
-/branches/bugfix/subdir:30
1937
+V 160
1938
+/branches/bugfix/subdir:31-32
1939
/branches/left/subdir:2-25
1940
/branches/left-sub/subdir:4-19
1905
-/branches/partial:27
1941
+/branches/partial:27-28
1942
/branches/right/subdir:2-22
1907
-/tags/v1.0/subdir:29
1943
+/tags/v1.0/subdir:30
1944
PROPS-END
1945
1946