tests/test-rebase-obsolete.t
changeset 33332 3b7cb3d17137
parent 32413 d6be5b5cc325
child 33542 b11e8c67fb0f
equal deleted inserted replaced
33331:4bae3c117b57 33332:3b7cb3d17137
   972 Check that working directory was updated to rev 3 although rev 2 was skipped
   972 Check that working directory was updated to rev 3 although rev 2 was skipped
   973 during the rebase operation
   973 during the rebase operation
   974   $ hg log -r .
   974   $ hg log -r .
   975   3:be1832deae9a b (no-eol)
   975   3:be1832deae9a b (no-eol)
   976 
   976 
   977 Check that bookmark was moved to rev 3 although rev 2 was skipped
   977 Check that bookmark was not moved to rev 3 if rev 2 was skipped during the
   978 during the rebase operation
   978 rebase operation. This makes sense because if rev 2 has a successor, the
       
   979 operation generating that successor (ex. rebase) should be responsible for
       
   980 moving bookmarks. If the bookmark is on a precursor, like rev 2, that means the
       
   981 user manually moved it back. In that case we should not move it again.
   979   $ hg bookmarks
   982   $ hg bookmarks
   980      mybook                    3:be1832deae9a
   983      mybook                    2:1e9a3c00cbe9
   981   $ hg debugobsolete --rev tip
   984   $ hg debugobsolete --rev tip
   982   1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (*) {'user': 'test'} (glob)
   985   1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (*) {'user': 'test'} (glob)