Mercurial > hg > gitweb

view tests/test-merge8 @ 3619:8c4fd0de5de8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up parent display in logging For changesets with a first parent nullid, but not rev 0, we ought to display a null parent.
author Matt Mackall <mpm@selenic.com>
date Tue, 07 Nov 2006 14:04:15 -0600
parents efbe24c7d8d9
children
line wrap: on
line source

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update