tests/test-flags
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 22 Aug 2006 17:01:24 -0700
changeset 2996 06696f9c30c0
parent 2283 e506c14382fd
child 3298 455109df3669
permissions -rwxr-xr-x
mq.el: Add comment to mq-edit-finish.

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