view tests/test-notify @ 3869:ad6f34c83c3d

Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 11 Dec 2006 18:09:52 +0100
parents b5c4d749f37f
children 86098ec4b77a
line wrap: on
line source

#!/bin/sh

cat <<EOF >> $HGRCPATH
[extensions]
notify=

[hooks]
incoming.notify = python:hgext.notify.hook

[notify]
config = $HGTMP/.notify.conf
sources = pull
domain = test.com
strip = 3
template = Subject: {desc|firstline|strip}\nFrom: {author}\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip}
diffstat = False

[web]
baseurl = http://test/

[usersubs]
foo@bar = *
EOF

hg init a
echo a > a/a
echo % commit
hg --traceback --cwd a commit -Ama -d '0 0'

echo % clone
hg --traceback clone a b

echo a >> a/a
echo % commit
hg --traceback --cwd a commit -Amb -d '1 0'

echo % pull
hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \
  -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/'