# HG changeset patch
# User mpm@selenic.com
# Date 1119027055 28800
# Node ID ee4c80d294e571c7c9edbacbb329e55956add4c0
# Parent  5f65a108a55957118b5b95e3e38449f451221d0e
Tidy up conflict and pull tests

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Tidy up conflict and pull tests

Fix failure to kill hg serve process and pipeline ordering with set -e

manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg
pI3IH2BvqUlckdLwx3M5jcQ=
=s/QA
-----END PGP SIGNATURE-----


diff -r 5f65a108a559 -r ee4c80d294e5 tests/test-conflict
--- a/tests/test-conflict	Fri Jun 17 08:50:11 2005 -0800
+++ b/tests/test-conflict	Fri Jun 17 08:50:55 2005 -0800
@@ -13,5 +13,5 @@
 export HGMERGE=merge
 hg -d up -m 1
 hg id
-cat a | grep -v ">>>" | grep -v "<<<"
+grep -Ev ">>>|<<<" a
 hg status
diff -r 5f65a108a559 -r ee4c80d294e5 tests/test-conflict.out
--- a/tests/test-conflict.out	Fri Jun 17 08:50:11 2005 -0800
+++ b/tests/test-conflict.out	Fri Jun 17 08:50:55 2005 -0800
@@ -21,9 +21,7 @@
 merging a failed!
 + hg id
 32e80765d7fe+75234512624c+ tip
-+ cat a
-+ grep -v '>>>'
-+ grep -v '<<<'
++ grep -Ev '>>>|<<<' a
 something else
 =======
 something
diff -r 5f65a108a559 -r ee4c80d294e5 tests/test-pull
--- a/tests/test-pull	Fri Jun 17 08:50:11 2005 -0800
+++ b/tests/test-pull	Fri Jun 17 08:50:55 2005 -0800
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 mkdir test
 cd test
 echo foo>foo
@@ -10,7 +8,6 @@
 hg commit -t "1"
 hg verify
 hg serve -p 20059 2>/dev/null &
-C=$!
 cd ..
 
 mkdir copy
@@ -21,4 +18,4 @@
 cat foo
 hg manifest
 
-kill $C
+kill %hg