new file mode 100755
--- /dev/null
+++ b/tests/test-confused-revert
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+hg init
+echo foo > a
+hg add a
+hg commit -m "1" -d "0 0"
+
+echo bar > b
+hg add b
+hg remove a
+
+echo "%%% should show a removed and b added"
+hg status
+
+echo "reverting..."
+hg revert
+
+echo "%%% should show b unknown and a back to normal"
+hg status
+
+rm b
+
+hg co -C 0
+echo foo-a > a
+hg commit -m "2a" -d "0 0"
+
+hg co -C 0
+echo foo-b > a
+hg commit -m "2b" -d "0 0"
+
+HGMERGE=true hg update -m 1
+
+echo "%%% should show foo-b"
+cat a
+
+echo bar > b
+hg add b
+rm a
+hg remove a
+
+echo "%%% should show a removed and b added"
+hg status
+
+echo "reverting..."
+hg revert
+
+echo "%%% should show b unknown and a marked modified (merged)"
+hg status
+
+echo "%%% should show foo-b"
+cat a
+