Mercurial: tests/test-ssh-batch.t annotate

annotate 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

rev	line source
46670 fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	1 $ hg init a
fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	2 $ cd a
fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	3 $ touch a; hg commit -qAm_
fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	4 $ hg bookmark $(for i in $($TESTDIR/seq.py 0 20); do echo b$i; done)
fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	5 $ hg clone . ../b -q
fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	6 $ cd ../b
fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	7
fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	8 Checking that when lookup multiple bookmarks in one go, if one of them
fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	9 fails (thus causing the sshpeer to be stopped), the errors from the
fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	10 further lookups don't result in tracebacks.
fe36ce0fbcdd test: show internal exception with batchable rpcs over ssh Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: diff changeset	11
46672 aa2e38147e8b wireprotov1peer: don't raise internal errors in some cases Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 46671 diff changeset	12 $ 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
aa2e38147e8b wireprotov1peer: don't raise internal errors in some cases Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 46671 diff changeset	13 pulling from ssh://user@dummy/$TESTTMP/b/../a
aa2e38147e8b wireprotov1peer: don't raise internal errors in some cases Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 46671 diff changeset	14 abort: unknown revision 'nosuchbookmark'
aa2e38147e8b wireprotov1peer: don't raise internal errors in some cases Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 46671 diff changeset	15 [255]