# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1160758735 25200
# Node ID c7c6f1a45348a94dcae79453d11dd38d28b791ed
# Parent  80721b86a448a9dba58b74603eb0c9673baa597b
Test case for log --copies on non-linear manifests (issue391)

diff --git a/tests/test-log b/tests/test-log
--- a/tests/test-log
+++ b/tests/test-log
@@ -32,6 +32,13 @@ hg log -vf e
 echo % log copies
 hg log -vC --template '{rev} {file_copies%filecopy}\n'
 
+echo % log copies, non-linear manifest
+hg up -C 3
+hg mv dir/b e
+echo foo > foo
+hg ci -Ame2 -d '6 0'
+hg log -vC --template '{rev} {file_copies%filecopy}\n' -r 5
+
 # log --follow tests
 hg init ../follow
 cd ../follow
diff --git a/tests/test-log.out b/tests/test-log.out
--- a/tests/test-log.out
+++ b/tests/test-log.out
@@ -82,6 +82,10 @@ 3 b (a)
 2 dir/b (b)
 1 b (a)
 0 
+% log copies, non-linear manifest
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+adding foo
+5 e (dir/b)
 adding base
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b1