tests/test-rebase-obsolete.t
changeset 45150 dc5e5577af39
parent 44347 9c9cfecd4600
child 45215 a253ded5b03d
child 45412 aaeccdb6e654
equal deleted inserted replaced
45149:87047efbc6a6 45150:dc5e5577af39
  1030   ~
  1030   ~
  1031   $ hg rebase -r ".^^ + .^ + ." -d 18
  1031   $ hg rebase -r ".^^ + .^ + ." -d 18
  1032   rebasing 19:b82fb57ea638 "willconflict second version"
  1032   rebasing 19:b82fb57ea638 "willconflict second version"
  1033   merging willconflict
  1033   merging willconflict
  1034   warning: conflicts while merging willconflict! (edit, then use 'hg resolve --mark')
  1034   warning: conflicts while merging willconflict! (edit, then use 'hg resolve --mark')
  1035   unresolved conflicts (see hg resolve, then hg rebase --continue)
  1035   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
  1036   [1]
  1036   [1]
  1037 
  1037 
  1038   $ hg resolve --mark willconflict
  1038   $ hg resolve --mark willconflict
  1039   (no more unresolved files)
  1039   (no more unresolved files)
  1040   continue: hg rebase --continue
  1040   continue: hg rebase --continue
  1785   (hidden revision '7829726be4dc' is pruned)
  1785   (hidden revision '7829726be4dc' is pruned)
  1786   $ hg rebase -s $B -d $D
  1786   $ hg rebase -s $B -d $D
  1787   rebasing 1:2ec65233581b "B"
  1787   rebasing 1:2ec65233581b "B"
  1788   merging D
  1788   merging D
  1789   warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
  1789   warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
  1790   unresolved conflicts (see hg resolve, then hg rebase --continue)
  1790   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
  1791   [1]
  1791   [1]
  1792 
  1792 
  1793   $ cp -R . $TESTTMP/hidden-state2
  1793   $ cp -R . $TESTTMP/hidden-state2
  1794 
  1794 
  1795   $ hg log -G
  1795   $ hg log -G
  1870   rebasing 1:d2ae7f538514 "b"
  1870   rebasing 1:d2ae7f538514 "b"
  1871   rebasing 2:177f92b77385 "c"
  1871   rebasing 2:177f92b77385 "c"
  1872   rebasing 3:055a42cdd887 "d"
  1872   rebasing 3:055a42cdd887 "d"
  1873   merging d
  1873   merging d
  1874   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  1874   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  1875   unresolved conflicts (see hg resolve, then hg rebase --continue)
  1875   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
  1876   [1]
  1876   [1]
  1877   $ hg rebase --stop
  1877   $ hg rebase --stop
  1878   1 new orphan changesets
  1878   1 new orphan changesets
  1879   $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
  1879   $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
  1880   o  7:7fffad344617 test
  1880   o  7:7fffad344617 test
  1932   rebasing 1:d2ae7f538514 "b"
  1932   rebasing 1:d2ae7f538514 "b"
  1933   rebasing 2:177f92b77385 "c"
  1933   rebasing 2:177f92b77385 "c"
  1934   rebasing 3:055a42cdd887 "d"
  1934   rebasing 3:055a42cdd887 "d"
  1935   merging d
  1935   merging d
  1936   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  1936   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  1937   unresolved conflicts (see hg resolve, then hg rebase --continue)
  1937   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
  1938   [1]
  1938   [1]
  1939   $ hg rebase --stop
  1939   $ hg rebase --stop
  1940   abort: cannot remove original changesets with unrebased descendants
  1940   abort: cannot remove original changesets with unrebased descendants
  1941   (either enable obsmarkers to allow unstable revisions or use --keep to keep original changesets)
  1941   (either enable obsmarkers to allow unstable revisions or use --keep to keep original changesets)
  1942   [255]
  1942   [255]
  1950   rebasing 1:d2ae7f538514 "b"
  1950   rebasing 1:d2ae7f538514 "b"
  1951   rebasing 2:177f92b77385 "c"
  1951   rebasing 2:177f92b77385 "c"
  1952   rebasing 3:055a42cdd887 "d"
  1952   rebasing 3:055a42cdd887 "d"
  1953   merging d
  1953   merging d
  1954   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  1954   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  1955   unresolved conflicts (see hg resolve, then hg rebase --continue)
  1955   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
  1956   [1]
  1956   [1]
  1957   $ hg rebase --stop
  1957   $ hg rebase --stop
  1958   $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
  1958   $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
  1959   o  7:7fffad344617 test
  1959   o  7:7fffad344617 test
  1960   |  c
  1960   |  c
  2012   rebasing 1:d2ae7f538514 "b"
  2012   rebasing 1:d2ae7f538514 "b"
  2013   rebasing 2:177f92b77385 "c"
  2013   rebasing 2:177f92b77385 "c"
  2014   rebasing 3:055a42cdd887 "d"
  2014   rebasing 3:055a42cdd887 "d"
  2015   merging d
  2015   merging d
  2016   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  2016   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  2017   unresolved conflicts (see hg resolve, then hg rebase --continue)
  2017   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
  2018   [1]
  2018   [1]
  2019   $ hg rebase --stop
  2019   $ hg rebase --stop
  2020   abort: cannot stop in --collapse session
  2020   abort: cannot stop in --collapse session
  2021   [255]
  2021   [255]
  2022   $ hg rebase --abort
  2022   $ hg rebase --abort
  2045 =================================================
  2045 =================================================
  2046   $ hg rebase -s 3 -d 5
  2046   $ hg rebase -s 3 -d 5
  2047   rebasing 3:055a42cdd887 "d"
  2047   rebasing 3:055a42cdd887 "d"
  2048   merging d
  2048   merging d
  2049   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  2049   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  2050   unresolved conflicts (see hg resolve, then hg rebase --continue)
  2050   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
  2051   [1]
  2051   [1]
  2052   $ hg rebase --stop --dry-run
  2052   $ hg rebase --stop --dry-run
  2053   abort: cannot specify both --stop and --dry-run
  2053   abort: cannot specify both --stop and --dry-run
  2054   [255]
  2054   [255]
  2055 
  2055 
  2113   rebasing 1:6c81ed0049f8 "B" (X)
  2113   rebasing 1:6c81ed0049f8 "B" (X)
  2114   rebasing 2:49cb3485fa0c "C" (Y)
  2114   rebasing 2:49cb3485fa0c "C" (Y)
  2115   rebasing 3:67a385d4e6f2 "D" (Z)
  2115   rebasing 3:67a385d4e6f2 "D" (Z)
  2116   merging d
  2116   merging d
  2117   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  2117   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
  2118   unresolved conflicts (see hg resolve, then hg rebase --continue)
  2118   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
  2119   [1]
  2119   [1]
  2120   $ hg rebase --stop
  2120   $ hg rebase --stop
  2121   1 new orphan changesets
  2121   1 new orphan changesets
  2122   $ hg log -GT "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n"
  2122   $ hg log -GT "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n"
  2123   o  7: 9c86c650b686 'C' bookmarks: Y
  2123   o  7: 9c86c650b686 'C' bookmarks: Y