t9151: Add two new svn:mergeinfo test cases · freshlybakedca.ke/git@9560808

+15

t/t9151-svn-mergeinfo.sh

··· 33 33 [ -z "$bad_non_merges" ] 34 34 ' 35 35 36 + test_expect_failure 'commit made to merged branch is reachable from the merge' ' 37 + before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") 38 + merge_commit=$(git rev-list --all --grep="Merge trunk to b2") 39 + not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) 40 + [ -z "$not_reachable" ] 41 + ' 42 + 43 + test_expect_success 'merging two branches in one commit is detected correctly' ' 44 + f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") 45 + f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") 46 + merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") 47 + not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) 48 + [ -z "$not_reachable" ] 49 + ' 50 + 36 51 test_expect_failure 'everything got merged in the end' ' 37 52 unmerged=$(git rev-list --all --not master) 38 53 [ -z "$unmerged" ]

+83

t/t9151/make-svnmerge-dump

··· 156 156 i=$(commit $i "non-merge right to trunk 2") 157 157 cd .. 158 158 159 + say "Branching b1 from trunk" 160 + svn update 161 + svn cp trunk branches/b1 162 + i=$(commit $i "make b1 branch from trunk") 163 + 164 + say "Branching b2 from trunk" 165 + svn update 166 + svn cp trunk branches/b2 167 + i=$(commit $i "make b2 branch from trunk") 168 + 169 + say "Make a commit to b2" 170 + svn update 171 + cd branches/b2 172 + echo "b2" > b2file 173 + svn add b2file 174 + i=$(commit $i "b2 update 1") 175 + cd ../.. 176 + 177 + say "Make a commit to b1" 178 + svn update 179 + cd branches/b1 180 + echo "b1" > b1file 181 + svn add b1file 182 + i=$(commit $i "b1 update 1") 183 + cd ../.. 184 + 185 + say "Merge b1 to trunk" 186 + svn update 187 + cd trunk 188 + svn merge ../branches/b1/ --accept postpone 189 + i=$(commit $i "Merge b1 to trunk") 190 + cd .. 191 + 192 + say "Make a commit to trunk before merging trunk to b2" 193 + svn update 194 + cd trunk 195 + echo "trunk" > trunkfile 196 + svn add trunkfile 197 + i=$(commit $i "trunk commit before merging trunk to b2") 198 + cd .. 199 + 200 + say "Merge trunk to b2" 201 + svn update 202 + cd branches/b2 203 + svn merge ../../trunk/ --accept postpone 204 + i=$(commit $i "Merge trunk to b2") 205 + cd ../.. 206 + 207 + say "Merge b2 to trunk" 208 + svn update 209 + cd trunk 210 + svn merge ../branches/b2/ --accept postpone 211 + svn resolved b1file 212 + svn resolved trunkfile 213 + i=$(commit $i "Merge b2 to trunk") 214 + cd .. 215 + 216 + say "Creating f1 from trunk with a new file" 217 + svn update 218 + svn cp trunk branches/f1 219 + cd branches/f1 220 + echo "f1" > f1file 221 + svn add f1file 222 + cd ../.. 223 + i=$(commit $i "make f1 branch from trunk with a new file") 224 + 225 + say "Creating f2 from trunk with a new file" 226 + svn update 227 + svn cp trunk branches/f2 228 + cd branches/f2 229 + echo "f2" > f2file 230 + svn add f2file 231 + cd ../.. 232 + i=$(commit $i "make f2 branch from trunk with a new file") 233 + 234 + say "Merge f1 and f2 to trunk in one go" 235 + svn update 236 + cd trunk 237 + svn merge ../branches/f1/ --accept postpone 238 + svn merge ../branches/f2/ --accept postpone 239 + i=$(commit $i "Merge f1 and f2 to trunk") 240 + cd .. 241 + 159 242 say "Adding subdirectory to LEFT" 160 243 svn update 161 244 cd branches/left

+483 -53

t/t9151/svn-mergeinfo.dump

