view tests/test-merge5.t @ 45982:d26497811ed9

packaging: add pygit2 to the py3 Windows installers

This is needed to be able to use the git extension.

The extension no longer complains about the library being not installed, but
`hg log -r .` on a repo that works in WSL yielded a TypeError:

      ...
      File "mercurial.hg", line 188, in _peerorrepo
      File "mercurial.localrepo", line 3224, in instance
      File "mercurial.localrepo", line 623, in makelocalrepository
      File "hgext.git", line 117, in _makestore
      File "hgext.git", line 48, in __init__
    TypeError: Repository unable to unpack backend.

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

  $ hg init
  $ echo This is file a1 > a
  $ echo This is file b1 > b
  $ hg add a b
  $ hg commit -m "commit #0"
  $ echo This is file b22 > b
  $ hg commit -m "comment #1"
  $ hg update 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ rm b
  $ hg commit -A -m "comment #2"
  removing b
  created new head
  $ hg update 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ rm b
  $ hg update -c 2
  abort: uncommitted changes
  [20]
  $ hg revert b
  $ hg update -c 2
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ mv a c

Should abort:

  $ hg update 1
  abort: uncommitted changes
  (commit or update --clean to discard changes)
  [255]
  $ mv c a

Should succeed:

  $ hg update 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved