Mercurial > hg
view tests/test-merge-revert.t @ 48217:e10f5dc7f5bf
pyoxidizer: add the user site to `sys.path` on macOS
This allows 3rd party extensions that are installed with `pip` to be picked up,
similar to what we do on Windows. PyOxidizer has a bug that prevents this from
working without this extra help (see 95af358fcdfe), though it appears there's
another wrinkle here with `sys._framework` too.
I needed this to see if the problem[1] loading the keyring extension on Windows
also occurs on macOS (it doesn't).
[1] https://github.com/indygreg/PyOxidizer/issues/445
Differential Revision: https://phab.mercurial-scm.org/D11452
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 17 Sep 2021 15:07:30 -0400 |
parents | 28e2e3804f2e |
children | 55c6ebd11cb9 |
line wrap: on
line source
$ hg init $ echo "added file1" > file1 $ echo "added file2" > file2 $ hg add file1 file2 $ hg commit -m "added file1 and file2" $ echo "changed file1" >> file1 $ hg commit -m "changed file1" $ hg -q log 1:08a16e8e4408 0:d29c767a4b52 $ hg id 08a16e8e4408 tip $ hg update -C 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id d29c767a4b52 $ echo "changed file1" >> file1 $ hg id d29c767a4b52+ $ hg revert --all reverting file1 $ hg diff $ hg status ? file1.orig $ hg id d29c767a4b52 $ hg update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg diff $ hg status ? file1.orig $ hg id 08a16e8e4408 tip $ hg update -C 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo "changed file1" >> file1 $ hg update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg diff $ hg status ? file1.orig $ hg id 08a16e8e4408 tip $ hg revert --all $ hg diff $ hg status ? file1.orig $ hg id 08a16e8e4408 tip $ hg revert -r tip --all $ hg diff $ hg status ? file1.orig $ hg id 08a16e8e4408 tip $ hg update -C 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg diff $ hg status ? file1.orig $ hg id 08a16e8e4408 tip