Mercurial > hg
view tests/test-ssh-batch.t @ 49224:cdb85d0512b8
branching: fix wrong merge conflict resolution from 13dfad0f9f7a
13dfad0f9f7a merged stable into default, but accidentally added the
_blockingreader class from stable (but deindented) instead of merging the
changes from stable (2fe4efaa59af) into the existing _blockingreader class.
This resulted in the _blockingreader being there two times.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Wed, 25 May 2022 17:23:16 +0200 |
parents | 9c4204b7f3e4 |
children |
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) ssh://user@dummy/$(pwd)/../a pulling from ssh://user@dummy/$TESTTMP/b/../a abort: unknown revision 'nosuchbookmark' [255]