# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1278441799 -7200
# Node ID 4a73a09801941c11bb91d15c291a970cfd281382
# Parent  96040c70c9e1fad7daa011f415d04da7d1fec273# Parent  0c944b7af5643d41eef2048467a2470f7ca1fe64
Merge with stable

diff -r 96040c70c9e1 -r 4a73a0980194 contrib/mercurial.spec
--- a/contrib/mercurial.spec	Sun Jul 04 14:14:40 2010 +0200
+++ b/contrib/mercurial.spec	Tue Jul 06 20:43:19 2010 +0200
@@ -17,7 +17,7 @@
 # python-devel provides an adequate python-dev.  The merge tool is a
 # run-time dependency.
 #
-BuildRequires: python >= 2.4, python-devel, make, gcc, docutils >= 0.5
+BuildRequires: python >= 2.4, python-devel, make, gcc, python-docutils >= 0.5
 Provides: hg = %{version}-%{release}
 Requires: python >= 2.4
 # The hgk extension uses the wish tcl interpreter, but we don't enforce it
diff -r 96040c70c9e1 -r 4a73a0980194 hgext/mq.py
--- a/hgext/mq.py	Sun Jul 04 14:14:40 2010 +0200
+++ b/hgext/mq.py	Tue Jul 06 20:43:19 2010 +0200
@@ -2311,6 +2311,9 @@
         q.applied[info[0]] = statusentry(info[1], name)
     q.applied_dirty = 1
 
+    destdir = os.path.dirname(absdest)
+    if not os.path.isdir(destdir):
+        os.makedirs(destdir)
     util.rename(q.join(patch), absdest)
     r = q.qrepo()
     if r:
diff -r 96040c70c9e1 -r 4a73a0980194 mercurial/help/glossary.txt
--- a/mercurial/help/glossary.txt	Sun Jul 04 14:14:40 2010 +0200
+++ b/mercurial/help/glossary.txt	Tue Jul 06 20:43:19 2010 +0200
@@ -185,7 +185,7 @@
     Mercurial, that will be recorded in the next commit. The working
     directory initially corresponds to the snapshot at an existing
     changeset, known as the parent of the working directory. See
-    'Parents, working directory'. The state may be modified by changes
+    'Parent, working directory'. The state may be modified by changes
     to the files introduced manually or by a merge. The repository
     metadata exists in the .hg directory inside the working directory.
 
diff -r 96040c70c9e1 -r 4a73a0980194 tests/test-mq-qnew
--- a/tests/test-mq-qnew	Sun Jul 04 14:14:40 2010 +0200
+++ b/tests/test-mq-qnew	Tue Jul 06 20:43:19 2010 +0200
@@ -25,6 +25,12 @@
 
     hg qinit -c
 
+    echo '% qnew with name containing slash'
+    hg qnew foo/bar.patch
+    hg qseries
+    hg qpop
+    hg qdelete foo/bar.patch
+
     echo '% qnew with uncommitted changes'
     echo a > somefile
     hg add somefile
diff -r 96040c70c9e1 -r 4a73a0980194 tests/test-mq-qnew.out
--- a/tests/test-mq-qnew.out	Sun Jul 04 14:14:40 2010 +0200
+++ b/tests/test-mq-qnew.out	Tue Jul 06 20:43:19 2010 +0200
@@ -8,6 +8,10 @@
 abort: ".mqfoo" cannot be used as the name of a patch
 abort: "foo#bar" cannot be used as the name of a patch
 abort: "foo:bar" cannot be used as the name of a patch
+% qnew with name containing slash
+foo/bar.patch
+popping foo/bar.patch
+patch queue now empty
 % qnew with uncommitted changes
 uncommitted.patch
 % qnew implies add
@@ -58,6 +62,10 @@
 abort: ".mqfoo" cannot be used as the name of a patch
 abort: "foo#bar" cannot be used as the name of a patch
 abort: "foo:bar" cannot be used as the name of a patch
+% qnew with name containing slash
+foo/bar.patch
+popping foo/bar.patch
+patch queue now empty
 % qnew with uncommitted changes
 uncommitted.patch
 % qnew implies add
diff -r 96040c70c9e1 -r 4a73a0980194 tests/test-mq-qrename
--- a/tests/test-mq-qrename	Sun Jul 04 14:14:40 2010 +0200
+++ b/tests/test-mq-qrename	Tue Jul 06 20:43:19 2010 +0200
@@ -22,6 +22,9 @@
 hg qrename bar/renamed baz
 hg qseries
 ls .hg/patches/baz
+hg qrename baz new/dir
+hg qseries
+ls .hg/patches/new/dir
 cd ..
 
 echo % test patch being renamed before committed
diff -r 96040c70c9e1 -r 4a73a0980194 tests/test-mq-qrename.out
--- a/tests/test-mq-qrename.out	Sun Jul 04 14:14:40 2010 +0200
+++ b/tests/test-mq-qrename.out	Tue Jul 06 20:43:19 2010 +0200
@@ -5,4 +5,6 @@
 renamed
 baz
 .hg/patches/baz
+new/dir
+.hg/patches/new/dir
 % test patch being renamed before committed