Mercurial > hg

view tests/test-issue619.t @ 13683:8c397d7b25d2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-de: correct translation for some fuzzy strings
author David Soria Parra <dsp@php.net>
date Tue, 15 Mar 2011 10:39:19 +0100
parents 1792b8a9422b
children 41885892796e
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
  $ 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]