# 
# 
# patch "ChangeLog"
#  from [d74c2f4dfda44e2cc954f3f1331297db5c4d4e2a]
#    to [4c410ee835aec64dbe7265059bce9c9f6ba24bd5]
# 
# patch "roster.cc"
#  from [4728d3aecc38db790cb805dbfbedb1c05c3159ad]
#    to [d99ae3380d0bd69e640ed9aed48f7131b4921203]
# 
============================================================
--- ChangeLog	d74c2f4dfda44e2cc954f3f1331297db5c4d4e2a
+++ ChangeLog	4c410ee835aec64dbe7265059bce9c9f6ba24bd5
@@ -1,5 +1,10 @@
 2005-12-10  Timothy Brownawell  <address@hidden>
 
+	* roster.cc (make_roster_for_merge): unshadow the node_id_source
+	argument. Resolve usages to the argument or the local by educated guess.
+
+2005-12-10  Timothy Brownawell  <address@hidden>
+
 	* paths.{cc,hh}: operator<() for split_path's
 
 2005-12-10  Timothy Brownawell  <address@hidden>
============================================================
--- roster.cc	4728d3aecc38db790cb805dbfbedb1c05c3159ad
+++ roster.cc	d99ae3380d0bd69e640ed9aed48f7131b4921203
@@ -1488,14 +1488,14 @@
   {
     I(!null_id(left_rid) && !null_id(right_rid));
     {
-      temp_node_id_source nis;
+      temp_node_id_source temp_nis;
       // SPEEDUP?: the copies on the next two lines are probably the main
       // bottleneck in this code
       new_roster = left_roster;
       roster_t from_right_r(right_roster);
 
-      editable_roster_for_merge from_left_er(new_roster, nis);
-      editable_roster_for_merge from_right_er(from_right_r, nis);
+      editable_roster_for_merge from_left_er(new_roster, temp_nis);
+      editable_roster_for_merge from_right_er(from_right_r, temp_nis);
 
       left_cs.apply_to(from_left_er);
       right_cs.apply_to(from_right_er);