1814 IV |
1814 IV |
1815 V |
1815 V |
1816 |
1816 |
1817 |
1817 |
1818 $ cd .. |
1818 $ cd .. |
|
1819 |
|
1820 Phase divergence with file removal cancelation |
|
1821 ============================================== |
|
1822 |
|
1823 $ hg init cancel-removal |
|
1824 $ cd cancel-removal |
|
1825 $ echo a > a |
|
1826 $ echo b > b |
|
1827 $ echo c > c |
|
1828 $ echo d > d |
|
1829 $ hg ci -Aqm initial |
|
1830 |
|
1831 Oops, we meant to delete just 'a', but we deleted 'b' and 'c' too |
|
1832 |
|
1833 $ hg rm a b c |
|
1834 $ hg ci -m 'delete a' |
|
1835 $ hg revert -r .^ b |
|
1836 $ hg amend |
|
1837 $ hg glog --hidden --patch |
|
1838 @ 2:0825dcee2670 delete a |
|
1839 | () draftdiff -r 75d2b02c4a5c -r 0825dcee2670 a |
|
1840 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1841 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1842 | @@ -1,1 +0,0 @@ |
|
1843 | -a |
|
1844 | diff -r 75d2b02c4a5c -r 0825dcee2670 c |
|
1845 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
|
1846 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1847 | @@ -1,1 +0,0 @@ |
|
1848 | -c |
|
1849 | |
|
1850 | x 1:dff6e52f5e41 delete a |
|
1851 |/ () draftdiff -r 75d2b02c4a5c -r dff6e52f5e41 a |
|
1852 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1853 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1854 | @@ -1,1 +0,0 @@ |
|
1855 | -a |
|
1856 | diff -r 75d2b02c4a5c -r dff6e52f5e41 b |
|
1857 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
|
1858 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1859 | @@ -1,1 +0,0 @@ |
|
1860 | -b |
|
1861 | diff -r 75d2b02c4a5c -r dff6e52f5e41 c |
|
1862 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
|
1863 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1864 | @@ -1,1 +0,0 @@ |
|
1865 | -c |
|
1866 | |
|
1867 o 0:75d2b02c4a5c initial |
|
1868 () draftdiff -r 000000000000 -r 75d2b02c4a5c a |
|
1869 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1870 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1871 @@ -0,0 +1,1 @@ |
|
1872 +a |
|
1873 diff -r 000000000000 -r 75d2b02c4a5c b |
|
1874 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1875 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1876 @@ -0,0 +1,1 @@ |
|
1877 +b |
|
1878 diff -r 000000000000 -r 75d2b02c4a5c c |
|
1879 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1880 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
1881 @@ -0,0 +1,1 @@ |
|
1882 +c |
|
1883 diff -r 000000000000 -r 75d2b02c4a5c d |
|
1884 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1885 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
|
1886 @@ -0,0 +1,1 @@ |
|
1887 +d |
|
1888 |
|
1889 |
|
1890 The public predecessors deletes'a', 'b' and 'c', |
|
1891 If was amended to only delete 'a', and 'c' |
|
1892 so the fixup should add back 'b'. |
|
1893 |
|
1894 $ hg phase -p -r dff6e52f5e41 --hidden |
|
1895 1 new phase-divergent changesets |
|
1896 $ hg evolve --phase-divergent |
|
1897 recreate:[2] delete a |
|
1898 atop:[1] delete a |
|
1899 committed as 84aa492b3c37 |
|
1900 working directory is now at 84aa492b3c37 |
|
1901 $ hg glog --patch |
|
1902 @ 3:84aa492b3c37 phase-divergent update to dff6e52f5e41: |
|
1903 | () draftdiff -r dff6e52f5e41 -r 84aa492b3c37 b |
|
1904 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1905 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1906 | @@ -0,0 +1,1 @@ |
|
1907 | +b |
|
1908 | |
|
1909 o 1:dff6e52f5e41 delete a |
|
1910 | () publicdiff -r 75d2b02c4a5c -r dff6e52f5e41 a |
|
1911 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1912 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1913 | @@ -1,1 +0,0 @@ |
|
1914 | -a |
|
1915 | diff -r 75d2b02c4a5c -r dff6e52f5e41 b |
|
1916 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
|
1917 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1918 | @@ -1,1 +0,0 @@ |
|
1919 | -b |
|
1920 | diff -r 75d2b02c4a5c -r dff6e52f5e41 c |
|
1921 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
|
1922 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1923 | @@ -1,1 +0,0 @@ |
|
1924 | -c |
|
1925 | |
|
1926 o 0:75d2b02c4a5c initial |
|
1927 () publicdiff -r 000000000000 -r 75d2b02c4a5c a |
|
1928 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1929 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1930 @@ -0,0 +1,1 @@ |
|
1931 +a |
|
1932 diff -r 000000000000 -r 75d2b02c4a5c b |
|
1933 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1934 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1935 @@ -0,0 +1,1 @@ |
|
1936 +b |
|
1937 diff -r 000000000000 -r 75d2b02c4a5c c |
|
1938 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1939 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
1940 @@ -0,0 +1,1 @@ |
|
1941 +c |
|
1942 diff -r 000000000000 -r 75d2b02c4a5c d |
|
1943 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1944 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
|
1945 @@ -0,0 +1,1 @@ |
|
1946 +d |
|
1947 |
|
1948 |
|
1949 $ hg diff --change . |
|
1950 diff -r dff6e52f5e41 -r 84aa492b3c37 b |
|
1951 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1952 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1953 @@ -0,0 +1,1 @@ |
|
1954 +b |
|
1955 |