equal
deleted
inserted
replaced
57 [255] |
57 [255] |
58 $ hg up dir --config merge.checkunknown=warn |
58 $ hg up dir --config merge.checkunknown=warn |
59 a/b: replacing untracked file |
59 a/b: replacing untracked file |
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61 (activating bookmark dir) |
61 (activating bookmark dir) |
62 $ readlink a/b.orig |
62 $ readlink.py a/b.orig |
63 x |
63 a/b.orig -> x |
64 $ rm a/b.orig |
64 $ rm a/b.orig |
65 |
65 |
66 Update - local directory conflicts with remote file |
66 Update - local directory conflicts with remote file |
67 |
67 |
68 $ hg up -q 0 |
68 $ hg up -q 0 |
92 [255] |
92 [255] |
93 $ hg up link --config merge.checkunknown=warn |
93 $ hg up link --config merge.checkunknown=warn |
94 a/b: replacing untracked files in directory |
94 a/b: replacing untracked files in directory |
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
96 (activating bookmark link) |
96 (activating bookmark link) |
97 $ readlink a/b |
97 $ readlink.py a/b |
98 c |
98 a/b -> c |
99 $ test -d a/b.orig |
99 $ test -d a/b.orig |
100 $ rm -rf a/b.orig |
100 $ rm -rf a/b.orig |
101 |
101 |
102 Update - local renamed file conflicts with remote directory |
102 Update - local renamed file conflicts with remote directory |
103 |
103 |