Mercurial > hg4j
comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 496:c1c8f6859d3f
Recognize 'merged from parent' metastate in dirstate
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Mon, 22 Oct 2012 20:33:20 +0200 |
| parents | ba36f66c32b4 |
| children | 27398bbfd543 |
comparison
equal
deleted
inserted
replaced
| 495:abfbe81154b5 | 496:c1c8f6859d3f |
|---|---|
| 338 } else { | 338 } else { |
| 339 inspector.modified(fname); // flags are not the same | 339 inspector.modified(fname); // flags are not the same |
| 340 } | 340 } |
| 341 } else if (!sizeEqual && r.size() >= 0) { | 341 } else if (!sizeEqual && r.size() >= 0) { |
| 342 inspector.modified(fname); | 342 inspector.modified(fname); |
| 343 } else if (r.size() == -2) { | |
| 344 // DirState wiki calls this np2 metastate: | |
| 345 // 'np2': merged from other parent (status == 'n', size == -2) | |
| 346 inspector.modified(fname); | |
| 343 } else { | 347 } else { |
| 344 // size is the same or unknown, and, perhaps, different timestamp | 348 // size is the same or unknown, and, perhaps, different timestamp |
| 345 // check actual content to avoid false modified files | 349 // check actual content to avoid false modified files |
| 346 try { | 350 try { |
| 347 if (!checkFlagsEqual(f, r.mode())) { | 351 if (!checkFlagsEqual(f, r.mode())) { |