view tests/test-ssh-batch.t @ 48556:ce8c82a5cd65

simplemerge: convert `merge_lines()` away from generator

We always consume all the lines and put them in a list anyway. By
making the function not a generator, we can later make it return an
additional value (to indicate if there were conflicts).

Differential Revision: https://phab.mercurial-scm.org/D11973

  $ 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]