Mercurial > hg4j
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 75:e62f9638fb27 | 76:658fa6b3a371 |
|---|---|
| 123 if (getDirstate().checkRemoved(m) == null) { | 123 if (getDirstate().checkRemoved(m) == null) { |
| 124 // not removed from the repository = 'deleted' | 124 // not removed from the repository = 'deleted' |
| 125 inspector.missing(m); | 125 inspector.missing(m); |
| 126 } else { | 126 } else { |
| 127 // removed from the repo | 127 // removed from the repo |
| 128 inspector.removed(m); | 128 // if we check against non-tip revision, do not report files that were added past that revision and now removed. |
| 129 if (collect == null || baseRevFiles.contains(m)) { | |
| 130 inspector.removed(m); | |
| 131 } | |
| 129 } | 132 } |
| 130 } | 133 } |
| 131 } | 134 } |
| 132 | 135 |
| 133 public StatusCollector.Record status(int baseRevision) { | 136 public StatusCollector.Record status(int baseRevision) { |