# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1130280884 25200
# Node ID 30146be3437c23b1eff4980767b1f5b48b78e37a
# Parent  182879d719222ad1b73ec59932e0a6268ed1e7d8
Add test-confused-revert, fix permissions on test-revert



diff --git a/tests/test-confused-revert b/tests/test-confused-revert
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
+
diff --git a/tests/test-confused-revert.out b/tests/test-confused-revert.out
new file mode 100644
--- /dev/null
+++ b/tests/test-confused-revert.out
@@ -0,0 +1,17 @@
+%%% should show a removed and b added
+A b
+R a
+reverting...
+%%% should show b unknown and a back to normal
+? b
+merging a
+%%% should show foo-b
+foo-b
+%%% should show a removed and b added
+A b
+R a
+reverting...
+%%% should show b unknown and a marked modified (merged)
+? b
+%%% should show foo-b
+foo-b
diff --git a/tests/test-revert b/tests/test-revert
old mode 100644
new mode 100755