[PATCH] Unit test for issue 650 (that I also stumbled upon with 0.9.4)

[dominique at quatravaux.org]

# HG changeset patch
# User dominique at quatravaux.org
# Date 1194520084 -3600
# Node ID 9242edc607ab76c44ae9fe10d06cdee6890708b1
# Parent  8d982aef0be135cb780fa03e9b32cb92e9b371f6
Unit test for issue 650 (that I also stumbled upon with 0.9.4)

diff -r 8d982aef0be1 -r 9242edc607ab tests/test-issue650
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-issue650	Thu Nov 08 12:08:04 2007 +0100
@@ -0,0 +1,30 @@
+rm -rf foo bar 2>/dev/null
+(hg init foo
+ cd foo
+ touch zoinx
+ touch zoinx2
+ hg add zoinx*
+ hg commit -m "Base revision"
+ cd ..
+ hg clone foo bar
+ cd foo
+ echo "foo" >> zoinx
+ hg commit -m "Modified zoinx at foo's"
+ cd ../bar
+ echo "bar" >> zoinx2
+ hg commit -m "Modified zoinx2 at bar's"
+ cd ../foo
+ hg pull ../bar/
+ hg merge
+ hg commit -m "Merge at foo's"
+ cd ../bar/
+ chmod +x zoinx2
+ hg commit -m "chmod at bar's"
+ hg pull ../foo/
+ hg merge
+ hg commit -m "Merge at bar's"
+ cd ../foo/
+ hg pull ../bar/
+ hg update) > /dev/null 2>&1
+(cd foo; hg status)
+
diff -r 8d982aef0be1 -r 9242edc607ab tests/test-issue650.err
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-issue650.err	Thu Nov 08 12:08:04 2007 +0100
@@ -0,0 +1,1 @@
+M zoinx2