Mercurial > hg
view tests/test-issue612.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
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 26 Nov 2020 02:00:00 -0500 |
parents | 4441705b7111 |
children | 55c6ebd11cb9 |
line wrap: on
line source
https://bz.mercurial-scm.org/612 $ hg init $ mkdir src $ echo a > src/a.c $ hg ci -Ama adding src/a.c $ hg mv src source moving src/a.c to source/a.c $ hg ci -Ammove $ hg co -C 0 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo new > src/a.c $ echo compiled > src/a.o $ hg ci -mupdate created new head $ hg status ? src/a.o $ hg merge merging src/a.c and source/a.c to source/a.c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg status M source/a.c R src/a.c ? src/a.o