Mercurial > public > mercurial-scm > hg
diff tests/test-notify @ 7664:3cc74ee75b0d
diffstat: don't fail on merges
First version by Alexander Solovyov <piranha@piranha.org.ua>
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Tue, 13 Jan 2009 20:28:06 +0200 |
| parents | 44b3f7bbe2f3 |
| children | 912bfef12ba6 |
line wrap: on
line diff
--- a/tests/test-notify Sat Jan 17 15:25:20 2009 +0100 +++ b/tests/test-notify Tue Jan 13 20:28:06 2009 +0200 @@ -84,3 +84,17 @@ hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \ -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/' \ -e 's/^Date:.*/Date:/' + +echo % test merge +cd a +hg up -C 0 +echo a >> a +hg ci -Am adda2 -d '2 0' +hg merge +hg ci -m merge -d '3 0' +cd .. + +hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \ + -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/' \ + -e 's/^Date:.*/Date:/' +