··· 1633 1633 1634 1634 1635 1635 Revision-number: 25 1636 + Prop-content-length: 129 1637 + Content-length: 129 1638 + 1639 + K 7 1640 + svn:log 1641 + V 31 1642 + (r25) make b1 branch from trunk 1643 + K 10 1644 + svn:author 1645 + V 3 1646 + adm 1647 + K 8 1648 + svn:date 1649 + V 27 1650 + 2010-02-22T06:18:56.084589Z 1651 + PROPS-END 1652 + 1653 + Node-path: branches/b1 1654 + Node-kind: dir 1655 + Node-action: add 1656 + Node-copyfrom-rev: 24 1657 + Node-copyfrom-path: trunk 1658 + 1659 + 1660 + Revision-number: 26 1661 + Prop-content-length: 129 1662 + Content-length: 129 1663 + 1664 + K 7 1665 + svn:log 1666 + V 31 1667 + (r26) make b2 branch from trunk 1668 + K 10 1669 + svn:author 1670 + V 3 1671 + adm 1672 + K 8 1673 + svn:date 1674 + V 27 1675 + 2010-02-22T06:18:59.076940Z 1676 + PROPS-END 1677 + 1678 + Node-path: branches/b2 1679 + Node-kind: dir 1680 + Node-action: add 1681 + Node-copyfrom-rev: 25 1682 + Node-copyfrom-path: trunk 1683 + 1684 + 1685 + Revision-number: 27 1686 + Prop-content-length: 115 1687 + Content-length: 115 1688 + 1689 + K 7 1690 + svn:log 1691 + V 17 1692 + (r27) b2 update 1 1693 + K 10 1694 + svn:author 1695 + V 3 1696 + adm 1697 + K 8 1698 + svn:date 1699 + V 27 1700 + 2010-02-22T06:19:01.095762Z 1701 + PROPS-END 1702 + 1703 + Node-path: branches/b2/b2file 1704 + Node-kind: file 1705 + Node-action: add 1706 + Prop-content-length: 10 1707 + Text-content-length: 3 1708 + Text-content-md5: 5edbdd57cba621eb3c6e601bf563b4dc 1709 + Text-content-sha1: 9d4b38049776bd0a2074d67cad23f8eaed35a3b3 1710 + Content-length: 13 1711 + 1712 + PROPS-END 1713 + b2 1714 + 1715 + 1716 + Revision-number: 28 1717 + Prop-content-length: 115 1718 + Content-length: 115 1719 + 1720 + K 7 1721 + svn:log 1722 + V 17 1723 + (r28) b1 update 1 1724 + K 10 1725 + svn:author 1726 + V 3 1727 + adm 1728 + K 8 1729 + svn:date 1730 + V 27 1731 + 2010-02-22T06:19:03.097465Z 1732 + PROPS-END 1733 + 1734 + Node-path: branches/b1/b1file 1735 + Node-kind: file 1736 + Node-action: add 1737 + Prop-content-length: 10 1738 + Text-content-length: 3 1739 + Text-content-md5: 08778dfd9ac4f603231896aba7aad523 1740 + Text-content-sha1: b551771aa4ad5b14123fc3bd98d89db2bc0edd4f 1741 + Content-length: 13 1742 + 1743 + PROPS-END 1744 + b1 1745 + 1746 + 1747 + Revision-number: 29 1748 + Prop-content-length: 121 1749 + Content-length: 121 1750 + 1751 + K 7 1752 + svn:log 1753 + V 23 1754 + (r29) Merge b1 to trunk 1755 + K 10 1756 + svn:author 1757 + V 3 1758 + adm 1759 + K 8 1760 + svn:date 1761 + V 27 1762 + 2010-02-22T06:19:06.073175Z 1763 + PROPS-END 1764 + 1765 + Node-path: trunk 1766 + Node-kind: dir 1767 + Node-action: change 1768 + Prop-content-length: 118 1769 + Content-length: 118 1770 + 1771 + K 13 1772 + svn:mergeinfo 1773 + V 83 1774 + /branches/b1:25-28 1775 + /branches/left:2-22 1776 + /branches/left-sub:4-19 1777 + /branches/right:2-22 1778 + PROPS-END 1779 + 1780 + 1781 + Node-path: trunk/b1file 1782 + Node-kind: file 1783 + Node-action: add 1784 + Node-copyfrom-rev: 28 1785 + Node-copyfrom-path: branches/b1/b1file 1786 + Text-copy-source-md5: 08778dfd9ac4f603231896aba7aad523 1787 + Text-copy-source-sha1: b551771aa4ad5b14123fc3bd98d89db2bc0edd4f 1788 + 1789 + 1790 + Revision-number: 30 1791 + Prop-content-length: 143 1792 + Content-length: 143 1793 + 1794 + K 7 1795 + svn:log 1796 + V 45 1797 + (r30) trunk commit before merging trunk to b2 1798 + K 10 1799 + svn:author 1800 + V 3 1801 + adm 1802 + K 8 1803 + svn:date 1804 + V 27 1805 + 2010-02-22T06:19:08.096353Z 1806 + PROPS-END 1807 + 1808 + Node-path: trunk/trunkfile 1809 + Node-kind: file 1810 + Node-action: add 1811 + Prop-content-length: 10 1812 + Text-content-length: 6 1813 + Text-content-md5: edf45fe5c98c5367733b39bbb2bb20d9 1814 + Text-content-sha1: 7361d1685e5c86dfc523620cfaf598f196f86239 1815 + Content-length: 16 1816 + 1817 + PROPS-END 1818 + trunk 1819 + 1820 + 1821 + Revision-number: 31 1822 + Prop-content-length: 121 1823 + Content-length: 121 1824 + 1825 + K 7 1826 + svn:log 1827 + V 23 1828 + (r31) Merge trunk to b2 1829 + K 10 1830 + svn:author 1831 + V 3 1832 + adm 1833 + K 8 1834 + svn:date 1835 + V 27 1836 + 2010-02-22T06:19:11.081541Z 1837 + PROPS-END 1838 + 1839 + Node-path: branches/b2 1840 + Node-kind: dir 1841 + Node-action: change 1842 + Prop-content-length: 131 1843 + Content-length: 131 1844 + 1845 + K 13 1846 + svn:mergeinfo 1847 + V 96 1848 + /branches/b1:25-28 1849 + /branches/left:2-22 1850 + /branches/left-sub:4-19 1851 + /branches/right:2-22 1852 + /trunk:26-30 1853 + PROPS-END 1854 + 1855 + 1856 + Node-path: branches/b2/b1file 1857 + Node-kind: file 1858 + Node-action: add 1859 + Node-copyfrom-rev: 30 1860 + Node-copyfrom-path: trunk/b1file 1861 + Text-copy-source-md5: 08778dfd9ac4f603231896aba7aad523 1862 + Text-copy-source-sha1: b551771aa4ad5b14123fc3bd98d89db2bc0edd4f 1863 + 1864 + 1865 + Node-path: branches/b2/trunkfile 1866 + Node-kind: file 1867 + Node-action: add 1868 + Node-copyfrom-rev: 30 1869 + Node-copyfrom-path: trunk/trunkfile 1870 + Text-copy-source-md5: edf45fe5c98c5367733b39bbb2bb20d9 1871 + Text-copy-source-sha1: 7361d1685e5c86dfc523620cfaf598f196f86239 1872 + 1873 + 1874 + Revision-number: 32 1875 + Prop-content-length: 121 1876 + Content-length: 121 1877 + 1878 + K 7 1879 + svn:log 1880 + V 23 1881 + (r32) Merge b2 to trunk 1882 + K 10 1883 + svn:author 1884 + V 3 1885 + adm 1886 + K 8 1887 + svn:date 1888 + V 27 1889 + 2010-02-22T06:19:14.117939Z 1890 + PROPS-END 1891 + 1892 + Node-path: trunk 1893 + Node-kind: dir 1894 + Node-action: change 1895 + Prop-content-length: 138 1896 + Content-length: 138 1897 + 1898 + K 13 1899 + svn:mergeinfo 1900 + V 102 1901 + /branches/b1:25-28 1902 + /branches/b2:26-31 1903 + /branches/left:2-22 1904 + /branches/left-sub:4-19 1905 + /branches/right:2-22 1906 + PROPS-END 1907 + 1908 + 1909 + Node-path: trunk/b2file 1910 + Node-kind: file 1911 + Node-action: add 1912 + Node-copyfrom-rev: 31 1913 + Node-copyfrom-path: branches/b2/b2file 1914 + Text-copy-source-md5: 5edbdd57cba621eb3c6e601bf563b4dc 1915 + Text-copy-source-sha1: 9d4b38049776bd0a2074d67cad23f8eaed35a3b3 1916 + 1917 + 1918 + Revision-number: 33 1919 + Prop-content-length: 145 1920 + Content-length: 145 1921 + 1922 + K 7 1923 + svn:log 1924 + V 47 1925 + (r33) make f1 branch from trunk with a new file 1926 + K 10 1927 + svn:author 1928 + V 3 1929 + adm 1930 + K 8 1931 + svn:date 1932 + V 27 1933 + 2010-02-22T06:19:17.105832Z 1934 + PROPS-END 1935 + 1936 + Node-path: branches/f1 1937 + Node-kind: dir 1938 + Node-action: add 1939 + Node-copyfrom-rev: 32 1940 + Node-copyfrom-path: trunk 1941 + 1942 + 1943 + Node-path: branches/f1/f1file 1944 + Node-kind: file 1945 + Node-action: add 1946 + Prop-content-length: 10 1947 + Text-content-length: 3 1948 + Text-content-md5: 2b1abc6b6c5c0018851f9f8e6475563b 1949 + Text-content-sha1: aece6dfba588900e00d95601d22b4408d49580af 1950 + Content-length: 13 1951 + 1952 + PROPS-END 1953 + f1 1954 + 1955 + 1956 + Revision-number: 34 1957 + Prop-content-length: 145 1958 + Content-length: 145 1959 + 1960 + K 7 1961 + svn:log 1962 + V 47 1963 + (r34) make f2 branch from trunk with a new file 1964 + K 10 1965 + svn:author 1966 + V 3 1967 + adm 1968 + K 8 1969 + svn:date 1970 + V 27 1971 + 2010-02-22T06:19:20.110057Z 1972 + PROPS-END 1973 + 1974 + Node-path: branches/f2 1975 + Node-kind: dir 1976 + Node-action: add 1977 + Node-copyfrom-rev: 33 1978 + Node-copyfrom-path: trunk 1979 + 1980 + 1981 + Node-path: branches/f2/f2file 1982 + Node-kind: file 1983 + Node-action: add 1984 + Prop-content-length: 10 1985 + Text-content-length: 3 1986 + Text-content-md5: 575c5638d60271457e54ab7d07309502 1987 + Text-content-sha1: 1c49a440c352f3473efa9512255033b94dc7def0 1988 + Content-length: 13 1989 + 1990 + PROPS-END 1991 + f2 1992 + 1993 + 1994 + Revision-number: 35 1995 + Prop-content-length: 128 1996 + Content-length: 128 1997 + 1998 + K 7 1999 + svn:log 2000 + V 30 2001 + (r35) Merge f1 and f2 to trunk 2002 + K 10 2003 + svn:author 2004 + V 3 2005 + adm 2006 + K 8 2007 + svn:date 2008 + V 27 2009 + 2010-02-22T06:19:24.081490Z 2010 + PROPS-END 2011 + 2012 + Node-path: trunk 2013 + Node-kind: dir 2014 + Node-action: change 2015 + Prop-content-length: 173 2016 + Content-length: 173 2017 + 2018 + K 13 2019 + svn:mergeinfo 2020 + V 137 2021 + /branches/b1:25-28 2022 + /branches/b2:26-31 2023 + /branches/f1:33-34 2024 + /branches/f2:34 2025 + /branches/left:2-22 2026 + /branches/left-sub:4-19 2027 + /branches/right:2-22 2028 + PROPS-END 2029 + 2030 + 2031 + Node-path: trunk/f1file 2032 + Node-kind: file 2033 + Node-action: add 2034 + Node-copyfrom-rev: 34 2035 + Node-copyfrom-path: branches/f1/f1file 2036 + Text-copy-source-md5: 2b1abc6b6c5c0018851f9f8e6475563b 2037 + Text-copy-source-sha1: aece6dfba588900e00d95601d22b4408d49580af 2038 + 2039 + 2040 + Node-path: trunk/f2file 2041 + Node-kind: file 2042 + Node-action: add 2043 + Node-copyfrom-rev: 34 2044 + Node-copyfrom-path: branches/f2/f2file 2045 + Text-copy-source-md5: 575c5638d60271457e54ab7d07309502 2046 + Text-copy-source-sha1: 1c49a440c352f3473efa9512255033b94dc7def0 2047 + 2048 + 2049 + Revision-number: 36 1636 2050 Prop-content-length: 135 1637 2051 Content-length: 135 1638 2052 1639 2053 K 7 1640 2054 svn:log 1641 2055 V 37 1642 - (r25) add subdirectory to left branch 2056 + (r36) add subdirectory to left branch 1643 2057 K 10 1644 2058 svn:author 1645 2059 V 3 ··· 1647 2061 K 8 1648 2062 svn:date 1649 2063 V 27 1650 - 2010-01-19T04:14:46.052649Z 2064 + 2010-02-22T06:19:26.113516Z 1651 2065 PROPS-END 1652 2066 1653 2067 Node-path: branches/left/subdir ··· 1672 2086 Yeehaw 1673 2087 1674 2088 1675 - Revision-number: 26 2089 + Revision-number: 37 1676 2090 Prop-content-length: 123 1677 2091 Content-length: 123 1678 2092 1679 2093 K 7 1680 2094 svn:log 1681 2095 V 25 1682 - (r26) merge left to trunk 2096 + (r37) merge left to trunk 1683 2097 K 10 1684 2098 svn:author 1685 2099 V 3 ··· 1687 2101 K 8 1688 2102 svn:date 1689 2103 V 27 1690 - 2010-01-19T04:14:49.040783Z 2104 + 2010-02-22T06:19:29.073699Z 1691 2105 PROPS-END 1692 2106 1693 2107 Node-path: trunk 1694 2108 Node-kind: dir 1695 2109 Node-action: change 1696 - Prop-content-length: 99 1697 - Content-length: 99 2110 + Prop-content-length: 173 2111 + Content-length: 173 1698 2112 1699 2113 K 13 1700 2114 svn:mergeinfo 1701 - V 64 1702 - /branches/left:2-25 2115 + V 137 2116 + /branches/b1:25-28 2117 + /branches/b2:26-31 2118 + /branches/f1:33-34 2119 + /branches/f2:34 2120 + /branches/left:2-36 1703 2121 /branches/left-sub:4-19 1704 2122 /branches/right:2-22 1705 2123 PROPS-END ··· 1708 2126 Node-path: trunk/subdir 1709 2127 Node-kind: dir 1710 2128 Node-action: add 1711 - Node-copyfrom-rev: 25 2129 + Node-copyfrom-rev: 36 1712 2130 Node-copyfrom-path: branches/left/subdir 1713 2131 1714 2132 1715 - Revision-number: 27 2133 + Revision-number: 38 1716 2134 Prop-content-length: 123 1717 2135 Content-length: 123 1718 2136 1719 2137 K 7 1720 2138 svn:log 1721 2139 V 25 1722 - (r27) make partial branch 2140 + (r38) make partial branch 1723 2141 K 10 1724 2142 svn:author 1725 2143 V 3 ··· 1727 2145 K 8 1728 2146 svn:date 1729 2147 V 27 1730 - 2010-01-19T04:14:53.049037Z 2148 + 2010-02-22T06:19:32.072243Z 1731 2149 PROPS-END 1732 2150 1733 2151 Node-path: branches/partial 1734 2152 Node-kind: dir 1735 2153 Node-action: add 1736 - Node-copyfrom-rev: 26 2154 + Node-copyfrom-rev: 37 1737 2155 Node-copyfrom-path: trunk/subdir 1738 2156 1739 2157 1740 - Revision-number: 28 2158 + Revision-number: 39 1741 2159 Prop-content-length: 118 1742 2160 Content-length: 118 1743 2161 1744 2162 K 7 1745 2163 svn:log 1746 2164 V 20 1747 - (r28) partial update 2165 + (r39) partial update 1748 2166 K 10 1749 2167 svn:author 1750 2168 V 3 ··· 1752 2170 K 8 1753 2171 svn:date 1754 2172 V 27 1755 - 2010-01-19T04:14:54.000000Z 2173 + 2010-02-22T06:19:34.097961Z 1756 2174 PROPS-END 1757 2175 1758 2176 Node-path: branches/partial/palindromes ··· 1768 2186 racecar 1769 2187 1770 2188 1771 - Revision-number: 29 2189 + Revision-number: 40 1772 2190 Prop-content-length: 126 1773 2191 Content-length: 126 1774 2192 1775 2193 K 7 1776 2194 svn:log 1777 2195 V 28 1778 - (r29) merge partial to trunk 2196 + (r40) merge partial to trunk 1779 2197 K 10 1780 2198 svn:author 1781 2199 V 3 ··· 1783 2201 K 8 1784 2202 svn:date 1785 2203 V 27 1786 - 2010-01-19T04:14:56.041526Z 2204 + 2010-02-22T06:19:37.080211Z 1787 2205 PROPS-END 1788 2206 1789 2207 Node-path: trunk/subdir 1790 2208 Node-kind: dir 1791 2209 Node-action: change 1792 - Prop-content-length: 145 1793 - Content-length: 145 2210 + Prop-content-length: 246 2211 + Content-length: 246 1794 2212 1795 2213 K 13 1796 2214 svn:mergeinfo 1797 - V 109 1798 - /branches/left/subdir:2-25 2215 + V 210 2216 + /branches/b1/subdir:25-28 2217 + /branches/b2/subdir:26-31 2218 + /branches/f1/subdir:33-34 2219 + /branches/f2/subdir:34 2220 + /branches/left/subdir:2-36 1799 2221 /branches/left-sub/subdir:4-19 1800 - /branches/partial:27-28 2222 + /branches/partial:38-39 1801 2223 /branches/right/subdir:2-22 1802 2224 PROPS-END 1803 2225 ··· 1805 2227 Node-path: trunk/subdir/palindromes 1806 2228 Node-kind: file 1807 2229 Node-action: add 1808 - Node-copyfrom-rev: 28 2230 + Node-copyfrom-rev: 39 1809 2231 Node-copyfrom-path: branches/partial/palindromes 1810 2232 Text-copy-source-md5: 5d1c2024fb5efc4eef812856df1b080c 1811 2233 Text-copy-source-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69 1812 2234 1813 2235 1814 - Revision-number: 30 2236 + Revision-number: 41 1815 2237 Prop-content-length: 116 1816 2238 Content-length: 116 1817 2239 1818 2240 K 7 1819 2241 svn:log 1820 2242 V 18 1821 - (r30) tagging v1.0 2243 + (r41) tagging v1.0 1822 2244 K 10 1823 2245 svn:author 1824 2246 V 3 ··· 1826 2248 K 8 1827 2249 svn:date 1828 2250 V 27 1829 - 2010-01-19T04:15:00.039761Z 2251 + 2010-02-22T06:19:40.083460Z 1830 2252 PROPS-END 1831 2253 1832 2254 Node-path: tags/v1.0 1833 2255 Node-kind: dir 1834 2256 Node-action: add 1835 - Node-copyfrom-rev: 29 2257 + Node-copyfrom-rev: 40 1836 2258 Node-copyfrom-path: trunk 1837 2259 1838 2260 1839 - Revision-number: 31 2261 + Revision-number: 42 1840 2262 Prop-content-length: 131 1841 2263 Content-length: 131 1842 2264 1843 2265 K 7 1844 2266 svn:log 1845 2267 V 33 1846 - (r31) make bugfix branch from tag 2268 + (r42) make bugfix branch from tag 1847 2269 K 10 1848 2270 svn:author 1849 2271 V 3 ··· 1851 2273 K 8 1852 2274 svn:date 1853 2275 V 27 1854 - 2010-01-19T04:15:01.000000Z 2276 + 2010-02-22T06:19:43.118075Z 1855 2277 PROPS-END 1856 2278 1857 2279 Node-path: branches/bugfix 1858 2280 Node-kind: dir 1859 2281 Node-action: add 1860 - Node-copyfrom-rev: 30 2282 + Node-copyfrom-rev: 41 1861 2283 Node-copyfrom-path: tags/v1.0 1862 2284 1863 2285 1864 - Revision-number: 32 2286 + Revision-number: 43 1865 2287 Prop-content-length: 120 1866 2288 Content-length: 120 1867 2289 1868 2290 K 7 1869 2291 svn:log 1870 2292 V 22 1871 - (r32) commit to bugfix 2293 + (r43) commit to bugfix 1872 2294 K 10 1873 2295 svn:author 1874 2296 V 3 ··· 1876 2298 K 8 1877 2299 svn:date 1878 2300 V 27 1879 - 2010-01-19T04:15:02.000000Z 2301 + 2010-02-22T06:19:45.079536Z 1880 2302 PROPS-END 1881 2303 1882 2304 Node-path: branches/bugfix/subdir/palindromes ··· 1891 2313 kayak 1892 2314 1893 2315 1894 - Revision-number: 33 2316 + Revision-number: 44 1895 2317 Prop-content-length: 125 1896 2318 Content-length: 125 1897 2319 1898 2320 K 7 1899 2321 svn:log 1900 2322 V 27 1901 - (r33) Merge BUGFIX to TRUNK 2323 + (r44) Merge BUGFIX to TRUNK 1902 2324 K 10 1903 2325 svn:author 1904 2326 V 3 ··· 1906 2328 K 8 1907 2329 svn:date 1908 2330 V 27 1909 - 2010-01-19T04:15:06.043723Z 2331 + 2010-02-22T06:19:48.078914Z 1910 2332 PROPS-END 1911 2333 1912 2334 Node-path: trunk 1913 2335 Node-kind: dir 1914 2336 Node-action: change 1915 - Prop-content-length: 137 1916 - Content-length: 137 2337 + Prop-content-length: 210 2338 + Content-length: 210 1917 2339 1918 2340 K 13 1919 2341 svn:mergeinfo 1920 - V 101 1921 - /branches/bugfix:31-32 1922 - /branches/left:2-25 2342 + V 174 2343 + /branches/b1:25-28 2344 + /branches/b2:26-31 2345 + /branches/bugfix:42-43 2346 + /branches/f1:33-34 2347 + /branches/f2:34 2348 + /branches/left:2-36 1923 2349 /branches/left-sub:4-19 1924 2350 /branches/right:2-22 1925 - /tags/v1.0:30 2351 + /tags/v1.0:41 1926 2352 PROPS-END 1927 2353 1928 2354 1929 2355 Node-path: trunk/subdir 1930 2356 Node-kind: dir 1931 2357 Node-action: change 1932 - Prop-content-length: 196 1933 - Content-length: 196 2358 + Prop-content-length: 297 2359 + Content-length: 297 1934 2360 1935 2361 K 13 1936 2362 svn:mergeinfo 1937 - V 160 1938 - /branches/bugfix/subdir:31-32 1939 - /branches/left/subdir:2-25 2363 + V 261 2364 + /branches/b1/subdir:25-28 2365 + /branches/b2/subdir:26-31 2366 + /branches/bugfix/subdir:42-43 2367 + /branches/f1/subdir:33-34 2368 + /branches/f2/subdir:34 2369 + /branches/left/subdir:2-36 1940 2370 /branches/left-sub/subdir:4-19 1941 - /branches/partial:27-28 2371 + /branches/partial:38-39 1942 2372 /branches/right/subdir:2-22 1943 - /tags/v1.0/subdir:30 2373 + /tags/v1.0/subdir:41 1944 2374 PROPS-END 1945 2375 1946 2376