Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgDirstate.java @ 388:b015f3918120
Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 15 Feb 2012 22:57:56 +0100 |
| parents | aa2e589d4e84 |
| children | 63c5a9d7ca3f |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgDirstate.java Mon Feb 13 15:11:27 2012 +0100 +++ b/src/org/tmatesoft/hg/repo/HgDirstate.java Wed Feb 15 22:57:56 2012 +0100 @@ -142,7 +142,7 @@ } else if (state == 'm') { merged.put(r.name1, r); } else { - // FIXME log error? + repo.getContext().getLog().warn(getClass(), "Dirstate record for file %s (size: %d, tstamp:%d) has unknown state '%c'", r.name1, r.size(), r.time, state); } } } catch (IOException ex) {