view tests/test-revlog-packentry.t @ 34548:b4955650eb57

merge: add merge action 'pr' to rename files during update

Add a new merge action to handle a path conflict by renaming the conflicting
file to a safe name.

The rename is just to avoid problems on the filesystem.  The conflict is still
considered unresolved until the user marks the original path as resolved.

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

  $ 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      13  .....       1 0376abec49b8 000000000000 000000000000 (re)

  $ cd ..