changeset 6295 | bace1990ab12 |
parent 6179 | 36ab165abbe2 |
child 6336 | 4b0c9c674707 |
--- a/tests/test-import.out Mon Mar 17 14:51:41 2008 -0700 +++ b/tests/test-import.out Mon Mar 17 23:36:45 2008 +0100 @@ -232,3 +232,11 @@ diff --git a/b b/b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying remove.diff +% test update+rename with common name (issue 927) +adding a +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +applying copy.diff +% view a +a +% view a2 +a