Mercurial > hg
comparison tests/test-merge-tools.t @ 18256:d084df89d948
merge: make internal merge fail cleanly on symlinks
Simplemerge is not symlink aware and will never do the the right thing on
symlinks. It would read the symlink as a file and abort with 'No such file or
directory' on dangling symlinks.
Instead, internal:merge now simply fails to merge symlinks.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 08 Jan 2013 04:15:41 +0100 |
parents | 195ad823b5d5 |
children | 297bf69966a0 |
comparison
equal
deleted
inserted
replaced
18255:7ca534f31a83 | 18256:d084df89d948 |
---|---|
830 revision 1 | 830 revision 1 |
831 space | 831 space |
832 # hg stat | 832 # hg stat |
833 M f | 833 M f |
834 ? f.orig | 834 ? f.orig |
835 | |
836 #if symlink | |
837 | |
838 internal merge cannot handle symlinks and shouldn't try: | |
839 | |
840 $ hg update -q -C 1 | |
841 $ rm f | |
842 $ ln -s symlink f | |
843 $ hg commit -qm 'f is symlink' | |
844 $ hg merge -r 2 --tool internal:merge | |
845 merging f | |
846 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
847 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
848 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
849 [1] | |
850 | |
851 #endif |