view tests/test-revlog-packentry.t @ 45284:31c454a5f1a8

merge: pass mergeresult in checkpassconflicts() instead of actions (API)

This is a part of series which aims to use mergeresult obj instead of an action
dictionary.

Differential Revision: https://phab.mercurial-scm.org/D8822

  $ 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 linkrev nodeid       p1           p2
       0       0 b80de5d13875 000000000000 000000000000
       1       1 0376abec49b8 000000000000 000000000000

  $ cd ..