Mercurial > hg
diff tests/test-rename.out @ 10466:d1f209bb9564 stable
patch: separate reverse copy data (issue1959)
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Thu, 11 Feb 2010 11:22:57 -0200 |
parents | 3f4f14eab085 |
children | e8d10d085f47 |
line wrap: on
line diff
--- a/tests/test-rename.out Sun Feb 14 15:45:12 2010 +0100 +++ b/tests/test-rename.out Thu Feb 11 11:22:57 2010 -0200 @@ -300,6 +300,19 @@ # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b) M d1/b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +# overwriting with renames (issue1959) +A d1/a + d1/b +A d1/c + d1/a +R d1/b +diff --git a/d1/b b/d1/a +rename from d1/b +rename to d1/a +diff --git a/d1/a b/d1/c +copy from d1/a +copy to d1/c +2 files updated, 0 files merged, 1 files removed, 0 files unresolved # check illegal path components abort: path contains illegal component: .hg/foo abort: ../foo not under root