view tests/test-merge4.t @ 24360:f554f89a2038

tests: introduce 'seq.py' as a portable replacement for 'seq'

OS X 10.6.8 doesn't have it, while 10.10 does.  I'm not sure when it was added.
It may be missing from other platforms as well.

This currently doesn't handle the string manipulation options (-f, -s and -w in
MinGW anyway), since there is currently no need for it.  Since xrange defaults
to starting at 0 instead of 1, and treats the end as exclusive instead of
inclusive, the args need to be extracted instead of doing:

        xrange(*[int(a) for a in sys.argv[1:]])

Therefore, the step might as well be added, even though there is no current use.

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ hg update 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo This is file c1 > c
  $ hg add c
  $ hg commit -m "commit #2"
  created new head
  $ hg merge 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ rm b
  $ echo This is file c22 > c

Test hg behaves when committing with a missing file added by a merge

  $ hg commit -m "commit #3"
  abort: cannot commit merge with missing files
  [255]