Mercurial > hg

view tests/test-issue842.t @ 12257:470e0b1ddc6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-merge-internal-tools-pattern
author Adrian Buehlmann <adrian@cadifra.com>
date Sat, 11 Sep 2010 20:04:35 +0200
parents ee41be2bbf5a
children b63f6422d2a7
line wrap: on
line source

# http://mercurial.selenic.com/bts/issue842

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

  $ hg up -r0000
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ echo bar > a

Should issue new head warning:

  $ hg ci -Amb
  adding a
  created new head

  $ hg up -r0000
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ echo stuffy > a

Should not issue new head warning:

  $ hg ci -q -Amc

  $ hg up -r0000
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ echo crap > a
  $ hg branch testing
  marked working directory as branch testing

Should not issue warning:

  $ hg ci -q -Amd