Mercurial > hg
view tests/test-convert-datesort.out @ 6651:7f0dd352fb4d
addremove: correctly handle intermediate symlinks
This fixes problems mentioned in issue660 comments (unrelated to original
issue) where directory was renamed, and symlink was added instead.
In such situation addremove wasn't able to correctly detect that old files
no longer here, but tried to add symlink (and failed due collision with
old files).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 07 May 2008 14:32:00 +0400 |
parents | 4b0c9c674707 |
children | c5b4f662109f |
line wrap: on
line source
adding a marked working directory as branch brancha 1 files updated, 0 files merged, 0 files removed, 0 files unresolved marked working directory as branch branchb adding b created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % convert with datesort initializing destination t2 repository scanning source... sorting... converting... 8 a0 7 a1 6 a2 5 a3 4 b0 3 a4 2 a5 1 a6 0 b1 % graph converted repo o 8 "b1" | | o 7 "a6" | | | o 6 "a5" | | | o 5 "a4" | | o | 4 "b0" | | | o 3 "a3" | | | o 2 "a2" | | | o 1 "a1" |/ o 0 "a0"