view tests/test-merge-subrepos.t @ 31839:5b048d5f8884

test-check-pylint: match its output

"pylint --version" shows:

  pylint 2.0.0,
  astroid 1.5.0
  Python 2.7.13 (default, Dec 21 2016, 07:16:46)
  [GCC 6.2.1 20160830]

I got "Your code has been rated at 10.00/10" every time and didn't know how
to turn it off. Therefore the fix.

  $ hg init

  $ echo a > a
  $ hg ci -qAm 'add a'

  $ hg init subrepo
  $ echo 'subrepo = http://example.net/libfoo' > .hgsub
  $ hg ci -qAm 'added subrepo'

  $ hg up -qC 0
  $ echo ax > a
  $ hg ci -m 'changed a'
  created new head

  $ hg up -qC 1
  $ cd subrepo
  $ echo b > b
  $ hg add b
  $ cd ..

Should fail, since there are added files to subrepo:

  $ hg merge
  abort: uncommitted changes in subrepository 'subrepo'
  [255]