Mercurial > jhg
changeset 662:af5223b86dd3
Merge branch smartgit-4.6
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 10 Jul 2013 11:53:19 +0200 |
| parents | 5d8798772cca (current diff) a5cf64f2e7e4 (diff) |
| children | 46b56864b483 |
| files | src/org/tmatesoft/hg/repo/HgBranches.java src/org/tmatesoft/hg/repo/HgParentChildMap.java |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgBranches.java Wed Jul 10 11:48:55 2013 +0200 +++ b/src/org/tmatesoft/hg/repo/HgBranches.java Wed Jul 10 11:53:19 2013 +0200 @@ -256,6 +256,11 @@ private File getCacheFile() { // prior to 1.8 used to be .hg/branchheads.cache + // since 2.5 there is filter suffix + File f = internalRepo.getFileFromRepoDir("cache/branchheads-base"); + if (f.exists()) { + return f; + } return internalRepo.getFileFromRepoDir("cache/branchheads"); }