annotate tests/test-ssh-batch.t @ 48516:59524cb1cd73

simplemerge: don't calculate conflict labels when resolving automatically Differential Revision: https://phab.mercurial-scm.org/D11903
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 07 Dec 2021 23:01:20 -0800
parents 9c4204b7f3e4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
47920
9c4204b7f3e4 tests: rely on dummyssh being the default
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 46672
diff changeset
12 $ 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
46672
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]