Mercurial > hg
comparison tests/test-merge-types.t @ 26519:48476c6129a2
filemerge: run symlink check for :merge3
Just like :merge, :merge3 doesn't support merging symlinks.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 07 Oct 2015 00:27:23 -0700 |
parents | a77679d0b887 |
children | ef1eb6df7071 |
comparison
equal
deleted
inserted
replaced
26518:a77679d0b887 | 26519:48476c6129a2 |
---|---|
71 a: versions differ -> m | 71 a: versions differ -> m |
72 picked tool ':union' for a (binary False symlink True) | 72 picked tool ':union' for a (binary False symlink True) |
73 merging a | 73 merging a |
74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | 74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
75 warning: internal :union cannot merge symlinks for a | 75 warning: internal :union cannot merge symlinks for a |
76 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | |
77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
78 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
79 [1] | |
80 | |
81 $ tellmeabout a | |
82 a is an executable file with content: | |
83 a | |
84 | |
85 $ hg update -C 1 | |
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
87 | |
88 $ hg merge --debug --tool :merge3 | |
89 searching for copies back to rev 1 | |
90 resolving manifests | |
91 branchmerge: True, force: False, partial: False | |
92 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | |
93 preserving a for resolve of a | |
94 a: versions differ -> m | |
95 picked tool ':merge3' for a (binary False symlink True) | |
96 merging a | |
97 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | |
98 warning: internal :merge3 cannot merge symlinks for a | |
76 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | 99 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 100 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
78 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 101 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
79 [1] | 102 [1] |
80 | 103 |