# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2012-04-01 20:34:22
# Node ID 41b41adba08ac466e9a822f25ef3f57566c47836
# Parent  cef9b0ac4601a89a7e3608987f178b649f95fb23
# Parent  0d8df15b59d69b2b95f73a78debab92c9dbc4358

merge stable

diff --git a/.hgsigs b/.hgsigs
--- a/.hgsigs
+++ b/.hgsigs
@@ -50,3 +50,4 @@ 6344043924497cd06d781d9014c66802285072e4
 db33555eafeaf9df1e18950e29439eaa706d399b 0 iD8DBQBPGdzxywK+sNU5EO8RAppkAJ9jOXhUVE/97CPgiMA0pMGiIYnesQCfengAszcBiSiKGugiI8Okc9ghU+Y=
 2aa5b51f310fb3befd26bed99c02267f5c12c734 0 iD8DBQBPKZ9bywK+sNU5EO8RAt1TAJ45r1eJ0YqSkInzrrayg4TVCh0SnQCgm0GA/Ua74jnnDwVQ60lAwROuz1Q=
 53e2cd303ecf8ca7c7eeebd785c34e5ed6b0f4a4 0 iD8DBQBPT/fvywK+sNU5EO8RAnfYAKCn7d0vwqIb100YfWm1F7nFD5B+FACeM02YHpQLSNsztrBCObtqcnfod7Q=
+b9bd95e61b49c221c4cca24e6da7c946fc02f992 0 iD8DBQBPeLsIywK+sNU5EO8RAvpNAKCtKe2gitz8dYn52IRF0hFOPCR7AQCfRJL/RWCFweu2T1vH/mUOCf8SXXc=
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -62,3 +62,4 @@ 6344043924497cd06d781d9014c66802285072e4
 db33555eafeaf9df1e18950e29439eaa706d399b 2.1-rc
 2aa5b51f310fb3befd26bed99c02267f5c12c734 2.1
 53e2cd303ecf8ca7c7eeebd785c34e5ed6b0f4a4 2.1.1
+b9bd95e61b49c221c4cca24e6da7c946fc02f992 2.1.2
diff --git a/tests/test-bad-pull.t b/tests/test-bad-pull.t
--- a/tests/test-bad-pull.t
+++ b/tests/test-bad-pull.t
@@ -13,12 +13,18 @@
   >         handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
   >     server_address = ('localhost', int(os.environ['HGPORT']))
   >     httpd = server_class(server_address, handler_class)
-  >     os.system("hg clone http://localhost:$HGPORT/foo copy2&")
+  >     open("listening", "w")
   >     httpd.handle_request()
   > run()
   > EOF
 
-  $ python dumb.py
+  $ python dumb.py 2> log &
+  $ P=$!
+  $ while [ ! -f listening ]; do true; done
+  $ hg clone http://localhost:$HGPORT/foo copy2
+  abort: HTTP Error 404: * (glob)
+  [255]
+  $ wait $P
+  $ cat log
   localhost - - [*] code 404, message File not found (glob)
   localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob)
-  abort: HTTP Error 404: * (glob)
diff --git a/tests/test-mq.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -519,7 +519,10 @@ cleaning up
   $ hg qpush --move test.patch # already applied
   abort: cannot push to a previous patch: test.patch
   [255]
-  $ sed -i.bak '2i\# make qtip index different in series and fullseries' `hg root`/.hg/patches/series
+  $ sed '2i\
+  > # make qtip index different in series and fullseries
+  > ' `hg root`/.hg/patches/series > $TESTTMP/sedtmp
+  $ cp $TESTTMP/sedtmp `hg root`/.hg/patches/series
   $ cat `hg root`/.hg/patches/series
   # comment
   # make qtip index different in series and fullseries
@@ -1496,12 +1499,14 @@ Test that qfinish respect phases.new-com
 
 (restore env for next test)
 
-  $ sed -i.bak -e 's/new-commit=secret//' $HGRCPATH
+  $ sed -e 's/new-commit=secret//' $HGRCPATH > $TESTTMP/sedtmp
+  $ cp $TESTTMP/sedtmp $HGRCPATH
   $ hg qimport -r 1 --name  add-file2
 
 Test that qfinish preserve phase when mq.secret=false
 
-  $ sed -i.bak -e 's/secret=true/secret=false/' $HGRCPATH
+  $ sed -e 's/secret=true/secret=false/' $HGRCPATH > $TESTTMP/sedtmp
+  $ cp $TESTTMP/sedtmp $HGRCPATH
   $ hg qfinish qbase
   patch add-file2 finalized without changeset message
   $ hg phase 'all()'