# HG changeset patch
# User Artem Tikhomirov <tikhomirov.artem@gmail.com>
# Date 1373449999 -7200
# Node ID af5223b86dd378c78c717b737169b1549671fe11
# Parent  5d8798772ccae8f4f8abd7f3ac4a648e2f78c835# Parent  a5cf64f2e7e42180c03754b4c32f167d17702f3d
Merge branch smartgit-4.6

diff -r 5d8798772cca -r af5223b86dd3 src/org/tmatesoft/hg/repo/HgBranches.java
--- 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");
 	}