Mercurial > hg
comparison tests/test-merge-tools.t @ 18325:297bf69966a0
merge: warn when internal:merge cannot merge symlinks
A follow-up to d084df89d948.
internal:merge should never be picked for merging symlinks ... but in the test
suite we have HGMERGE="internal:merge" which bypasses all the usual merge-tool
cleverness. Without any output it can be hard to figure out what happened and
where the problem is.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 15 Jan 2013 01:05:11 +0100 |
| parents | d084df89d948 |
| children | eac114e13b96 |
comparison
equal
deleted
inserted
replaced
| 18324:2eae2f9e85ef | 18325:297bf69966a0 |
|---|---|
| 841 $ rm f | 841 $ rm f |
| 842 $ ln -s symlink f | 842 $ ln -s symlink f |
| 843 $ hg commit -qm 'f is symlink' | 843 $ hg commit -qm 'f is symlink' |
| 844 $ hg merge -r 2 --tool internal:merge | 844 $ hg merge -r 2 --tool internal:merge |
| 845 merging f | 845 merging f |
| 846 warning: internal:merge cannot merge symlinks for f | |
| 846 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | 847 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
| 847 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 848 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 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 849 [1] | 850 [1] |
| 850 | 851 |