Skip to content

Commit ae5b370

Browse files
suutariEric Wong
suutari
authored and
Eric Wong
committed
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>
1 parent f7311dc commit ae5b370

File tree

2 files changed

+74
-38
lines changed

2 files changed

+74
-38
lines changed

‎t/t9151/make-svnmerge-dump‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ cd ..
174174

175175
say "Make PARTIAL branch"
176176
svn update
177-
i=$(commit $i "make partial branch")
178177
svn cp trunk/subdir branches/partial
178+
i=$(commit $i "make partial branch")
179179

180180
say "Make a commit to PARTIAL"
181181
svn update
@@ -194,13 +194,13 @@ cd ../../
194194

195195
say "Tagging trunk"
196196
svn update
197-
i=$(commit $i "tagging v1.0")
198197
svn cp trunk tags/v1.0
198+
i=$(commit $i "tagging v1.0")
199199

200200
say "Branching BUGFIX from v1.0"
201201
svn update
202-
i=$(commit $i "make bugfix branch from tag")
203202
svn cp tags/v1.0 branches/bugfix
203+
i=$(commit $i "make bugfix branch from tag")
204204

205205
say "Make a commit to BUGFIX"
206206
svn update

‎t/t9151/svn-mergeinfo.dump‎

Lines changed: 71 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,13 +1713,13 @@ Node-copyfrom-path: branches/left/subdir
17131713

17141714

17151715
Revision-number: 27
1716-
Prop-content-length: 118
1717-
Content-length: 118
1716+
Prop-content-length: 123
1717+
Content-length: 123
17181718

17191719
K 7
17201720
svn:log
1721-
V 20
1722-
(r28) partial update
1721+
V 25
1722+
(r27) make partial branch
17231723
K 10
17241724
svn:author
17251725
V 3
@@ -1737,6 +1737,24 @@ Node-copyfrom-rev: 26
17371737
Node-copyfrom-path: trunk/subdir
17381738

17391739

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+
17401758
Node-path: branches/partial/palindromes
17411759
Node-kind: file
17421760
Node-action: add
@@ -1750,7 +1768,7 @@ PROPS-END
17501768
racecar
17511769

17521770

1753-
Revision-number: 28
1771+
Revision-number: 29
17541772
Prop-content-length: 126
17551773
Content-length: 126
17561774

@@ -1771,36 +1789,36 @@ PROPS-END
17711789
Node-path: trunk/subdir
17721790
Node-kind: dir
17731791
Node-action: change
1774-
Prop-content-length: 142
1775-
Content-length: 142
1792+
Prop-content-length: 145
1793+
Content-length: 145
17761794

17771795
K 13
17781796
svn:mergeinfo
1779-
V 106
1797+
V 109
17801798
/branches/left/subdir:2-25
17811799
/branches/left-sub/subdir:4-19
1782-
/branches/partial:27
1800+
/branches/partial:27-28
17831801
/branches/right/subdir:2-22
17841802
PROPS-END
17851803

17861804

17871805
Node-path: trunk/subdir/palindromes
17881806
Node-kind: file
17891807
Node-action: add
1790-
Node-copyfrom-rev: 27
1808+
Node-copyfrom-rev: 28
17911809
Node-copyfrom-path: branches/partial/palindromes
17921810
Text-copy-source-md5: 5d1c2024fb5efc4eef812856df1b080c
17931811
Text-copy-source-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69
17941812

17951813

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
17991817

18001818
K 7
18011819
svn:log
1802-
V 33
1803-
(r31) make bugfix branch from tag
1820+
V 18
1821+
(r30) tagging v1.0
18041822
K 10
18051823
svn:author
18061824
V 3
@@ -1814,35 +1832,53 @@ PROPS-END
18141832
Node-path: tags/v1.0
18151833
Node-kind: dir
18161834
Node-action: add
1817-
Node-copyfrom-rev: 28
1835+
Node-copyfrom-rev: 29
18181836
Node-copyfrom-path: trunk
18191837

18201838

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
18241842

18251843
K 7
18261844
svn:log
1827-
V 22
1828-
(r32) commit to bugfix
1845+
V 33
1846+
(r31) make bugfix branch from tag
18291847
K 10
18301848
svn:author
18311849
V 3
18321850
adm
18331851
K 8
18341852
svn:date
18351853
V 27
1836-
2010-01-19T04:15:03.043218Z
1854+
2010-01-19T04:15:01.000000Z
18371855
PROPS-END
18381856

18391857
Node-path: branches/bugfix
18401858
Node-kind: dir
18411859
Node-action: add
1842-
Node-copyfrom-rev: 29
1860+
Node-copyfrom-rev: 30
18431861
Node-copyfrom-path: tags/v1.0
18441862

18451863

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+
18461882
Node-path: branches/bugfix/subdir/palindromes
18471883
Node-kind: file
18481884
Node-action: change
@@ -1855,7 +1891,7 @@ racecar
18551891
kayak
18561892

18571893

1858-
Revision-number: 31
1894+
Revision-number: 33
18591895
Prop-content-length: 125
18601896
Content-length: 125
18611897

@@ -1876,35 +1912,35 @@ PROPS-END
18761912
Node-path: trunk
18771913
Node-kind: dir
18781914
Node-action: change
1879-
Prop-content-length: 133
1880-
Content-length: 133
1915+
Prop-content-length: 137
1916+
Content-length: 137
18811917

18821918
K 13
18831919
svn:mergeinfo
1884-
V 98
1885-
/branches/bugfix:30
1920+
V 101
1921+
/branches/bugfix:31-32
18861922
/branches/left:2-25
18871923
/branches/left-sub:4-19
18881924
/branches/right:2-22
1889-
/tags/v1.0:29
1925+
/tags/v1.0:30
18901926
PROPS-END
18911927

18921928

18931929
Node-path: trunk/subdir
18941930
Node-kind: dir
18951931
Node-action: change
1896-
Prop-content-length: 190
1897-
Content-length: 190
1932+
Prop-content-length: 196
1933+
Content-length: 196
18981934

18991935
K 13
19001936
svn:mergeinfo
1901-
V 154
1902-
/branches/bugfix/subdir:30
1937+
V 160
1938+
/branches/bugfix/subdir:31-32
19031939
/branches/left/subdir:2-25
19041940
/branches/left-sub/subdir:4-19
1905-
/branches/partial:27
1941+
/branches/partial:27-28
19061942
/branches/right/subdir:2-22
1907-
/tags/v1.0/subdir:29
1943+
/tags/v1.0/subdir:30
19081944
PROPS-END
19091945

19101946

0 commit comments

Comments
 (0)