view tests/test-issue619.t @ 22162:7ada34676db8

help: provide help of bad alias without executing aliascmd() The output is slightly changed because of minirst formatting. Previously, ui.pushbuffer() had no effect because "badalias" message was written to stderr. "if not unknowncmd" should no longer be needed because there's no call loop.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 13 Aug 2014 19:38:47 +0900
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]