# HG changeset patch
# User oxymoron@cinder.waste.org
# Date 1115192263 28800
# Node ID e76ed1e480ef2be7787c2c4ca0ee6aa034e32dd4
# Parent  b4d0c3786ad3e47beacf8412157326a32b6d25a4
Fix linking of changeset revs when merging



diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -289,18 +289,19 @@ class repository:
         tr = self.transaction()
         changed = {}
         new = {}
-        nextrev = seqrev = self.changelog.count()
+        seqrev = self.changelog.count()
+        # some magic to allow fiddling in nested scope
+        nextrev = [seqrev]
 
         # helpers for back-linking file revisions to local changeset
         # revisions so we can immediately get to changeset from annotate
         def accumulate(text):
-            n = nextrev
             # track which files are added in which changeset and the
             # corresponding _local_ changeset revision
             files = self.changelog.extract(text)[3]
             for f in files:
-                changed.setdefault(f, []).append(n)
-            n += 1
+                changed.setdefault(f, []).append(nextrev[0])
+            nextrev[0] += 1
 
         def seq(start):
             while 1: