From 34ba8e18f1afe0675eec3336190f996c865da330 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Mon, 30 Jan 2012 06:19:49 +0900
Subject: [PATCH] improve duplicate handling of note ids on upgrade

---
 anki/upgrade.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/anki/upgrade.py b/anki/upgrade.py
index 1cc89f8c5..848811822 100644
--- a/anki/upgrade.py
+++ b/anki/upgrade.py
@@ -164,15 +164,16 @@ select id, id, modelId, 1, cast(created*1000 as int), cast(modified as int),
         map = {}
         data = []
         factidmap = {}
-        times = {}
         from anki.utils import minimizeHTML
+        highest = 0
         for c, row in enumerate(facts):
             oldid = row[0]
             row = list(row)
-            # get rid of old created column and update id
-            while row[4] in times:
-                row[4] += 1000
-            times[row[4]] = True
+            if row[4] <= highest:
+                highest = max(highest, row[4]) + 1
+                row[4] = highest
+            else:
+                highest = row[4]
             factidmap[row[0]] = row[4]
             row[0] = row[4]
             del row[4]