tests/test-merge8
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 16 Apr 2007 13:00:23 -0300
changeset 4351 051fb8c2567c
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
command line templates: add formatnode filter This will print a full hash node with --debug and a short one otherwise. Use it with some default templates and in map-cmdline.default to print the parents. This should fix issue538.

#!/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