equal
deleted
inserted
replaced
964 ... # here a is a symlink, so a/poisoned is bad |
964 ... # here a is a symlink, so a/poisoned is bad |
965 ... runcommand(server, ['merge', '2']) |
965 ... runcommand(server, ['merge', '2']) |
966 *** runcommand up -qC 2 |
966 *** runcommand up -qC 2 |
967 *** runcommand up -qC 1 |
967 *** runcommand up -qC 1 |
968 *** runcommand merge 2 |
968 *** runcommand merge 2 |
969 abort: path 'a/poisoned' traverses symbolic link 'a' |
969 a: path conflict - a file or link has the same name as a directory |
970 [255] |
970 the local file has been renamed to a~aa04623eb0c3 |
|
971 resolve manually then use 'hg resolve --mark a' |
|
972 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
973 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
974 [1] |
971 $ ls ../merge-symlink-out |
975 $ ls ../merge-symlink-out |
972 |
976 |
973 cache of repo.auditor should be discarded, so matcher would never traverse |
977 cache of repo.auditor should be discarded, so matcher would never traverse |
974 symlinks: |
978 symlinks: |
975 |
979 |