freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Tuomas Suutari and committed by
Eric Wong ae5b370c f7311dc2

+74 -38
unified split
+3 -3
t/t9151/make-svnmerge-dump
··· 174 174 175 175 say "Make PARTIAL branch" 176 176 svn update 177 - i=$(commit $i "make partial branch") 178 177 svn cp trunk/subdir branches/partial 178 + i=$(commit $i "make partial branch") 179 179 180 180 say "Make a commit to PARTIAL" 181 181 svn update ··· 194 194 195 195 say "Tagging trunk" 196 196 svn update 197 - i=$(commit $i "tagging v1.0") 198 197 svn cp trunk tags/v1.0 198 + i=$(commit $i "tagging v1.0") 199 199 200 200 say "Branching BUGFIX from v1.0" 201 201 svn update 202 - i=$(commit $i "make bugfix branch from tag") 203 202 svn cp tags/v1.0 branches/bugfix 203 + i=$(commit $i "make bugfix branch from tag") 204 204 205 205 say "Make a commit to BUGFIX" 206 206 svn update
+71 -35
t/t9151/svn-mergeinfo.dump
··· 1713 1713 1714 1714 1715 1715 Revision-number: 27 1716 - Prop-content-length: 118 1717 - Content-length: 118 1716 + Prop-content-length: 123 1717 + Content-length: 123 1718 1718 1719 1719 K 7 1720 1720 svn:log 1721 - V 20 1722 - (r28) partial update 1721 + V 25 1722 + (r27) make partial branch 1723 1723 K 10 1724 1724 svn:author 1725 1725 V 3 ··· 1737 1737 Node-copyfrom-path: trunk/subdir 1738 1738 1739 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 + 1740 1758 Node-path: branches/partial/palindromes 1741 1759 Node-kind: file 1742 1760 Node-action: add ··· 1750 1768 racecar 1751 1769 1752 1770 1753 - Revision-number: 28 1771 + Revision-number: 29 1754 1772 Prop-content-length: 126 1755 1773 Content-length: 126 1756 1774 ··· 1771 1789 Node-path: trunk/subdir 1772 1790 Node-kind: dir 1773 1791 Node-action: change 1774 - Prop-content-length: 142 1775 - Content-length: 142 1792 + Prop-content-length: 145 1793 + Content-length: 145 1776 1794 1777 1795 K 13 1778 1796 svn:mergeinfo 1779 - V 106 1797 + V 109 1780 1798 /branches/left/subdir:2-25 1781 1799 /branches/left-sub/subdir:4-19 1782 - /branches/partial:27 1800 + /branches/partial:27-28 1783 1801 /branches/right/subdir:2-22 1784 1802 PROPS-END 1785 1803 ··· 1787 1805 Node-path: trunk/subdir/palindromes 1788 1806 Node-kind: file 1789 1807 Node-action: add 1790 - Node-copyfrom-rev: 27 1808 + Node-copyfrom-rev: 28 1791 1809 Node-copyfrom-path: branches/partial/palindromes 1792 1810 Text-copy-source-md5: 5d1c2024fb5efc4eef812856df1b080c 1793 1811 Text-copy-source-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69 1794 1812 1795 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 1799 1817 1800 1818 K 7 1801 1819 svn:log 1802 - V 33 1803 - (r31) make bugfix branch from tag 1820 + V 18 1821 + (r30) tagging v1.0 1804 1822 K 10 1805 1823 svn:author 1806 1824 V 3 ··· 1814 1832 Node-path: tags/v1.0 1815 1833 Node-kind: dir 1816 1834 Node-action: add 1817 - Node-copyfrom-rev: 28 1835 + Node-copyfrom-rev: 29 1818 1836 Node-copyfrom-path: trunk 1819 1837 1820 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 1824 1842 1825 1843 K 7 1826 1844 svn:log 1827 - V 22 1828 - (r32) commit to bugfix 1845 + V 33 1846 + (r31) make bugfix branch from tag 1829 1847 K 10 1830 1848 svn:author 1831 1849 V 3 ··· 1833 1851 K 8 1834 1852 svn:date 1835 1853 V 27 1836 - 2010-01-19T04:15:03.043218Z 1854 + 2010-01-19T04:15:01.000000Z 1837 1855 PROPS-END 1838 1856 1839 1857 Node-path: branches/bugfix 1840 1858 Node-kind: dir 1841 1859 Node-action: add 1842 - Node-copyfrom-rev: 29 1860 + Node-copyfrom-rev: 30 1843 1861 Node-copyfrom-path: tags/v1.0 1844 1862 1845 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 + 1846 1882 Node-path: branches/bugfix/subdir/palindromes 1847 1883 Node-kind: file 1848 1884 Node-action: change ··· 1855 1891 kayak 1856 1892 1857 1893 1858 - Revision-number: 31 1894 + Revision-number: 33 1859 1895 Prop-content-length: 125 1860 1896 Content-length: 125 1861 1897 ··· 1876 1912 Node-path: trunk 1877 1913 Node-kind: dir 1878 1914 Node-action: change 1879 - Prop-content-length: 133 1880 - Content-length: 133 1915 + Prop-content-length: 137 1916 + Content-length: 137 1881 1917 1882 1918 K 13 1883 1919 svn:mergeinfo 1884 - V 98 1885 - /branches/bugfix:30 1920 + V 101 1921 + /branches/bugfix:31-32 1886 1922 /branches/left:2-25 1887 1923 /branches/left-sub:4-19 1888 1924 /branches/right:2-22 1889 - /tags/v1.0:29 1925 + /tags/v1.0:30 1890 1926 PROPS-END 1891 1927 1892 1928 1893 1929 Node-path: trunk/subdir 1894 1930 Node-kind: dir 1895 1931 Node-action: change 1896 - Prop-content-length: 190 1897 - Content-length: 190 1932 + Prop-content-length: 196 1933 + Content-length: 196 1898 1934 1899 1935 K 13 1900 1936 svn:mergeinfo 1901 - V 154 1902 - /branches/bugfix/subdir:30 1937 + V 160 1938 + /branches/bugfix/subdir:31-32 1903 1939 /branches/left/subdir:2-25 1904 1940 /branches/left-sub/subdir:4-19 1905 - /branches/partial:27 1941 + /branches/partial:27-28 1906 1942 /branches/right/subdir:2-22 1907 - /tags/v1.0/subdir:29 1943 + /tags/v1.0/subdir:30 1908 1944 PROPS-END 1909 1945 1910 1946