Mercurial > hg
view tests/test-revlog-packentry.t @ 17394:19e4861f9730 stable
tests: merging bookmarked heads
45b5eb2941d0 fixed an error that occured when heads being merged were both
inactive bookmarks. Add a test for that case.
author | John Li <jli@circularly.org> |
---|---|
date | Mon, 27 Aug 2012 09:57:58 -0400 |
parents | b87acfda5268 |
children | 6cc1f388ac80 |
line wrap: on
line source
$ hg init repo $ cd repo $ touch foo $ hg ci -Am 'add foo' adding foo $ hg up -C null 0 files updated, 0 files merged, 1 files removed, 0 files unresolved this should be stored as a delta against rev 0 $ echo foo bar baz > foo $ hg ci -Am 'add foo again' adding foo created new head $ hg debugindex foo rev offset length ..... linkrev nodeid p1 p2 (re) 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) 1 0 24 ..... 1 0376abec49b8 000000000000 000000000000 (re) $ cd ..