view tests/test-merge8 @ 10734:7a0502a6f9a1

patchbomb: --desc implies --intro For a single patch, an introductory text should not remain unsent if --intro has been omitted, as the intent of --desc is clear.
author Cédric Duval <cedricduval@free.fr>
date Mon, 15 Mar 2010 22:37:38 +0100
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