view tests/test-issue619.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.

http://mercurial.selenic.com/bts/issue619

  $ hg init
  $ echo a > a
  $ hg ci -Ama
  adding a

  $ echo b > b
  $ hg branch b
  marked working directory as branch b
  (branches are permanent and global, did you want a bookmark?)
  $ hg ci -Amb
  adding b

  $ hg co -C 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

Fast-forward:

  $ hg merge b
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ hg ci -Ammerge

Bogus fast-forward should fail:

  $ hg merge b
  abort: merging with a working directory ancestor has no effect
  [255]

Even with strange revset (issue4465)

  $ hg merge ::.
  abort: merging with a working directory ancestor has no effect
  [255]