Mercurial > hg
diff tests/test-rename.t @ 12345:e0ee3e822a9a
Merge with stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 20 Sep 2010 22:29:13 +0200 |
| parents | tests/test-rename@70236d6fd844 tests/test-rename@4134686b83e1 |
| children | 02990e22150b |
line wrap: on
line diff
--- a/tests/test-rename.t Mon Sep 20 15:46:17 2010 +0200 +++ b/tests/test-rename.t Mon Sep 20 22:29:13 2010 +0200 @@ -372,6 +372,17 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ rm d1/ca +attempt to overwrite an existing broken symlink + + $ ln -s ba d1/ca + $ hg rename --traceback d1/ba d1/ca + d1/ca: not overwriting - file exists + $ hg status -C + ? d1/ca + $ hg update -C + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ rm d1/ca + replace a symlink with a file $ ln -s ba d1/ca