Mercurial > hg
view tests/test-ssh-batch.t @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -0800 |
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]