tests/test-rebase-obsolete.t
changeset 34870 64f29fff1877
parent 34867 7f183c643eb6
child 34872 29f52e7966dd
equal deleted inserted replaced
34869:196548113ddd 34870:64f29fff1877
  1223   3:be1832deae9a b (no-eol)
  1223   3:be1832deae9a b (no-eol)
  1224   $ hg book -r 2 mybook --hidden  # rev 2 has a bookmark on it now
  1224   $ hg book -r 2 mybook --hidden  # rev 2 has a bookmark on it now
  1225   $ hg up 2 && hg log -r .  # working dir is at rev 2 again
  1225   $ hg up 2 && hg log -r .  # working dir is at rev 2 again
  1226   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1226   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1227   2:1e9a3c00cbe9 b (no-eol)
  1227   2:1e9a3c00cbe9 b (no-eol)
  1228   $ hg rebase -r 2 -d 3 --config experimental.stabilization.track-operation=1
  1228   $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1
  1229   note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip)
  1229   note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip)
  1230 Check that working directory and bookmark was updated to rev 3 although rev 2
  1230 Check that working directory and bookmark was updated to rev 3 although rev 2
  1231 was skipped
  1231 was skipped
  1232   $ hg log -r .
  1232   $ hg log -r .
  1233   3:be1832deae9a b (no-eol)
  1233   3:be1832deae9a b (no-eol)