Mercurial > hg
view tests/test-issue1438.t @ 23405:2a038deeac9a
merge: 0 is a valid ancestor different from None
Most internal functions can take either a hash or an integer. Merge did however
not handle 0 as revision 0. Now it does.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sun, 30 Nov 2014 19:26:53 +0100 |
parents | 7a9cbb315d84 |
children | 2fc86d92c4a9 |
line wrap: on
line source
#require symlink http://mercurial.selenic.com/bts/issue1438 $ hg init $ ln -s foo link $ hg add link $ hg ci -mbad link $ hg rm link $ hg ci -mok $ hg diff -g -r 0:1 > bad.patch $ hg up 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg import --no-commit bad.patch applying bad.patch $ hg status R link ? bad.patch