Rev 3385: Fix a bug with re-using the same variable name is status.py in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_differences

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_differences

------------------------------------------------------------
revno: 3385
revision-id: john at arbash-meinel.com-20080422204514-bm0v3g592dapbx2s
parent: john at arbash-meinel.com-20080422203133-xra4zdxr7g5jvlcq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: find_differences
timestamp: Tue 2008-04-22 15:45:14 -0500
message:
  Fix a bug with re-using the same variable name is status.py
modified:
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
-------------- next part --------------
=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py	2008-04-22 20:31:33 +0000
+++ b/bzrlib/status.py	2008-04-22 20:45:14 +0000
@@ -171,11 +171,11 @@
         merge_extra.discard(_mod_revision.NULL_REVISION)
         merged_graph = {}
         parent_map = graph.get_parent_map(merge_extra)
-        for merge in merge_extra:
-            if merge not in parent_map: # ghost
-                merged_graph[merge] = []
+        for next_merge in merge_extra:
+            if next_merge not in parent_map: # ghost
+                merged_graph[next_merge] = []
             else:
-                merged_graph[merge] = [p for p in parent_map[merge]
+                merged_graph[next_merge] = [p for p in parent_map[next_merge]
                                           if p in merge_extra]
         sorter = tsort.MergeSorter(merged_graph, merge)
         # Get a handle to all of the revisions we will need