--- a/tests/test-import Fri Jan 25 13:48:35 2008 +0100
+++ b/tests/test-import Fri Jan 25 16:18:49 2008 +0100
@@ -32,6 +32,13 @@
hg --cwd b import -mpatch ../tip.patch
rm -r b
+echo % import of plain diff should be ok with --no-commit
+hg clone -r0 a b
+hg --cwd a diff -r0:1 > tip.patch
+hg --cwd b import --no-commit ../tip.patch
+hg --cwd b diff --nodates
+rm -r b
+
echo % hg -R repo import
# put the clone in a subdir - having a directory named "a"
# used to hide a bug.
--- a/tests/test-import.out Fri Jan 25 13:48:35 2008 +0100
+++ b/tests/test-import.out Fri Jan 25 16:18:49 2008 +0100
@@ -31,6 +31,20 @@
added 1 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../tip.patch
+% import of plain diff should be ok with --no-commit
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 2 changes to 2 files
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+applying ../tip.patch
+diff -r 80971e65b431 a
+--- a/a
++++ b/a
+@@ -1,1 +1,2 @@
+ line 1
++line 2
% hg -R repo import
requesting all changes
adding changesets