Mercurial > hg

view tests/test-issue619.t @ 20717:da3124178fbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: added tests to test sort revset This tests are intended to test sort in many different cases where it could fail when using the new structures
author Lucas Moscovicz <lmoscovicz@fb.com>
date Thu, 13 Mar 2014 17:20:03 -0700
parents 41885892796e
children 0c432696dae3
line wrap: on
line source

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]