Show More
@@ -95,6 +95,7 b' class mergestate(object):' | |||||
95 | def _checkunknownfile(repo, wctx, mctx, f): |
|
95 | def _checkunknownfile(repo, wctx, mctx, f): | |
96 | return (not repo.dirstate._ignore(f) |
|
96 | return (not repo.dirstate._ignore(f) | |
97 | and os.path.isfile(repo.wjoin(f)) |
|
97 | and os.path.isfile(repo.wjoin(f)) | |
|
98 | and repo.wopener.audit.check(f) | |||
98 | and repo.dirstate.normalize(f) not in repo.dirstate |
|
99 | and repo.dirstate.normalize(f) not in repo.dirstate | |
99 | and mctx[f].cmp(wctx[f])) |
|
100 | and mctx[f].cmp(wctx[f])) | |
100 |
|
101 |
@@ -160,6 +160,15 b' now addremove should remove old files' | |||||
160 | adding bar/a |
|
160 | adding bar/a | |
161 | adding foo |
|
161 | adding foo | |
162 | removing foo/a |
|
162 | removing foo/a | |
|
163 | ||||
|
164 | commit and update back | |||
|
165 | ||||
|
166 | $ hg ci -mb | |||
|
167 | $ hg up '.^' | |||
|
168 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |||
|
169 | $ hg up tip | |||
|
170 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
171 | ||||
163 | $ cd .. |
|
172 | $ cd .. | |
164 |
|
173 | |||
165 | == root of repository is symlinked == |
|
174 | == root of repository is symlinked == |
General Comments 0
You need to be logged in to leave comments.
Login now