From 1d78d9f0510d5dc5e717a01267e69a44ee8f1ac9 Mon Sep 17 00:00:00 2001 From: Andrzej Hunt Date: Mon, 8 Feb 2016 10:10:46 -0800 Subject: [PATCH] Bug 826400 - Post: update DATABASE_VERSION comment, and clarify why we do this r=liuche --HG-- extra : commitid : 2RsGOeNAv3X --- .../base/java/org/mozilla/gecko/db/BrowserDatabaseHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/db/BrowserDatabaseHelper.java b/mobile/android/base/java/org/mozilla/gecko/db/BrowserDatabaseHelper.java index d8b94b9228b4..85004224455b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserDatabaseHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserDatabaseHelper.java @@ -39,7 +39,9 @@ import android.util.Log; final class BrowserDatabaseHelper extends SQLiteOpenHelper { private static final String LOGTAG = "GeckoBrowserDBHelper"; - public static final int DATABASE_VERSION = 27; // Bug 1128675 + // Replace the Bug number below with your Bug that is conducting a DB upgrade, as to force a merge conflict with any + // other patches that require a DB upgrade. + public static final int DATABASE_VERSION = 27; // Bug 826400 public static final String DATABASE_NAME = "browser.db"; final protected Context mContext;