diff -r 1c148e935244 -r 1b872599f39f tests/test-commandserver.py
--- a/tests/test-commandserver.py	Mon Jul 11 17:46:55 2011 +0300
+++ b/tests/test-commandserver.py	Mon Jul 11 17:49:45 2011 +0300
@@ -120,6 +120,15 @@
     runcommand(server, ['import', '-'], input=cStringIO.StringIO(patch))
     runcommand(server, ['log'])
 
+def cwd(server):
+    """ check that --cwd doesn't persist between requests """
+    readchannel(server)
+    os.mkdir('foo')
+    open('foo/bar', 'w').write('a')
+    runcommand(server, ['--cwd', 'foo', 'st', 'bar'])
+    runcommand(server, ['st', 'foo/bar'])
+    os.remove('foo/bar')
+
 if __name__ == '__main__':
     os.system('hg init')
 
@@ -128,3 +137,4 @@
     check(checkruncommand)
     check(inputeof)
     check(serverinput)
+    check(cwd)