Mercurial > hg
view tests/test-ssh-batch.t @ 47916:65e3d8028f2e
dirstate: drop the `_merge` method
It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.
Differential Revision: https://phab.mercurial-scm.org/D11351
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 24 Aug 2021 21:16:48 +0200 |
parents | aa2e38147e8b |
children | 9c4204b7f3e4 |
line wrap: on
line source
$ hg init a $ cd a $ touch a; hg commit -qAm_ $ hg bookmark $(for i in $($TESTDIR/seq.py 0 20); do echo b$i; done) $ hg clone . ../b -q $ cd ../b Checking that when lookup multiple bookmarks in one go, if one of them fails (thus causing the sshpeer to be stopped), the errors from the further lookups don't result in tracebacks. $ hg pull -r b0 -r nosuchbookmark $(for i in $($TESTDIR/seq.py 1 20); do echo -r b$i; done) -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/$(pwd)/../a pulling from ssh://user@dummy/$TESTTMP/b/../a abort: unknown revision 'nosuchbookmark' [255]