Mercurial > hg
view tests/test-issue842.t @ 13874:9d67277c9204
merge: add ancestor to the update function
This makes it easier to do rebase-like operations.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Apr 2011 15:25:20 -0500 |
parents | b63f6422d2a7 |
children | 41885892796e |
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