Mercurial > hg
view tests/test-ssh-repoerror.t @ 46811:5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
While commiting a merge, the commit code does not know whether a file was merged
during `hg merge` or not. This leads the commit code to look for filelog
ancestor to choose parents of new filelog created on merge commit.
This leads to wrong results in some cases as demonstrated by previous patch.
From this patch, we start storing information about merged files in mergestate
in stateextras and then use that on commit to detect whether we need to set two
parents or not.
Differential Revision: https://phab.mercurial-scm.org/D10149
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 10 Mar 2021 13:14:32 +0530 |
parents | 95c4cca641f6 |
children | be496e3489b9 |
line wrap: on
line source
#require unix-permissions no-root initial setup $ cat << EOF >> $HGRCPATH > [ui] > ssh="$PYTHON" "$TESTDIR/dummyssh" > EOF repository itself is non-readable --------------------------------- $ hg init no-read $ hg id ssh://user@dummy/no-read 000000000000 $ chmod a-rx no-read $ hg id ssh://user@dummy/no-read remote: abort: Permission denied: *$TESTTMP/no-read/.hg* (glob) abort: no suitable response from remote hg [255] special case files are visible, but unreadable ---------------------------------------------- This is "similar" to the test above, but the directory is "traversable". This seems an unexpected case in real life, but we test it anyway. $ hg init other $ hg id ssh://user@dummy/other 000000000000 $ for item in `find other | sort -r` ; do > chmod a-r $item > done $ hg id ssh://user@dummy/other remote: abort: Permission denied: '$TESTTMP/other/.hg/requires' abort: no suitable response from remote hg [255] directory toward the repository is read only -------------------------------------------- $ mkdir deep $ hg init deep/nested $ hg id ssh://user@dummy/deep/nested 000000000000 $ chmod a-rx deep $ hg id ssh://user@dummy/deep/nested remote: abort: Permission denied: *$TESTTMP/deep/nested/.hg* (glob) abort: no suitable response from remote hg [255] repository has wrong requirement -------------------------------- $ hg init repo-future $ hg id ssh://user@dummy/repo-future 000000000000 $ echo flying-car >> repo-future/.hg/requires $ hg id ssh://user@dummy/repo-future remote: abort: repository requires features unknown to this Mercurial: flying-car remote: (see https://mercurial-scm.org/wiki/MissingRequirement for more information) abort: no suitable response from remote hg [255]