view tests/test-merge4 @ 1713:03ee100b8c21

hooks: distinguish between locally committed and incoming changes. "commit" hook is now for locally committed changes only. "incoming" is for changes pulled, pushed, or unbundled into local repo.
author Daniel Santa Cruz <byteshack@gmail.com>
date Fri, 10 Feb 2006 16:45:56 -0500
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "0 0"
hg update -m 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "0 0"