view tests/test-flags @ 2784:12a7bfcafd8f

Add log option --follow-first to follow only the first parent of merges. This can be useful to extract a single line of development.
author Brendan Cully <brendan@kublai.com>
date Thu, 03 Aug 2006 11:48:56 -0700
parents e506c14382fd
children 455109df3669
line wrap: on
line source

#!/bin/sh -e

umask 027
mkdir test1
cd test1

hg init
touch a b
hg add a b
hg ci -m "added a b" -d "1000000 0"

cd ..
mkdir test2
cd test2

hg init
hg pull ../test1
hg co
chmod +x a
hg ci -m "chmod +x a" -d "1000000 0"

cd ../test1
echo 123 >>a
hg ci -m "a updated" -d "1000000 0"

hg pull ../test2
hg heads
hg history

hg -v merge

ls -l ../test[12]/a > foo
cut -b 1-10 < foo