Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/WorkingCopyStatusCollector.java @ 76:658fa6b3a371
Fixed a defect when a file added and removed past some revision was reported as R for status against that rev
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Mon, 24 Jan 2011 04:38:09 +0100 |
| parents | 6f1b88693d48 |
| children | 42bcb4bffd17 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/WorkingCopyStatusCollector.java Mon Jan 24 04:18:22 2011 +0100 +++ b/src/org/tmatesoft/hg/repo/WorkingCopyStatusCollector.java Mon Jan 24 04:38:09 2011 +0100 @@ -125,7 +125,10 @@ inspector.missing(m); } else { // removed from the repo - inspector.removed(m); + // if we check against non-tip revision, do not report files that were added past that revision and now removed. + if (collect == null || baseRevFiles.contains(m)) { + inspector.removed(m); + } } } }